WCS 2.0 implementation in PetascopeHEADmaster

1 files changed, 47 insertions, 49 deletions

diff --git a/petascope/src/petascope/wcps/server/core/ReduceScalarExpr.java b/petascope/src/petascope/wcps/server/core/ReduceScalarExpr.java
index b12c12f..2494dcd 100644
--- a/petascope/src/petascope/wcps/server/core/ReduceScalarExpr.java
+++ b/petascope/src/petascope/wcps/server/core/ReduceScalarExpr.java
@@ -14,56 +14,54 @@
  * You should have received a copy of the GNU General Public License
  * along with rasdaman community.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann /
- rasdaman GmbH.
+ * Copyright 2003 - 2010 Peter Baumann / rasdaman GmbH.
  *
  * For more information please see <http://www.rasdaman.org>
  * or contact Peter Baumann via <baumann@rasdaman.com>.
  */
-package petascope.wcps.server.core;

-

-import petascope.wcps.server.exceptions.InvalidCrsException;

-import petascope.wcps.server.exceptions.WCPSException;

-import org.w3c.dom.*;

-

-public class ReduceScalarExpr implements IRasNode {

-

-    CoverageExpr expr;

-    String op;

-

-    public ReduceScalarExpr(Node node, XmlQuery xq) throws WCPSException, InvalidCrsException {

-        if (node.getNodeName().equals("reduce")) {

-            node = node.getFirstChild();

-        }

-        while ((node != null) && node.getNodeName().equals("#text")) {

-            node = node.getNextSibling();

-        }

-

-        System.err.println("Trying to parse ReduceScalarExpr ");

-        String nodeName = node.getNodeName();

-

-        if (nodeName.equals("all") || nodeName.equals("some") || nodeName.equals("count")

-                || nodeName.equals("add") || nodeName.equals("avg") || nodeName.equals("min")

-                || nodeName.equals("max")) {

-            op = nodeName;

-

-            if (!op.equals("all") && !op.equals("some")) {

-                op = op + "_cells";

-            }

-

-            node = node.getFirstChild();

-

-            while ((node != null) && (node.getNodeName().equals("#text"))) {

-                node = node.getNextSibling();

-            }

-

-            expr = new CoverageExpr(node, xq);

-        } else {

-            throw new WCPSException("invalid ReduceScalarExprType node : " + nodeName);

-        }

-    }

-

-    public String toRasQL() {

-        return op + "(" + expr.toRasQL() + ")";

-    }

-}

+package petascope.wcps.server.core;
+
+import petascope.exceptions.WCPSException;
+import org.w3c.dom.*;
+
+public class ReduceScalarExpr implements IRasNode {
+
+    CoverageExpr expr;
+    String op;
+
+    public ReduceScalarExpr(Node node, XmlQuery xq) throws WCPSException {
+        if (node.getNodeName().equals("reduce")) {
+            node = node.getFirstChild();
+        }
+        while ((node != null) && node.getNodeName().equals("#text")) {
+            node = node.getNextSibling();
+        }
+
+        System.err.println("Trying to parse ReduceScalarExpr ");
+        String nodeName = node.getNodeName();
+
+        if (nodeName.equals("all") || nodeName.equals("some") || nodeName.equals("count")
+                || nodeName.equals("add") || nodeName.equals("avg") || nodeName.equals("min")
+                || nodeName.equals("max")) {
+            op = nodeName;
+
+            if (!op.equals("all") && !op.equals("some")) {
+                op = op + "_cells";
+            }
+
+            node = node.getFirstChild();
+
+            while ((node != null) && (node.getNodeName().equals("#text"))) {
+                node = node.getNextSibling();
+            }
+
+            expr = new CoverageExpr(node, xq);
+        } else {
+            throw new WCPSException("invalid ReduceScalarExprType node : " + nodeName);
+        }
+    }
+
+    public String toRasQL() {
+        return op + "(" + expr.toRasQL() + ")";
+    }
+}