Mercurial > lada > lada-server
comparison src/main/java/de/intevation/lada/data/importer/LAFParser.java @ 316:2adf28ac7fe0
Stop parsing as soon as posible if laf content is not valid.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 21 Aug 2013 08:59:39 +0200 |
| parents | 821557a17e5e |
| children | 5844d7457dde |
comparison
equal
deleted
inserted
replaced
| 315:79cbc672d8e4 | 316:2adf28ac7fe0 |
|---|---|
| 43 } | 43 } |
| 44 | 44 |
| 45 public boolean parse(String laf) | 45 public boolean parse(String laf) |
| 46 throws LAFParserException | 46 throws LAFParserException |
| 47 { | 47 { |
| 48 if (!laf.startsWith("%PROBE%\n")) { | |
| 49 throw new LAFParserException("No %PROBE% at the begining."); | |
| 50 } | |
| 48 boolean parsed = false; | 51 boolean parsed = false; |
| 49 while (laf.startsWith("%PROBE%\n")) { | 52 while (laf.startsWith("%PROBE%\n")) { |
| 50 parsed = true; | 53 parsed = true; |
| 51 int nextPos = laf.indexOf(PROBE_NEXT); | 54 int nextPos = laf.indexOf(PROBE_NEXT); |
| 52 String single = ""; | 55 String single = ""; |
| 66 messwerte.addAll(producer.getMesswerte()); | 69 messwerte.addAll(producer.getMesswerte()); |
| 67 probeKommentare.addAll(producer.getProbenKommentare()); | 70 probeKommentare.addAll(producer.getProbenKommentare()); |
| 68 messungKommentare.addAll(producer.getMessungsKommentare()); | 71 messungKommentare.addAll(producer.getMessungsKommentare()); |
| 69 producer.reset(); | 72 producer.reset(); |
| 70 } | 73 } |
| 71 } | |
| 72 if (!parsed) { | |
| 73 throw new LAFParserException("No %PROBE% at the begining."); | |
| 74 } | 74 } |
| 75 return parsed; | 75 return parsed; |
| 76 } | 76 } |
| 77 | 77 |
| 78 private void readAll(String content) | 78 private void readAll(String content) |