xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #4260 Updated gridproduct URI string, URI's were wrong and never matched.

Browse source 
Change-Id: I9940d4118f783debb12db0758e7c54e96f02ac68

Former-commit-id: e53a51ad872e1476f3a4a9e517f20ddaedd625fa
This commit is contained in:
Dave Hladky 2015-04-22 08:37:30 -05:00
parent b34c50594f
commit 7e93129324
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/process/GridProduct.java
View file

@ -47,6 +47,7 @@ import com.raytheon.uf.edex.plugin.scan.ScanURIFilter;
* Mar 2, 2012 bsteffen Initial creation * Mar 2, 2012 bsteffen Initial creation
* Jun 21, 2013 7613 zhao Modified getGridSQL() * Jun 21, 2013 7613 zhao Modified getGridSQL()
* Apr 24, 2014 2060 njensen Updates for removal of grid dataURI column * Apr 24, 2014 2060 njensen Updates for removal of grid dataURI column
* Apr 17, 2015 4260 dhladky Update default SCAN models to HRRR
* *
* </pre> * </pre>
* *
@ -81,7 +82,7 @@ public abstract class GridProduct extends ScanProduct {
protected static Pattern getGridPattern(String dataset, String parameter, protected static Pattern getGridPattern(String dataset, String parameter,
String levelName, String levelOne, String levelTwo) { String levelName, String levelOne, String levelTwo) {
// Format = // Format =
// /pluginName/time/datasetId/secondaryId/locationName/parameterAbbr/levelName/levelOne/levelTwo/perturbation // /pluginName/time/datasetId/secondaryId/ensembleID/gridID/parameterAbbr/levelName/levelOne/levelTwo
StringBuilder pattern = new StringBuilder("^"); StringBuilder pattern = new StringBuilder("^");
// pluginName // pluginName
pattern.append(uriSeparator); pattern.append(uriSeparator);
@ -95,7 +96,10 @@ public abstract class GridProduct extends ScanProduct {
// secondaryId // secondaryId
pattern.append(uriSeparator); pattern.append(uriSeparator);
pattern.append(".*"); pattern.append(".*");
// locationName // ensemble ID
pattern.append(uriSeparator);
pattern.append(".*");
// grid ID
pattern.append(uriSeparator); pattern.append(uriSeparator);
pattern.append(".*"); pattern.append(".*");
// parameterAbbr // parameterAbbr
@ -110,9 +114,7 @@ public abstract class GridProduct extends ScanProduct {
// levelTwo // levelTwo
pattern.append(uriSeparator); pattern.append(uriSeparator);
pattern.append(levelTwo); pattern.append(levelTwo);
// perturbation
pattern.append(uriSeparator);
pattern.append("null");
return Pattern.compile(pattern.toString()); return Pattern.compile(pattern.toString());
} }