From fb1ba3515facd670815c83e08ffca383cc506ee5 Mon Sep 17 00:00:00 2001
From: Andrei Aiordachioaie <a.aiordachioaie@jacobs-university.de>
Date: Wed, 31 Mar 2010 20:33:45 +0200
Subject: Fixed bug related to additions with scalar values.

---
 src/petascope/ConfigManager.java                   |  2 +-
 .../wcps/server/core/CoverageExprPairType.java     | 28 ++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/petascope/ConfigManager.java b/src/petascope/ConfigManager.java
index b577d1e..f61813c 100644
--- a/src/petascope/ConfigManager.java
+++ b/src/petascope/ConfigManager.java
@@ -51,7 +51,7 @@ public class ConfigManager {
     v3 adds WGS84 handling in WCPS requests. */
     private final static String MINOR = "3";
     /* Bug-fix count. We have a hack: every WCPS response is written to disk. */
-    private final static String BUGFIX = "5-hack";
+    private final static String BUGFIX = "6-hack";
 
     /* Petascope 1.2.0 contains WCS 1.1.0, WCS 2.0, WCS-T 1.0.0 and WCPS 1.0.0 */
     public final static String PETASCOPE_VERSION = MAJOR + "." + MINOR + "." + BUGFIX;
diff --git a/src/petascope/wcps/server/core/CoverageExprPairType.java b/src/petascope/wcps/server/core/CoverageExprPairType.java
index 7bdc784..d52e74c 100644
--- a/src/petascope/wcps/server/core/CoverageExprPairType.java
+++ b/src/petascope/wcps/server/core/CoverageExprPairType.java
@@ -38,17 +38,7 @@ public class CoverageExprPairType implements IRasNode, ICoverageInfo {
         System.err.println("Trying to parse a coverage expression pair ... Starting at node "
                 + nodeName);
 
-        // Combination 1: CoverageExprType + CoverageExprType
-        try {
-            first = new CoverageExpr(node, xq);
-            second = new CoverageExpr(node.getNextSibling(), xq);
-            info = new CoverageInfo(((ICoverageInfo) second).getCoverageInfo());
-            ok = true;
-        } catch (WCPSException e) {
-            System.err.println("Failed to parse a CoverageExprType + CoverageExprType!");
-        }
-
-        // Combination 2: CoverageExprType + ScalarExprType
+        // Combination 1: CoverageExprType + ScalarExprType
         if (ok == false) {
             try {
                 first = new CoverageExpr(node, xq);
@@ -60,7 +50,7 @@ public class CoverageExprPairType implements IRasNode, ICoverageInfo {
             }
         }
 
-        // Combination 3: ScalarExprType + CoverageExprType
+        // Combination 2: ScalarExprType + CoverageExprType
         if (ok == false) {
             try {
                 first = new ScalarExpr(node, xq);
@@ -72,6 +62,20 @@ public class CoverageExprPairType implements IRasNode, ICoverageInfo {
             }
         }
 
+        // Combination 3: CoverageExprType + CoverageExprType
+        if (ok == false) {
+            try {
+                first = new CoverageExpr(node, xq);
+                second = new CoverageExpr(node.getNextSibling(), xq);
+                info = new CoverageInfo(((ICoverageInfo) first).getCoverageInfo());
+                ok = true;
+            } catch (WCPSException e) {
+                System.err.println("Failed to parse a CoverageExprType + CoverageExprType!");
+            }
+        }
+
+        
+
         if (ok == false) {
             throw new WCPSException("Could not parse a coverage expression pair !");
         }
-- 
cgit