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

Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1

Browse source 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]
Former-commit-id: 9c412e444e
Former-commit-id: 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]
Former-commit-id: 57f7e4b084
This commit is contained in:
Brian.Dyke 2014-03-14 11:13:30 -04:00
commit 39ef07d49f
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,9 +77,10 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* for merge logic.
* May 14, 2013 1842 dgilling Also delete cluster locks when purging
* PRACTICE active table.
* Jun 11, 2013 2083 randerso Log active table changes
* Jun 11, 2013 2083 randerso Log active table changes
* Aug 29, 2013 1843 dgilling Move ETN related methods to
* GetNextEtnUtil.
* Mar 06, 2014 2883 randerso Pass siteId into python code
*
* </pre>
*
@ -241,8 +242,8 @@ public class ActiveTable {
mode = ActiveTableMode.OPERATIONAL;
}
MergeResult result = filterTable(getActiveTable(siteId, mode),
newRecords, mode, offsetSecs);
MergeResult result = filterTable(siteId,
getActiveTable(siteId, mode), newRecords, mode, offsetSecs);
updateTable(siteId, result, mode);
@ -256,6 +257,8 @@ public class ActiveTable {
* Runs the new VTEC products against the legacy logic to update the active
* table
*
* @param siteId
* the ID of the ingest site
* @param activeTable
* the current active table
* @param newRecords
@ -263,10 +266,12 @@ public class ActiveTable {
* @return a list of size 2, with the first inner list being the updated
* active table and the second being the purged records
*/
private MergeResult filterTable(List<ActiveTableRecord> activeTable,
private MergeResult filterTable(String siteId,
List<ActiveTableRecord> activeTable,
List<ActiveTableRecord> newRecords, ActiveTableMode mode,
float offsetSecs) {
HashMap<String, Object> args = new HashMap<String, Object>(5, 1.0f);
args.put("siteId", siteId);
args.put("activeTable", activeTable);
args.put("newRecords", newRecords);
args.put("logger", changeLog);

6
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
View file

@ -26,12 +26,12 @@
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 06/11/13 #2083 randerso Log active table changes, save backups
# 03/06/14 #2883 randerso Pass siteId into mergeFromJava
#
import time
import copy
import os
import siteConfig
import VTECTableUtil, VTECTableSqueeze, VTECPartners
import LogStream, ActiveTableVtec, ActiveTableRecord
from java.util import ArrayList
@ -248,14 +248,12 @@ class ActiveTable(VTECTableUtil.VTECTableUtil):
return outTable, purgedRecords, changes, changedFlag
def mergeFromJava(activeTable, newRecords, logger, mode, offsetSecs=0):
def mergeFromJava(siteId, activeTable, newRecords, logger, mode, offsetSecs=0):
pyActive = []
szActive = activeTable.size()
for i in range(szActive):
pyActive.append(ActiveTableRecord.ActiveTableRecord(activeTable.get(i)))
siteId = siteConfig.GFESUITE_SITEID
decoderSites = VTECPartners.VTEC_DECODER_SITES
decoderSites.append(VTECPartners.get4ID(siteId))
decoderSites.append(VTECPartners.VTEC_SPC_SITE)

1
rpms/build/x86_64/build.sh
View file

@ -437,6 +437,7 @@ fi
if [ "${1}" = "-edex" ]; then
##buildRPM "awips2-common-base"
buildRPM "awips2"
buildEDEX
if [ $? -ne 0 ]; then
exit 1