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

Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development

Browse source 
Former-commit-id: 0fe91e0d95 [formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]
Former-commit-id: 86c4a247cd
This commit is contained in:
Ron Anderson 2012-11-14 11:23:06 -06:00 • committed by Gerrit Code Review
commit 29559e851e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
View file

@ -760,7 +760,8 @@ public class GFEDao extends DefaultPluginDao {
Pattern p = Pattern.compile("^" + abbreviation + "(\\d+)hr$");
int lowestHr = -1;
for (GridInfoRecord m : (List<GridInfoRecord>) results) {
String param = m.getParameter().getAbbreviation().toLowerCase();
String param = m.getParameter().getAbbreviation()
.toLowerCase();
if (param.equals(abbreviation) && (lowestHr < 0)) {
model = m;
} else {
@ -846,7 +847,7 @@ public class GFEDao extends DefaultPluginDao {
if (dTimeList.contains(tr)) {
timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
}
}
}
if (!timeList.isEmpty()) {
return timeList;
@ -867,7 +868,6 @@ public class GFEDao extends DefaultPluginDao {
return timeList;
}
private List<DataTime> executeD2DParmQuery(ParmID id)
throws DataAccessLayerException {
List<DataTime> times = new ArrayList<DataTime>();
@ -913,7 +913,9 @@ public class GFEDao extends DefaultPluginDao {
query.addDistinctParameter("dataTime.refTime");
query.addQueryParam(GridConstants.DATASET_ID, d2dModelName);
query.addOrder("dataTime.refTime", false);
if (maxRecords > 0) {
query.setMaxResults(maxRecords);
}
List<?> result = this.queryByCriteria(query);
for (Object obj : result) {