diff options
| author | Andrei Aiordachioaie <a.aiordachioaie@jacobs-university.de> | 2010-03-03 09:58:47 +0100 |
|---|---|---|
| committer | Andrei Aiordachioaie <a.aiordachioaie@jacobs-university.de> | 2010-03-03 10:16:36 +0100 |
| commit | 1093dc67e8357fa3d3dc37e8cd171a079b043bb9 (patch) | |
| tree | 9ae3197977a1eb70c2d6a2bf1a028e674714eb8c /src | |
| parent | d43451ab812f4e85b79cf87d7477c7f250c74dab (diff) | |
Fixed implementation of "extend" and "overlay" operators. Added
the corresponding regression tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/petascope/ConfigManager.java | 2 | ||||
| -rw-r--r-- | src/petascope/wcps/grammar/DimensionIntervalElement.java | 1 | ||||
| -rw-r--r-- | src/petascope/wcps/grammar/ExtendExpr.java | 2 | ||||
| -rw-r--r-- | src/petascope/wcps/server/core/ExtendCoverageExpr.java | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/petascope/ConfigManager.java b/src/petascope/ConfigManager.java index 0c37e78..b577d1e 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 = "4-hack"; + private final static String BUGFIX = "5-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/grammar/DimensionIntervalElement.java b/src/petascope/wcps/grammar/DimensionIntervalElement.java index 9e6d3a7..3037dc5 100644 --- a/src/petascope/wcps/grammar/DimensionIntervalElement.java +++ b/src/petascope/wcps/grammar/DimensionIntervalElement.java @@ -38,7 +38,6 @@ public class DimensionIntervalElement implements IParseTreeNode { public void setCrs(String c) {
crs = c;
- System.err.println("Grammar: Set CRS name: " + c);
}
public void setIntervalExpr(DimensionIntervalExpr e) {
diff --git a/src/petascope/wcps/grammar/ExtendExpr.java b/src/petascope/wcps/grammar/ExtendExpr.java index 582c325..ec94989 100644 --- a/src/petascope/wcps/grammar/ExtendExpr.java +++ b/src/petascope/wcps/grammar/ExtendExpr.java @@ -37,6 +37,6 @@ public class ExtendExpr implements IParseTreeNode { }
public String toXML() {
- return "<extend>" + intervalList.toXML() + coverageExpr.toXML() + "</extend>";
+ return "<extend>" + coverageExpr.toXML() + intervalList.toXML() + "</extend>";
}
}
diff --git a/src/petascope/wcps/server/core/ExtendCoverageExpr.java b/src/petascope/wcps/server/core/ExtendCoverageExpr.java index 9a6e2ad..a711742 100644 --- a/src/petascope/wcps/server/core/ExtendCoverageExpr.java +++ b/src/petascope/wcps/server/core/ExtendCoverageExpr.java @@ -56,7 +56,7 @@ public class ExtendCoverageExpr implements IRasNode, ICoverageInfo { try {
System.err.println("Trying out an CoverageExprType group...");
- coverageExprType = new CoverageExpr(node, xq);
+ coverageExprType = new CoverageExpr(child, xq);
coverageInfo = coverageExprType.getCoverageInfo();
child = child.getNextSibling();
continue;
@@ -66,7 +66,7 @@ public class ExtendCoverageExpr implements IRasNode, ICoverageInfo { try {
// Start a new axis and save it
- elem = new DimensionIntervalElement(node, xq, coverageInfo);
+ elem = new DimensionIntervalElement(child, xq, coverageInfo);
axisList.add(elem);
child = elem.getNextNode();
continue;
|