From 6b1031a927cb88a20c9b7f71ad70184c901b224e Mon Sep 17 00:00:00 2001
From: Mike Duff <michael.duff@raytheon.com>
Date: Thu, 10 Jul 2014 15:56:08 -0500
Subject: [PATCH] Issue #3370 - Revert "Issue #3370 - Fix for mulitple shef
 types in same file."

This reverts commit 0d73c880f8b96034bf1f9b443aeb8dfcad2be382 [formerly 30655cf2ca1c194f0ab5a53c92c92d7b2e3b423e] [formerly e3b7a993886f75b6d9dba6f61fea761871131ff1 [formerly b5b61650d3e740e5dc1d2b80d0f05a6cbea653fc] [formerly 30655cf2ca1c194f0ab5a53c92c92d7b2e3b423e [formerly 0c0b14929f74f2262559a4919171623870139313]]].


Former-commit-id: c8bfcd54a39f4e41641f485ce15eb285220cae13 [formerly a35529bba4f759454c71a6fe3814054634249307] [formerly 73c75303a84d2f7a18a0fb73f524f975646cfe41 [formerly 43cbf77bb90ba12a6ee11bc35b18c226f9490a88]]
Former-commit-id: 73c75303a84d2f7a18a0fb73f524f975646cfe41
Former-commit-id: 6f18256c56006c9ef28b3564366a7aec8be09720
---
 .../edex/plugin/shef/database/PostShef.java   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

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 84235c2c59..ceafe1d177 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
@@ -123,7 +123,6 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * 05/28/2014   3222       mpduff      Fix posting time to be processed time so db doesn't show all post times the same
  * 06/02/2014              mpduff      Fix for caching of range checks.
  * 06/26/2014   3321       mpduff      Fix ingestSwitchMap checks
- * 07/10/2014   3370       mpduff      Fix update/insert issue for riverstatus
  * </pre>
  * 
  * @author mduff
@@ -275,6 +274,9 @@ public class PostShef {
     /** Basis time TimeStamp */
     private java.sql.Timestamp basisTimeAnsi = new Timestamp(basisBeginTime);
 
+    /** River status update flag. update if true */
+    private boolean riverStatusUpdateFlag = true;
+
     /** river status update query value */
     private boolean riverStatusUpdateValueFlag;
 
@@ -1103,6 +1105,7 @@ public class PostShef {
         // Reset .E cache vars
         tsList.clear();
         useLatest = MISSING;
+        riverStatusUpdateFlag = true;
         qualityCheckFlag = true;
         useTs = null;
         basisTimeValues = null;
@@ -1443,7 +1446,15 @@ public class PostShef {
         if ((shefList != null) && (shefList.size() > 0)) {
             ShefData maxShefDataValue = findMaxFcst(shefList);
 
-            riverStatusUpdateValueFlag = updateRiverStatus(lid, pe, ts);
+            if (shefRecord.getShefType() == ShefType.E) {
+                if (riverStatusUpdateFlag) {
+                    riverStatusUpdateFlag = false;
+
+                    riverStatusUpdateValueFlag = updateRiverStatus(lid, pe, ts);
+                }
+            } else {
+                riverStatusUpdateValueFlag = updateRiverStatus(lid, pe, ts);
+            }
             postTables.postRiverStatus(shefRecord, maxShefDataValue,
                     riverStatusUpdateValueFlag);
         } else {
@@ -2146,8 +2157,10 @@ public class PostShef {
 
         try {
             if (!ingestSwitchMap.containsKey(key)) {
+                errorMsg.append("Error getting connection to IHFS Database");
                 sql = "select lid, pe, dur, ts, extremum, ts_rank, ingest, ofs_input, stg2_input from IngestFilter where lid = '"
                         + locId + "'";
+                errorMsg.setLength(0);
                 errorMsg.append("Error requesting IngestFilter data:  " + sql);
                 oa = dao.executeSQLQuery(sql);
                 if (oa.length > 0) {
@@ -2183,7 +2196,6 @@ public class PostShef {
                 ingestSwitchMap.put(key, ingestSwitch);
             }
 
-            matchFound = ingestSwitchMap.containsKey(key);
             ingestSwitch = ingestSwitchMap.get(key);
 
             /*
@@ -2432,7 +2444,7 @@ public class PostShef {
         if (!matchFound) {
             log.warn(locId + " - " + data.getPhysicalElement() + "("
                     + data.getDuration() + ")" + data.getTypeSource()
-                    + data.getExtremum() + " ingest filter not defined");
+                    + data.getExtremum() + " ingest " + "filter not defined");
             stats.incrementWarningMessages();
             ingestSwitch = ShefConstants.IngestSwitch.POST_PE_OFF;
         }