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

Merge "Issue #1156 - Fix ts ordering so TS values are alpha sorted" into development

Browse source 
Former-commit-id: b111526256 [formerly 4e465da384 [formerly 207251f82bc8c7c11f198c111aaf37e54ff68a00]]
Former-commit-id: 4e465da384
Former-commit-id: 06777dfc7c
This commit is contained in:
Lee Venable 2012-09-18 14:30:28 -05:00 • committed by Gerrit Code Review
commit 70f4285bd3
1 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
View file

@ -79,9 +79,9 @@ public class TimeSeriesDataManager extends HydroDataManager {
private static final String TIME_SERIES_DATA_QUERY = "select lid,obstime,lid,product_id from latestobsvalue"; private static final String TIME_SERIES_DATA_QUERY = "select lid,obstime,lid,product_id from latestobsvalue";
private String INGEST_FILTER_QUERY = "select lid,pe,ts,extremum,dur from ingestfilter where lid=':lid' and ingest = 'T' order by pe asc,ts_rank asc,dur asc,ts asc,extremum asc"; private final String INGEST_FILTER_QUERY = "select lid,pe,ts,extremum,dur from ingestfilter where lid=':lid' and ingest = 'T' order by pe asc,ts_rank asc,ts asc,dur asc,extremum asc";
private String SHEF_PE_QUERY = "select name||' '|| eng_unit from shefpe where pe=':pe'"; private final String SHEF_PE_QUERY = "select name||' '|| eng_unit from shefpe where pe=':pe'";
private static final String SHEF_PE_GENERIC_UNITS = "Generic Units"; private static final String SHEF_PE_GENERIC_UNITS = "Generic Units";
@ -914,9 +914,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
} }
List<Object[]> sqlResult; List<Object[]> sqlResult;
try { try {
sqlResult = (ArrayList<Object[]>) (DirectDbQuery.executeQuery(sql.toString(), HydroConstants.IHFS, QueryLanguage.SQL)); sqlResult = (DirectDbQuery.executeQuery(sql.toString(), HydroConstants.IHFS, QueryLanguage.SQL));
if (sqlResult !=null && sqlResult.size()>0 && sqlResult.get(0)[0]!=null) if (sqlResult !=null && sqlResult.size()>0 && sqlResult.get(0)[0]!=null) {
return sqlResult.get(0)[0]; return sqlResult.get(0)[0];
}
} catch (VizException e) { } catch (VizException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;