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

Omaha #3157 Fix merge issue in ActiveTable.py

Browse source 
Change-Id: I39550855a413791beb2e02c536f9bdfdf80ff514

Former-commit-id: 9feb625df5 [formerly 49988ea258] [formerly 6393d231e1] [formerly 9feb625df5 [formerly 49988ea258] [formerly 6393d231e1] [formerly 0f20f6d251 [formerly 6393d231e1 [formerly 295f52411e700afddc04390b7016e627d7c676bd]]]]
Former-commit-id: 0f20f6d251
Former-commit-id: d78ba7e113 [formerly bdf078f597] [formerly 33fe841269626c5ccfc4f334fa83c0fa3b4ca4eb [formerly 16a4e017b3]]
Former-commit-id: 2c5b9098e8bd16886a1d36370125fffc1bce017c [formerly 2e1bfdb05d]
Former-commit-id: 71bc965ad5
This commit is contained in:
Ron Anderson 2014-08-06 09:59:14 -05:00
parent 565be15034
commit 8a6c65946f
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
View file

@ -22,6 +22,7 @@ package com.raytheon.uf.edex.activetable;
import java.io.File;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@ -55,9 +56,9 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.PerformanceStatus;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.util.CollectionUtil;
import com.raytheon.uf.common.time.util.ITimer;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.CollectionUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.database.DataAccessLayerException;
@ -222,9 +223,9 @@ public class ActiveTable {
ActiveTableMode mode, String phensigList, String act, String etn,
String[] wfos) {
if (wfos == null || !Arrays.asList(wfos).contains("all")) {
if ((wfos == null) || !Arrays.asList(wfos).contains("all")) {
if (wfos == null || wfos.length == 0) {
if ((wfos == null) || (wfos.length == 0)) {
// default to WFOs from VTECPartners
Set<String> wfoSet = getDecoderSites(siteId);
@ -263,10 +264,10 @@ public class ActiveTable {
List<String> wfoList = (List<String>) vtecPartners
.getattr("VTEC_DECODER_SITES");
wfoSet.addAll(wfoList);
String spcSite = (String) vtecPartners.getattr("VTEC_SPC_SITE");
wfoSet.add(spcSite);
String tpcSite = (String) vtecPartners.getattr("VTEC_TPC_SITE");
wfoSet.add(tpcSite);
Collection<String> spcSite = vtecPartners.getSpcSites();
wfoSet.addAll(spcSite);
Collection<String> tpcSite = vtecPartners.getTpcSites();
wfoSet.addAll(tpcSite);
}
return wfoSet;
}
@ -354,14 +355,14 @@ public class ActiveTable {
PythonScript python = threadLocalPythonScript.get();
try {
result = (MergeResult) python.execute("mergeFromJava", args);
} catch (JepException e) {
statusHandler.handle(Priority.PROBLEM,
"Error updating active table", e);
}
} catch (Exception e) {
} catch (JepException e) {
statusHandler.handle(Priority.PROBLEM,
"Error initializing active table python", e);
"Error updating active table", e);
}
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
"Error initializing active table python", e);
}
return result;
}
@ -421,11 +422,11 @@ public class ActiveTable {
query.addQueryParam("etn", etn, "in");
}
if (requestValidTimes && currentTime != null) {
if (requestValidTimes && (currentTime != null)) {
// Current Time
query.addQueryParam("endTime", currentTime, "greater_than");
}
if (latestEtn && currentTime != null) {
if (latestEtn && (currentTime != null)) {
Calendar yearStart = Calendar.getInstance();
yearStart.set(currentTime.get(Calendar.YEAR), Calendar.JANUARY,
0, 0, 0);