xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development

Browse source 
Former-commit-id: 34191dc3dc [formerly 72f71bc000 [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]
Former-commit-id: 72f71bc000
Former-commit-id: f58481dc6a
This commit is contained in:
Lee Venable 2014-02-25 15:53:14 -06:00 • committed by Gerrit Code Review
commit 7bdf0b7396
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
View file

@ -487,7 +487,8 @@ public class StdCollectiveSeparator extends WMOMessageSeparator {
// If the XXX is 3 characters, and the origin starts with K, try
// prepending K or P (the latter for AK, HI products)
if ((trimmedXXX.length() == 3) && (origin.startsWith("K"))) {
if ((trimmedXXX.length() == 3)
&& (origin.startsWith("K") && !trimmedXXX.equals("RMK"))) {
newId = "K" + trimmedXXX;
if ((CCC_id = staticData.mapICAOToCCC(newId)) == null) {
newId = "P" + trimmedXXX;
@ -499,10 +500,10 @@ public class StdCollectiveSeparator extends WMOMessageSeparator {
}
}
// Otherwise, if the XXX is 3 characters, try prepending the first
// character of the origin.
else if (trimmedXXX.length() == 3) {
// character of the origin except "RMK" which is remark code.
else if (trimmedXXX.length() == 3 && !trimmedXXX.equals("RMK")) {
newId = origin.charAt(0) + trimmedXXX;
if ((CCC_id = staticData.mapICAOToCCC(XXX_id.toString())) == null) {
if ((CCC_id = staticData.mapICAOToCCC(newId)) == null) {
// logger.error("NCF_FAIL to map XXX to CCC: " + XXX_id);
return false;
}