elements) {
+ metarToShefRun = elements;
+ }
+
+ }
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefRun.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefRun.java
new file mode 100644
index 0000000000..83323b7982
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefRun.java
@@ -0,0 +1,150 @@
+package com.raytheon.edex.transform.shef;
+/**
+ * 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.
+ **/
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+import com.raytheon.uf.common.serialization.ISerializableObject;
+import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
+import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
+import com.raytheon.uf.edex.decodertools.core.filterimpl.AbstractFilterElement;
+
+/**
+ * MetarToShefRun is for the metarToShefRun tag in Metar2ShefFilter tag
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ---------- ------- -------- --------------------------
+ * 1/10/2013 15497 wkwock Initial creation
+ *
+ *
+ *
+ * @author wkwock
+ * @version 1.0
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+@DynamicSerialize
+public class MetarToShefRun implements ISerializableObject{
+ public static final String INCLUDE_TYPE = "INCLUDE";
+
+ public static final String EXCLUDE_TYPE = "EXCLUDE";
+ @XmlElement
+ @DynamicSerializeElement
+ private String configFileName;
+
+ @XmlElement
+ @DynamicSerializeElement
+ private String metarToShefOptions;
+
+ @XmlElement
+ @DynamicSerializeElement
+ protected List filterElements = new ArrayList();
+
+ @XmlElement
+ @DynamicSerializeElement
+ private String filterName;
+
+ /**
+ *
+ * @param filterFile
+ */
+ void createFilter(File filterFile) {
+ }
+
+ /**
+ *
+ * @return
+ */
+ public String getConfigFileName() {
+ return configFileName;
+ }
+
+ /**
+ *
+ * @param name
+ */
+ public void setConfigFileName(String name) {
+ configFileName = name;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public String getMetarToShefOptions() {
+ return metarToShefOptions;
+ }
+
+ /**
+ *
+ * @param name
+ */
+ public void setMetarToShefOptions(String name) {
+ metarToShefOptions = name;
+ }
+
+ /**
+ *
+ */
+ public void addFilterElement(AbstractFilterElement element) {
+ filterElements.add(element);
+ }
+
+ /**
+ *
+ * @return
+ */
+ public List getFilterElements() {
+ return filterElements;
+ }
+
+ /**
+ *
+ * @param elements
+ */
+ public void setFilterElements(List elements) {
+ filterElements = elements;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public String getFilterName() {
+ return filterName;
+ }
+
+ /**
+ *
+ * @param name
+ */
+ public void setFilterName(String name) {
+ filterName = name;
+ }
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefTransformer.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefTransformer.java
index 4e7a600235..e883e40693 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefTransformer.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefTransformer.java
@@ -80,6 +80,10 @@ public class MetarToShefTransformer extends
private static final int P1_MIN = 50;
private static final int P2_MAX = 5;
+ private static String cfgFileName="metar.cfg";
+ private static String cmdLnOptions="";
+ private static boolean refreshOptions=true;
+
/**
* Construct an instance of this transformer.
* @param cmdLine Command line options that may be used if these
@@ -411,4 +415,24 @@ public class MetarToShefTransformer extends
}
return sb;
}
-}
+
+ public final byte[] transformMetar(MetarRecord report, Headers headers)
+ throws TransformerException {
+ if (refreshOptions) {
+ logger.info("Metar to SHEF now use config file: "+cfgFileName+" with options:"+cmdLnOptions);
+ options.setCfgFileName(cfgFileName);
+ options.updateCommandLine(cmdLnOptions);
+ options.updateOptions();
+ refreshOptions=false;
+ }
+ configureArchiveDir();
+
+ return transformReport(report, headers);
+ }
+
+ public static void setCfgNOption (String cfg, String options){
+ cfgFileName=cfg;
+ cmdLnOptions=options;
+ refreshOptions=true;
+ }
+}
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java
index 031ca96379..8adc2b0213 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java
@@ -179,6 +179,7 @@ public class ObsToSHEFOptions {
public static final String OPT_NO_HR_TRACE = "optNoHourTrace";
+ private String cfgFileName=null;
// private static class PCReset {
//
// private final String stationId;
@@ -408,7 +409,11 @@ public class ObsToSHEFOptions {
initOptions();
parseCommandLine(cmdLine);
if (useLocalized) {
- readConfig(METAR_CFG, optConfigContext);
+ if (cfgFileName==null){
+ readConfig(METAR_CFG, optConfigContext);
+ } else {
+ readConfig(cfgFileName, optConfigContext);
+ }
updateTime = System.currentTimeMillis();
}
localized = useLocalized;
@@ -843,7 +848,11 @@ public class ObsToSHEFOptions {
long cTime = System.currentTimeMillis() - updateTime;
if (cTime > UPDATE_DELTA) {
if (loaded && localized) {
- readConfig(METAR_CFG, optConfigContext);
+ if (cfgFileName==null) {
+ readConfig(METAR_CFG, optConfigContext);
+ } else {
+ readConfig(cfgFileName, optConfigContext);
+ }
updateTime = System.currentTimeMillis();
}
}
@@ -874,7 +883,11 @@ public class ObsToSHEFOptions {
if (SITE_CONTEXT.equals(optConfigContext)) {
// Retry from a base context.
optConfigContext = BASE_CONTEXT;
- readConfig(METAR_CFG, optConfigContext);
+ if (cfgFileName==null) {
+ readConfig(METAR_CFG, optConfigContext);
+ }else{
+ readConfig(cfgFileName, optConfigContext);
+ }
}
}
} else {
@@ -973,6 +986,10 @@ public class ObsToSHEFOptions {
loaded = true;
}
+ public void setCfgFileName(String fileName) {
+ cfgFileName=fileName;
+ }
+
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/pythonPackages/pypies/pypies/impl/H5pyDataStore.py b/pythonPackages/pypies/pypies/impl/H5pyDataStore.py
index 0b42f69c29..b5b7c6c185 100644
--- a/pythonPackages/pypies/pypies/impl/H5pyDataStore.py
+++ b/pythonPackages/pypies/pypies/impl/H5pyDataStore.py
@@ -30,6 +30,7 @@
# 06/16/10 njensen Initial Creation.
# 05/03/11 9134 njensen Optimized for pointdata
# 10/09/12 rjpeter Optimized __getGroup for retrievals
+# 01/17/13 DR 15294 D. Friedman Clear out data in response
#
#
#
@@ -94,6 +95,9 @@ class H5pyDataStore(IDataStore.IDataStore):
except:
logger.warn("Exception occurred on file " + fn + ":" + IDataStore._exc())
exc.append(IDataStore._exc())
+ # Clear out data so we don't send the whole thing back to the client.
+ # NOTE: This assumes pypies no longer needs the data
+ r.putDataObject(None)
failRecs.append(r)
if ss:
diff --git a/rpms/awips2.core/Installer.ldm/component.spec b/rpms/awips2.core/Installer.ldm/component.spec
index b6481310af..dba0c07bbc 100644
--- a/rpms/awips2.core/Installer.ldm/component.spec
+++ b/rpms/awips2.core/Installer.ldm/component.spec
@@ -5,7 +5,7 @@
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Version: 6.8.1
-Release: 28
+Release: 29
Group: AWIPSII
BuildRoot: /tmp
URL: N/A