diff options
| author | Andrei Aiordachioaie <a.aiordachioaie@jacobs-university.de> | 2010-04-07 22:03:37 +0200 |
|---|---|---|
| committer | Andrei Aiordachioaie <a.aiordachioaie@jacobs-university.de> | 2010-04-07 22:03:37 +0200 |
| commit | c122f9d1fceed132c4ca756cff4a2ec89c97f80f (patch) | |
| tree | a70774570d86ec83856ac54064c36fc736d04903 /src | |
| parent | ad9d9832e3509924403dc85744b4f781772fae2c (diff) | |
Fixed bug in the processing of extra parameters passed to the format encoder.
Diffstat (limited to 'src')
4 files changed, 4 insertions, 2 deletions
diff --git a/src/petascope/ConfigManager.java b/src/petascope/ConfigManager.java index 454a99d..650556f 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 = "9-hack"; + private final static String BUGFIX = "10-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/EncodedCoverageExpr.java b/src/petascope/wcps/grammar/EncodedCoverageExpr.java index b1b6dd3..7eb615f 100644 --- a/src/petascope/wcps/grammar/EncodedCoverageExpr.java +++ b/src/petascope/wcps/grammar/EncodedCoverageExpr.java @@ -67,7 +67,7 @@ public class EncodedCoverageExpr implements IParseTreeNode { result += "<format>" + format + "</format>";
if (extraParams != null) {
- result += "<extraParams>" + extraParams + "</extraParams>";
+ result += "<extraParameters>" + extraParams + "</extraParameters>";
}
result += "</encode>";
diff --git a/src/petascope/wcps/server/core/EncodeDataExpr.java b/src/petascope/wcps/server/core/EncodeDataExpr.java index 707db95..2ed58ac 100644 --- a/src/petascope/wcps/server/core/EncodeDataExpr.java +++ b/src/petascope/wcps/server/core/EncodeDataExpr.java @@ -83,6 +83,7 @@ public class EncodeDataExpr implements IRasNode { result = format + "(" + coverageExprType.toRasQL();
if (extraParams != null) {
+ extraParams = '"' + extraParams + '"';
result = result + ", " + extraParams;
}
diff --git a/src/petascope/wcps/server/core/ProcessCoveragesRequest.java b/src/petascope/wcps/server/core/ProcessCoveragesRequest.java index b8ff6c4..36840cc 100644 --- a/src/petascope/wcps/server/core/ProcessCoveragesRequest.java +++ b/src/petascope/wcps/server/core/ProcessCoveragesRequest.java @@ -132,6 +132,7 @@ public class ProcessCoveragesRequest { // If everything went well, we now have a proper value for "xmlQuery"
this.rasqlQuery = xmlQuery.toRasQL();
+ System.err.println("Final RasQL query: " + rasqlQuery);
this.mime = xmlQuery.getMimeType();
}
|