subList = subTokenize(currToken);
if (subList != null) {
tokens.addAll(subList);
}
- } else {
- tokens.add(t);
- }
} else {
tokens.add(t);
}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
index 2c46059198..47d9f14716 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
@@ -751,16 +751,16 @@ public class PostShef {
.format("Posting data [%s] for LID [%s] to pairedValue table",
dataValue, locId));
}
- } else {
+ } else {
PostTables.postPeData(shefRecord, data, locId,
- dataValue, dataQualifier, qualityCode,
+ data.getStringValue(), dataQualifier, qualityCode,
prodId, prodTime, shefPostDuplicateDef,
ingestSwitch, stats, validTime, postDate,
dataType);
if (dataLog) {
log.info(String
.format("Posting data [%s] for LID [%s] for PE [%s]",
- dataValue, locId, data
+ data.getStringValue(), locId, data
.getPhysicalElement()
.getCode()));
}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java
index 1e84b133ea..c7efcdf5a8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostTables.java
@@ -1056,7 +1056,7 @@ public class PostTables {
+ "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)}");
cs.setString(1, locId);
cs.setString(2, shefData.getPhysicalElement().getCode());
- cs.setInt(3, shefData.getDuration().getValue());
+ cs.setInt(3, shefData.getDurationValue());
cs.setString(4, shefData.getTypeSource().getCode());
cs.setString(5, shefData.getExtremum().getCode());
cs.setTimestamp(6, new Timestamp(shefData.getObservationTimeObj()
@@ -1181,7 +1181,7 @@ public class PostTables {
+ "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)}");
cs.setString(1, locId);
cs.setString(2, shefData.getPhysicalElement().getCode());
- cs.setInt(3, shefData.getDuration().getValue());
+ cs.setInt(3, shefData.getDurationValue());
cs.setString(4, shefData.getTypeSource().getCode());
cs.setString(5, shefData.getExtremum().getCode());
cs.setTimestamp(6, new java.sql.Timestamp(shefData
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ParserToken.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ParserToken.java
index ec906352c7..267fadee53 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ParserToken.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ParserToken.java
@@ -709,7 +709,7 @@ public class ParserToken {
if(!isAllDigits(ss)) {
error = SHEFErrorCodes.LOG_028;
} else {
- if(ss.length() > 2) {
+ if(ss.length() > 3) {
error = SHEFErrorCodes.LOG_103;
}
}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/TokenType.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/TokenType.java
index fe8703dc45..032e9dc1cb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/TokenType.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/TokenType.java
@@ -43,6 +43,7 @@ import java.util.regex.Pattern;
public enum TokenType {
SLASH("/"),
+ SPACEINMIDDLE("[^ \t].*[ \t][ \t]*.*[^ \t]"),
SPACE(" "),
TAB("\t"),
COMMA(","),
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java b/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
index 069873d95d..bfe2311539 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
@@ -1,72 +1,72 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.edex.plugin.text.dao;
-
-import java.util.Calendar;
-
-import com.raytheon.edex.db.dao.DefaultPluginDao;
-import com.raytheon.edex.textdb.dbapi.impl.TextDB;
-import com.raytheon.uf.common.dataplugin.PluginException;
-import com.raytheon.uf.edex.database.purge.PurgeLogger;
-
-/**
- * DAO for text products
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jul 10, 2009 2191 rjpeter Update retention time handling.
- * Aug 18, 2009 2191 rjpeter Changed to version purging.
- *
- *
- * @author
- * @version 1
- */
-public class TextDao extends DefaultPluginDao {
-
- public TextDao(String pluginName) throws PluginException {
- super(pluginName);
- }
-
- @Override
- public void purgeAllData() {
- logger.warn("purgeAllPluginData not implemented for text. No data will be purged.");
- }
-
- protected void loadScripts() throws PluginException {
- // no op
- }
-
- public void purgeExpiredData() throws PluginException {
- int deletedRecords = 0;
-
- // only do full purge every few hours since incremental purge runs every
- // minute
- if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) % 3 == 0) {
- TextDB.purgeStdTextProducts();
- }
-
- PurgeLogger.logInfo("Purged " + deletedRecords + " items total.",
- "text");
- }
-}
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.edex.plugin.text.dao;
+
+import java.util.Calendar;
+
+import com.raytheon.edex.db.dao.DefaultPluginDao;
+import com.raytheon.edex.textdb.dbapi.impl.TextDB;
+import com.raytheon.uf.common.dataplugin.PluginException;
+import com.raytheon.uf.edex.database.purge.PurgeLogger;
+
+/**
+ * DAO for text products
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 10, 2009 2191 rjpeter Update retention time handling.
+ * Aug 18, 2009 2191 rjpeter Changed to version purging.
+ *
+ *
+ * @author
+ * @version 1
+ */
+public class TextDao extends DefaultPluginDao {
+
+ public TextDao(String pluginName) throws PluginException {
+ super(pluginName);
+ }
+
+ @Override
+ public void purgeAllData() {
+ logger.warn("purgeAllPluginData not implemented for text. No data will be purged.");
+ }
+
+ protected void loadScripts() throws PluginException {
+ // no op
+ }
+
+ public void purgeExpiredData() throws PluginException {
+ int deletedRecords = 0;
+
+ // only do full purge every few hours since incremental purge runs every
+ // minute
+ if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) % 3 == 0) {
+ TextDB.purgeStdTextProducts();
+ }
+
+ PurgeLogger.logInfo("Purged " + deletedRecords + " items total.",
+ "text");
+ }
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java b/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java
index ecc16f93f3..446d8d820f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java
+++ b/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/TextSeparatorFactory.java
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* ------------ ---------- ----------- --------------------------
* Aug 12, 2008 jkorman Initial creation
* Jul 10, 2009 2191 rjpeter Finished implementation.
+ * 06/29/2012 15154 D. Friedman Fix detection of TAF collectives.
*
*
* @author jkorman
@@ -62,7 +63,7 @@ public class TextSeparatorFactory {
private static final TextDBStaticData staticData = TextDBStaticData
.instance(siteId);
- private static Pattern TAF_PTRN = Pattern.compile("[\n\r]?TAF");
+ private static Pattern TAF_PTRN = Pattern.compile("^TAF\\s*$");
/**
*
@@ -186,16 +187,12 @@ public class TextSeparatorFactory {
msgType = WMOMessageType.MSG_DISCARD;
}
- Matcher m = TAF_PTRN.matcher(startOfMessage);
- if (m.find()) {
- msgType = WMOMessageType.STD_COLLECTIVE;
- }
-
if (msgType == null) {
String stdAfosId = null;
- int firstLineLen = WMOMessageSeparator.getLine(rawData,
- startIndex).length();
+ String firstLine = WMOMessageSeparator.getLine(rawData,
+ startIndex);
+ int firstLineLen = firstLine.length();
if (staticData.matchStdCollective(dataDes) != null) {
msgType = WMOMessageType.STD_COLLECTIVE;
} else if (staticData.matchUACollective(dataDes) != null) {
@@ -208,7 +205,8 @@ public class TextSeparatorFactory {
if (msgType == null) {
if (!hdr.startsWith("SXUS70")
&& !hdr.startsWith("FRUS45")
- && firstLineLen > 6
+ && (firstLineLen > 6 ||
+ TAF_PTRN.matcher(firstLine).matches())
&& (hdr.startsWith("SA") || hdr.startsWith("SP")
|| hdr.startsWith("FR") || hdr
.startsWith("FT"))) {
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/LdadMicroEngine.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/LdadMicroEngine.java
index 95a2faf667..da10bf8210 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/LdadMicroEngine.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/LdadMicroEngine.java
@@ -28,6 +28,7 @@ import java.util.Map.Entry;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import com.raytheon.edex.uengine.exception.MicroEngineException;
+import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.message.Header;
import com.raytheon.uf.common.message.Message;
import com.raytheon.uf.common.message.Property;
@@ -54,6 +55,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* 28May2011 8686 bkowal Replaced useless try ... catch block.
* Added logic to utilize the trigger.
* Sep 19, 2011 10955 rferrel Use RunProcess
+ * 05/25/2012 DR 15015 D. Friedman Use helper script to launch triggers.
*
*
* @author mfegan
@@ -62,6 +64,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
public class LdadMicroEngine extends AMicroEngine {
private static final String TEXT_DB_QUEUE = "textdbsrvinternal";
+ private static final String SCRIPT_LAUNCHER_PATH = "util/scriptLauncher";
/**
* Constructor.
@@ -240,6 +243,9 @@ public class LdadMicroEngine extends AMicroEngine {
for (Entry entry : env.entrySet()) {
strEnv.add(entry.getKey() + "=" + entry.getValue());
}
+ String launcher = getScriptLauncher();
+ if (launcher != null)
+ script = launcher + ' ' + script;
// DR#10955
RunProcess.getRunProcess()
.exec(script, strEnv.toArray(new String[] {}));
@@ -272,5 +278,29 @@ public class LdadMicroEngine extends AMicroEngine {
byte[] b = new HexBinaryAdapter().unmarshal(hexString);
return new String(b);
}
+
+ /**
+ * Finds a helper script that should be used to launch triggers. The helper
+ * script terminates immediately so that resources can be freed even if the
+ * trigger takes a long time to run.
+ *
+ * @return The absolute path of the help script or null if not found.
+ */
+ private String getScriptLauncher() {
+ File f = null;
+ try {
+ f = PathManagerFactory.getPathManager().getStaticFile(SCRIPT_LAUNCHER_PATH);
+ if (f != null) {
+ f.setExecutable(true);
+ return f.getAbsolutePath();
+ } else {
+ logger.warn("Script launcher not found");
+ return null;
+ }
+ } catch (Exception e) {
+ logger.error("Error finding script launcher", e);
+ return null;
+ }
+ }
}
diff --git a/edexOsgi/com.raytheon.edex.uengine/utility/edex_static/base/util/scriptLauncher b/edexOsgi/com.raytheon.edex.uengine/utility/edex_static/base/util/scriptLauncher
new file mode 100644
index 0000000000..daf4358a26
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.uengine/utility/edex_static/base/util/scriptLauncher
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "$@" >&/dev/null
*
* @author dhladky
@@ -617,10 +617,10 @@ public class FFMPUtils {
*/
@SuppressWarnings("unchecked")
public static ArrayList getCountyInfo(Long fips, String mode) {
-
+ String ftxt = (fips>=10000 ? ""+fips : "0"+fips);// DR 15108: add a leading 0 to 4-digit FIPS.
String sql1 = "SELECT county.gid from " + FFMPUtils.COUNTY_TABLE
- + " WHERE county.fips = '" + fips + "'";
-
+ + " WHERE county.fips = '" + ftxt/*fips*/ + "'";// DR 15108: use the 5-digit FIPS string.
+ System.out.println("___FFMPUtils.getCountyInfo(): county FIPS: "+ftxt);//Not a debug statement but for Template generation.
ISpatialQuery sq1 = null;
ArrayList gids = new ArrayList();
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
index c542710196..f1e58691b0 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
@@ -435,7 +435,15 @@ public class FogRecord extends PersistablePluginDataObject implements
return vis_array;
}
- /**
+ public GridGeometry2D getGridGeometry2D() {
+ return gridGeometry2D;
+ }
+
+ public void setGridGeometry2D(GridGeometry2D gridGeometry2D) {
+ this.gridGeometry2D = gridGeometry2D;
+ }
+
+ /**
* Set the VIS pixel array
*
* @param data_array
diff --git a/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java b/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java
index 985665a8a4..3975be241b 100644
--- a/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/MapUtil.java
@@ -94,6 +94,7 @@ import com.vividsolutions.jts.geom.Polygon;
* ------------ ---------- ----------- --------------------------
* 05/16/2012 14993 D. Friedman Add oversampling option to
* reprojectGeometry.
+ * 06/19/2012 14988 D. Friedman Make oversampling more like AWIPS 1
*
*
*/
@@ -386,6 +387,7 @@ public class MapUtil {
ReferencedEnvelope newEnv = new ReferencedEnvelope(JTS.getEnvelope2D(
newTargetREnv.intersection(newSourceEnv), LATLON_PROJECTION),
LATLON_PROJECTION);
+ ReferencedEnvelope newEnvInSourceProjection = newEnv.transform(sourceCRS, false, 500);
newEnv = newEnv.transform(targetCRS, false, 500);
// Calculate nx and ny, start with the number of original grid
// points in the intersection and then adjust to the new aspect
@@ -397,8 +399,16 @@ public class MapUtil {
double count = intersectingEnv.getWidth() * intersectingEnv.getHeight();
int nx = (int) Math.sqrt(count / aspectRatio);
int ny = (int) (nx * aspectRatio);
- nx *= oversampleFactor;
- ny *= oversampleFactor;
+
+ if (oversampleFactor > 1) {
+ int inCount = sourceGeometry.getGridRange().getSpan(0) *
+ sourceGeometry.getGridRange().getSpan(1);
+ double outCount = inCount * newEnv.getArea() /
+ sourceEnv.getArea();
+ outCount *= 4;
+ nx = (int) Math.sqrt(outCount / aspectRatio);
+ ny = (int) (nx * aspectRatio);
+ }
if (addBorder) {
newEnv.expandBy(newEnv.getWidth() / nx, newEnv.getHeight() / ny);
diff --git a/edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/edexOsgi/com.raytheon.uf.common.tafqueue/com.raytheon.uf.common.tafqueue.ecl
similarity index 100%
rename from edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
rename to edexOsgi/com.raytheon.uf.common.tafqueue/com.raytheon.uf.common.tafqueue.ecl
diff --git a/edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeDao.java b/edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeDao.java
index 492c27e9c7..b619ccef61 100644
--- a/edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeDao.java
@@ -1,282 +1,282 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.edex.purgesrv;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-
-import com.raytheon.uf.edex.database.dao.CoreDao;
-import com.raytheon.uf.edex.database.dao.DaoConfig;
-
-/**
- *
- * Data access object for accessing purge job status objects
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * May 1, 2012 #470 bphillip Initial creation
- *
- *
- *
- * @author bphillip
- * @version 1.0
- */
-public class PurgeDao extends CoreDao {
-
- /**
- * Constructs a new purge data access object
- */
- public PurgeDao() {
- super(DaoConfig.forClass(PurgeJobStatus.class));
- }
-
- /**
- * Gets the number of purge jobs currently running on the cluster. A job is
- * considered running if the 'running' flag is set to true and the job has
- * been started since validStartTime and has not met or exceeded the failed
- * count.
- *
- * @param validStartTime
- * @param failedCount
- * @return The number of purge jobs currently running on the cluster
- */
- public int getRunningClusterJobs(final Date validStartTime,
- final int failedCount) {
- final String query = "from "
- + daoClass.getName()
- + " obj where obj.running = true and obj.startTime > :startTime and obj.failedCount <= :failedCount";
- return (Integer) txTemplate.execute(new TransactionCallback() {
- @Override
- public Object doInTransaction(TransactionStatus status) {
- Query hibQuery = getSession(false).createQuery(query);
- hibQuery.setTimestamp("startTime", validStartTime);
- hibQuery.setInteger("failedCount", failedCount);
- List queryResult = hibQuery.list();
- if (queryResult == null) {
- return 0;
- } else {
- return queryResult.size();
- }
- }
- });
- }
-
- /**
- * Returns the jobs that have met or exceed the failed count.
- *
- * @param failedCount
- * @return
- */
- @SuppressWarnings("unchecked")
- public List getFailedJobs(final int failedCount) {
- final String query = "from " + daoClass.getName()
- + " obj where obj.failedCount >= :failedCount";
- return (List) txTemplate
- .execute(new TransactionCallback() {
- @Override
- public List doInTransaction(
- TransactionStatus status) {
- Query hibQuery = getSession(false).createQuery(query);
- hibQuery.setInteger("failedCount", failedCount);
- return hibQuery.list();
- }
- });
- }
-
- @SuppressWarnings("unchecked")
- public List getTimedOutJobs(final Date validStartTime) {
- final String query = "from "
- + daoClass.getName()
- + " obj where obj.running = true and obj.startTime <= :startTime";
- return (List) txTemplate
- .execute(new TransactionCallback() {
- @Override
- public List doInTransaction(
- TransactionStatus status) {
- Query hibQuery = getSession(false).createQuery(query);
- hibQuery.setTimestamp("startTime", validStartTime);
- return hibQuery.list();
- }
- });
- }
-
- @SuppressWarnings("unchecked")
- public Map> getRunningServerJobs() {
- final String query = "from "
- + daoClass.getName()
- + " obj where obj.running = true and obj.timedOut = false and obj.failed = false and obj.id.server=':SERVER'";
- return (Map>) txTemplate
- .execute(new TransactionCallback() {
- @Override
- public Map> doInTransaction(
- TransactionStatus status) {
- Map> serverMap = new HashMap>();
- Query serverQuery = getSession(false).createQuery(
- "select distinct obj.id.server from "
- + daoClass.getName()
- + " obj order by obj.id.server asc");
- List result = serverQuery.list();
- for (String server : result) {
- Query query2 = getSession(false).createQuery(
- query.replace(":SERVER", server));
- serverMap.put(server, query2.list());
- }
- return serverMap;
- }
- });
- }
-
- /**
- * Gets the amount of time in milliseconds since the last purge of a given
- * plugin
- *
- * @param plugin
- * The plugin name
- * @return Number of milliseconds since the purge job was run for the given
- * plugin
- */
- public long getTimeSinceLastPurge(String plugin) {
- final String query = "select obj.startTime from " + daoClass.getName()
- + " obj where obj.id.plugin='" + plugin + "'";
- return (Long) txTemplate.execute(new TransactionCallback() {
- @Override
- public Object doInTransaction(TransactionStatus status) {
- Query hibQuery = getSession(false).createQuery(query);
- Timestamp queryResult = (Timestamp) hibQuery.uniqueResult();
- if (queryResult == null) {
- return -1;
- } else {
- return System.currentTimeMillis() - queryResult.getTime();
- }
- }
- });
- }
-
- /**
- * Gets the purge job status for a plugin
- *
- * @param plugin
- * The plugin to get the purge job status for
- * @return The purge job statuses
- */
- public PurgeJobStatus getJobForPlugin(String plugin) {
- final String query = "from " + daoClass.getName()
- + " obj where obj.id.plugin='" + plugin + "'";
- return (PurgeJobStatus) txTemplate.execute(new TransactionCallback() {
- @Override
- public PurgeJobStatus doInTransaction(TransactionStatus status) {
- Query hibQuery = getSession(false).createQuery(query);
- PurgeJobStatus queryResult = (PurgeJobStatus) hibQuery
- .uniqueResult();
- return queryResult;
- }
- });
- }
-
- /**
- * Sets a purge job to running status and sets the startTime to current
- * time. If was previously running, will increment the failed count.
- *
- * @param plugin
- * The plugin row to update
- */
- public void startJob(final String plugin) {
- final String query = "from " + daoClass.getName()
- + " obj where obj.id.plugin='" + plugin + "'";
- txTemplate.execute(new TransactionCallback() {
- @Override
- public PurgeJobStatus doInTransaction(TransactionStatus status) {
- Session sess = getSession(false);
- Query hibQuery = sess.createQuery(query);
- PurgeJobStatus queryResult = (PurgeJobStatus) hibQuery
- .uniqueResult();
- if (queryResult == null) {
- queryResult = new PurgeJobStatus();
- queryResult.setFailedCount(0);
- queryResult.setPlugin(plugin);
- queryResult.setRunning(false);
- sess.save(queryResult);
- }
-
- if (queryResult.isRunning()) {
- // query was previously running, update failed count
- queryResult.incrementFailedCount();
- }
-
- queryResult.setStartTime(Calendar.getInstance(
- TimeZone.getTimeZone("GMT")).getTime());
- queryResult.setRunning(true);
- sess.update(queryResult);
- return queryResult;
- }
- });
- }
-
- /**
- * Retrieves the plugins order by startTime.
- *
- * @param latestStartTime
- * @param failedCount
- * @return
- */
- @SuppressWarnings("unchecked")
- public List getPluginsByPurgeTime() {
- final String query = "select obj.id.plugin from " + daoClass.getName()
- + " obj order by obj.startTime asc, obj.plugin asc";
- return (List) txTemplate.execute(new TransactionCallback() {
- @Override
- public List doInTransaction(TransactionStatus status) {
- Query hibQuery = getSession(false).createQuery(query);
- List result = (List) hibQuery.list();
- return result;
- }
- });
- }
-
- /**
- * Updates a purge job status object
- *
- * @param jobStatus
- * The object to update
- */
- public void update(final PurgeJobStatus jobStatus) {
- txTemplate.execute(new TransactionCallbackWithoutResult() {
- @Override
- public void doInTransactionWithoutResult(TransactionStatus status) {
- getHibernateTemplate().update(jobStatus);
- }
- });
- }
-}
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.purgesrv;
+
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+
+import com.raytheon.uf.edex.database.dao.CoreDao;
+import com.raytheon.uf.edex.database.dao.DaoConfig;
+
+/**
+ *
+ * Data access object for accessing purge job status objects
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * May 1, 2012 #470 bphillip Initial creation
+ *
+ *
+ *
+ * @author bphillip
+ * @version 1.0
+ */
+public class PurgeDao extends CoreDao {
+
+ /**
+ * Constructs a new purge data access object
+ */
+ public PurgeDao() {
+ super(DaoConfig.forClass(PurgeJobStatus.class));
+ }
+
+ /**
+ * Gets the number of purge jobs currently running on the cluster. A job is
+ * considered running if the 'running' flag is set to true and the job has
+ * been started since validStartTime and has not met or exceeded the failed
+ * count.
+ *
+ * @param validStartTime
+ * @param failedCount
+ * @return The number of purge jobs currently running on the cluster
+ */
+ public int getRunningClusterJobs(final Date validStartTime,
+ final int failedCount) {
+ final String query = "from "
+ + daoClass.getName()
+ + " obj where obj.running = true and obj.startTime > :startTime and obj.failedCount <= :failedCount";
+ return (Integer) txTemplate.execute(new TransactionCallback() {
+ @Override
+ public Object doInTransaction(TransactionStatus status) {
+ Query hibQuery = getSession(false).createQuery(query);
+ hibQuery.setTimestamp("startTime", validStartTime);
+ hibQuery.setInteger("failedCount", failedCount);
+ List queryResult = hibQuery.list();
+ if (queryResult == null) {
+ return 0;
+ } else {
+ return queryResult.size();
+ }
+ }
+ });
+ }
+
+ /**
+ * Returns the jobs that have met or exceed the failed count.
+ *
+ * @param failedCount
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public List getFailedJobs(final int failedCount) {
+ final String query = "from " + daoClass.getName()
+ + " obj where obj.failedCount >= :failedCount";
+ return (List) txTemplate
+ .execute(new TransactionCallback() {
+ @Override
+ public List doInTransaction(
+ TransactionStatus status) {
+ Query hibQuery = getSession(false).createQuery(query);
+ hibQuery.setInteger("failedCount", failedCount);
+ return hibQuery.list();
+ }
+ });
+ }
+
+ @SuppressWarnings("unchecked")
+ public List getTimedOutJobs(final Date validStartTime) {
+ final String query = "from "
+ + daoClass.getName()
+ + " obj where obj.running = true and obj.startTime <= :startTime";
+ return (List) txTemplate
+ .execute(new TransactionCallback() {
+ @Override
+ public List doInTransaction(
+ TransactionStatus status) {
+ Query hibQuery = getSession(false).createQuery(query);
+ hibQuery.setTimestamp("startTime", validStartTime);
+ return hibQuery.list();
+ }
+ });
+ }
+
+ @SuppressWarnings("unchecked")
+ public Map> getRunningServerJobs() {
+ final String query = "from "
+ + daoClass.getName()
+ + " obj where obj.running = true and obj.timedOut = false and obj.failed = false and obj.id.server=':SERVER'";
+ return (Map>) txTemplate
+ .execute(new TransactionCallback() {
+ @Override
+ public Map> doInTransaction(
+ TransactionStatus status) {
+ Map> serverMap = new HashMap>();
+ Query serverQuery = getSession(false).createQuery(
+ "select distinct obj.id.server from "
+ + daoClass.getName()
+ + " obj order by obj.id.server asc");
+ List result = serverQuery.list();
+ for (String server : result) {
+ Query query2 = getSession(false).createQuery(
+ query.replace(":SERVER", server));
+ serverMap.put(server, query2.list());
+ }
+ return serverMap;
+ }
+ });
+ }
+
+ /**
+ * Gets the amount of time in milliseconds since the last purge of a given
+ * plugin
+ *
+ * @param plugin
+ * The plugin name
+ * @return Number of milliseconds since the purge job was run for the given
+ * plugin
+ */
+ public long getTimeSinceLastPurge(String plugin) {
+ final String query = "select obj.startTime from " + daoClass.getName()
+ + " obj where obj.id.plugin='" + plugin + "'";
+ return (Long) txTemplate.execute(new TransactionCallback() {
+ @Override
+ public Object doInTransaction(TransactionStatus status) {
+ Query hibQuery = getSession(false).createQuery(query);
+ Timestamp queryResult = (Timestamp) hibQuery.uniqueResult();
+ if (queryResult == null) {
+ return -1;
+ } else {
+ return System.currentTimeMillis() - queryResult.getTime();
+ }
+ }
+ });
+ }
+
+ /**
+ * Gets the purge job status for a plugin
+ *
+ * @param plugin
+ * The plugin to get the purge job status for
+ * @return The purge job statuses
+ */
+ public PurgeJobStatus getJobForPlugin(String plugin) {
+ final String query = "from " + daoClass.getName()
+ + " obj where obj.id.plugin='" + plugin + "'";
+ return (PurgeJobStatus) txTemplate.execute(new TransactionCallback() {
+ @Override
+ public PurgeJobStatus doInTransaction(TransactionStatus status) {
+ Query hibQuery = getSession(false).createQuery(query);
+ PurgeJobStatus queryResult = (PurgeJobStatus) hibQuery
+ .uniqueResult();
+ return queryResult;
+ }
+ });
+ }
+
+ /**
+ * Sets a purge job to running status and sets the startTime to current
+ * time. If was previously running, will increment the failed count.
+ *
+ * @param plugin
+ * The plugin row to update
+ */
+ public void startJob(final String plugin) {
+ final String query = "from " + daoClass.getName()
+ + " obj where obj.id.plugin='" + plugin + "'";
+ txTemplate.execute(new TransactionCallback() {
+ @Override
+ public PurgeJobStatus doInTransaction(TransactionStatus status) {
+ Session sess = getSession(false);
+ Query hibQuery = sess.createQuery(query);
+ PurgeJobStatus queryResult = (PurgeJobStatus) hibQuery
+ .uniqueResult();
+ if (queryResult == null) {
+ queryResult = new PurgeJobStatus();
+ queryResult.setFailedCount(0);
+ queryResult.setPlugin(plugin);
+ queryResult.setRunning(false);
+ sess.save(queryResult);
+ }
+
+ if (queryResult.isRunning()) {
+ // query was previously running, update failed count
+ queryResult.incrementFailedCount();
+ }
+
+ queryResult.setStartTime(Calendar.getInstance(
+ TimeZone.getTimeZone("GMT")).getTime());
+ queryResult.setRunning(true);
+ sess.update(queryResult);
+ return queryResult;
+ }
+ });
+ }
+
+ /**
+ * Retrieves the plugins order by startTime.
+ *
+ * @param latestStartTime
+ * @param failedCount
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public List getPluginsByPurgeTime() {
+ final String query = "select obj.id.plugin from " + daoClass.getName()
+ + " obj order by obj.startTime asc, obj.plugin asc";
+ return (List) txTemplate.execute(new TransactionCallback() {
+ @Override
+ public List