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

ASM #17125 - Fix decoding of upper air collectives

Browse source 
Change-Id: I20e342561ce80460b2c1189277a45de539bc6540

Former-commit-id: 420ca2787415f4f609fd6016ace1435f87b740f4
This commit is contained in:
David Friedman 2015-02-18 16:21:31 +00:00
parent edae59425b
commit ab8a709eb6
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java
View file

@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
* Apr 02, 2014 2652 skorolev Corrected a removing of excess control characters.
* May 14, 2014 2536 bclement moved WMO Header to common
* Dec 03, 2014 ASM #16859 D. Friedman Use CharBuffer instead of StringBuilder.
* Feb 17, 2014 ASM #17125 D. Friedman Fix parsing of type and date fields.
* </pre>
*
* @author jkorman
@ -423,12 +424,18 @@ public class UACollectiveSeparator extends WMOMessageSeparator {
}
// Check for USUS80 or 90 formatted messages and decode
else if (dataDes.endsWith("80") || dataDes.endsWith("90")) {
/* // A1 logic. It is not clear what this was for.
if (checkCharNum(buffer.charAt(0))) {
buffer.get();
} else {
stationNum.append(assignTextSegment(buffer, CSPC));
}
*/
if (! checkCharNum(buffer.charAt(0))) {
buffer.get();
}
stationNum.append(assignTextSegment(buffer, CSPC));
getTextSegment(buffer, parsedMsg, CSEP);
} else {
// Otherwise it's standard format so decode
@ -442,18 +449,19 @@ public class UACollectiveSeparator extends WMOMessageSeparator {
// to be used as the station number instead of the third, so the
// length of a string between spaces is now used to determine a
// valid field.
CharBuffer stationSearchBuffer = buffer.duplicate();
int x = 0;
while (x < 2 && buffer.length() > 0) {
int len = buffer.length();
if (safeStrpbrk(buffer, CSPC)) {
if (len - buffer.length() >= 4) {
while (x < 2 && stationSearchBuffer.length() > 0) {
int len = stationSearchBuffer.length();
if (safeStrpbrk(stationSearchBuffer, CSPC)) {
if (len - stationSearchBuffer.length() >= 4) {
x++;
}
buffer.get();
stationSearchBuffer.get();
}
}
stationNum.append(assignTextSegment(buffer, CSPC));
stationNum.append(assignTextSegment(stationSearchBuffer, CSPC));
}
getTextSegment(buffer, parsedMsg, CSEP);