From 531dafbe7d85c3647472ebc55493a9569270a46c Mon Sep 17 00:00:00 2001 From: Slav Korolev Date: Fri, 21 Mar 2014 15:25:51 -0400 Subject: [PATCH] Issue #2652. Fixed issue with edex-text-ingest log. Corrected. Change-Id: I0064146b6b6d1c05955f513ab9eda9b6ba03de76 Former-commit-id: 0fc3c30f61a5e1f301ffc6e01dbcbd0bc3c5308f [formerly c730d58f6c7304b8387ab60ce36c0982fe8095fc] [formerly 4786aa382bbb699c6262563378030a533e863135] [formerly 0fc3c30f61a5e1f301ffc6e01dbcbd0bc3c5308f [formerly c730d58f6c7304b8387ab60ce36c0982fe8095fc] [formerly 4786aa382bbb699c6262563378030a533e863135] [formerly 88fbcc2ca67b01df2945d96e8f05cecdfbae7162 [formerly 4786aa382bbb699c6262563378030a533e863135 [formerly dd0660d1b51aef2e3e703fd21c0f1d98f3484fbc]]]] Former-commit-id: 88fbcc2ca67b01df2945d96e8f05cecdfbae7162 Former-commit-id: db8fdc42120ea06b9b8c7486d0c7f84268ebf42b [formerly 84d8d13da7e90c5a0ea3815669d81abbd8d2b9ce] [formerly 2cde309c31fba804ae73c7c2ead1657f5e912896 [formerly c6f98da81c23e1640f30ecc0fc062af50a37a766]] Former-commit-id: 2989e26b9c8a2180401c22bdaf270838a6ca639a [formerly 49bd53ef7cd8306a5e3e5eeeac8ad0f75000187a] Former-commit-id: 54e1c39279ec57637b4b4ba261c797f47052c694 --- .../plugin/text/impl/separator/StdCollectiveSeparator.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java b/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java index 3e84320f3a..03e917c7b0 100644 --- a/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java +++ b/edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java @@ -140,13 +140,8 @@ public class StdCollectiveSeparator extends WMOMessageSeparator { } String rawMsg = new String(rawData, startIndex, endIndex - startIndex); StringBuilder sb = null; - // This is a fake line "METXXX" to permit skipping of NNNXXX pattern - // line. if ((rawMsg.indexOf(METAR) == 0) || (rawMsg.indexOf(SPECI) == 0)) { productType = (rawMsg.indexOf(METAR) == 0 ? METAR : SPECI); - sb = new StringBuilder(rawMsg); - sb.insert(0, "METXXX\n"); - rawMsg = sb.toString(); } if ("TAF".equals(afos_id.getNnn())) { @@ -161,7 +156,7 @@ public class StdCollectiveSeparator extends WMOMessageSeparator { rawMsg = sb.toString(); } Matcher nnnxxxMatcher = NNNXXX.matcher(rawMsg); - if (nnnxxxMatcher.find()) { + if (nnnxxxMatcher.find() && nnnxxxMatcher.start() == 0) { rawMsg = rawMsg.substring(nnnxxxMatcher.end()); } StringBuilder buffer = new StringBuilder(rawMsg);