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

Issue #798 - Code review changes

Browse source 
Former-commit-id: 39a32d7c91 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]
Former-commit-id: 14e68406b4
This commit is contained in:
James Korman 2012-07-31 14:34:27 -05:00
parent 1166a7cbb1
commit f7a864a2c0
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
deltaScripts/goesr_deploy/convertSatURIs.py
View file

@ -111,19 +111,20 @@ def process_all_satellite():
f[newds] = h5py.SoftLink(oldds)
group = f[row[DATAURI_IDX] + "/Data-interpolated"]
numLevels = 1
numLevels = 0
for n in group.keys():
numLevels += 1
newds = newGroupName + "/Data-interpolated/" + n
if (n == '0'):
# special case for this link.
# dataset /Data-interpolated/0 points to /Data
# Don't count this link!
oldds = row[DATAURI_IDX] + "/Data"
else:
oldds = row[DATAURI_IDX] + "/Data-interpolated/" + n
# Only count interpolated levels!
numLevels += 1
f[newds] = h5py.SoftLink(oldds)
# now back up one for the Data,Data-interpolated/0 link
numLevels -= 1
updateSql = "update satellite set datauri='" + row[DATAURI_IDX] + "/" + row[COVERAGE_IDX] + "'"
updateSql += ", interpolationlevels=" + repr(numLevels)
updateSql += " where id=" + row[0] + ";"

6
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/dao/SatelliteDao.java
View file

@ -152,10 +152,10 @@ public class SatelliteDao extends PluginDao {
storageRecord, fillValue);
// How many interpolation levels do we need for this data?
// Subtract one for the base level data.
int levels = downScaler.getNumberOfDownscaleLevels() - 1;
int levels = downScaler.getNumberOfDownscaleLevels();
// set the number of levels in the 'parent' satellite data.
satRecord.setInterpolationLevels(levels);
// Subtract one for the base level data.
satRecord.setInterpolationLevels(levels - 1);
if (DataStoreFactory.isInterpolated(levels)) {
for (int downscaleLevel = 1; downscaleLevel <= levels; downscaleLevel++) {
Rectangle size = downScaler

2
edexOsgi/com.raytheon.uf.common.datastorage/src/com/raytheon/uf/common/datastorage/DataStoreFactory.java
View file

@ -341,7 +341,7 @@ public class DataStoreFactory {
*/
public static String createGroupName(String groupName, String baseDataSet,
boolean interpolated) {
StringBuilder interpolatedGroup = new StringBuilder();
StringBuilder interpolatedGroup = new StringBuilder(256);
if (groupName != null) {
interpolatedGroup.append(groupName);
}