From d339f9f579c2ea4a85c8bf1b1d0f4305e5699996 Mon Sep 17 00:00:00 2001
From: "Qinglu.Lin" <Qinglu.Lin@noaa.gov>
Date: Wed, 25 Nov 2015 09:39:11 -0500
Subject: [PATCH 1/2] ASM #18347 - WarnGen: Unable to COR products that are
 stored in CAPS

Change-Id: I48ac643e66ba5419fc05ce552633ba8e68c53374

Former-commit-id: feb409510f3e3da7b8b121724d2105236bd393a6
---
 .../viz/warngen/template/TemplateRunner.java        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
index 9def23f73c..fdd1b0bf9d 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
@@ -740,10 +740,15 @@ public class TemplateRunner {
                         if (atIndex > 0) {
                             int hhmmStart = atIndex + 3;
                             hhmmEnd = message.indexOf(", ", hhmmStart);
-                            if (hhmmEnd > 0) {
-                                context.put("corToNewMarker", "cortonewmarker");
-                                context.put("corEventtime",
-                                        message.substring(hhmmStart, hhmmEnd));
+                            if (hhmmEnd < 0) {
+                                // check for ellipsis
+                                hhmmEnd = message.indexOf("...", hhmmStart);
+                            } else {
+                                if (hhmmEnd > 0) {
+                                    context.put("corToNewMarker", "cortonewmarker");
+                                    context.put("corEventtime",
+                                            message.substring(hhmmStart, hhmmEnd));
+                                }
                             }
                         }
                     }

From d78948342112ace2ca8e1470234a1d9a146c6004 Mon Sep 17 00:00:00 2001
From: "steve.naples" <Steve.Naples@noaa.gov>
Date: Wed, 25 Nov 2015 19:52:32 +0000
Subject: [PATCH 2/2] ASM #17986 - MPE: Fix array of QC codes to correspond to
 dialog box layout.

Change-Id: If2127996b3cc599fd09983f19ac3c000f961129f

Former-commit-id: 4d2b7ae803c6ca479fddcecbbab759ddd6234c43
---
 .../src/com/raytheon/viz/mpe/util/DailyQcUtils.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
index 2e5ff04a95..3b98b86ed2 100644
--- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
+++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
@@ -66,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Mar 10, 2015 14575      snaples     Added additional status flags.
  * Oct 14, 2015 17977      snaples     Fixed loadData to read station
  *                                     lists when new area, which means it needs to read some tokens also.
+ * Nov 25, 2015 17986      snaples     Updated array func to adjust QC codes for update to dialogs.
  * 
  * </pre>
  * 
@@ -437,7 +438,7 @@ public class DailyQcUtils {
 
     public static int new_area_flag = 0;
 
-    public int func[] = { 8, 0, 3, 1, 2 };
+    public int func[] = { 8, 3, 0, 1, 2 };
 
     public static int hrgt12z = -1;