Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/InfoGewParser.java @ 766:aa9e3da95c31
Importer: Fix import of annotation type classification.
flys-backend/trunk@2163 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 19 Jun 2011 17:43:38 +0000 |
| parents | 763c4137d6e1 |
| children |
comparison
equal
deleted
inserted
replaced
| 765:763c4137d6e1 | 766:aa9e3da95c31 |
|---|---|
| 57 | 57 |
| 58 LineNumberReader in = null; | 58 LineNumberReader in = null; |
| 59 | 59 |
| 60 File root = file.getParentFile(); | 60 File root = file.getParentFile(); |
| 61 | 61 |
| 62 ImportRiver importRiver = new ImportRiver(annotationClassifier); | |
| 63 try { | 62 try { |
| 64 in = | 63 in = |
| 65 new LineNumberReader( | 64 new LineNumberReader( |
| 66 new InputStreamReader( | 65 new InputStreamReader( |
| 67 new FileInputStream(file), ENCODING)); | 66 new FileInputStream(file), ENCODING)); |
| 80 | 79 |
| 81 if (m.matches()) { | 80 if (m.matches()) { |
| 82 String river = m.group(1); | 81 String river = m.group(1); |
| 83 log.info("Found river '" + river + "'"); | 82 log.info("Found river '" + river + "'"); |
| 84 if (riverName != null) { | 83 if (riverName != null) { |
| 85 rivers.add(new ImportRiver(riverName, wstFile, bbInfoFile)); | 84 rivers.add(new ImportRiver( |
| 85 riverName, | |
| 86 wstFile, | |
| 87 bbInfoFile, | |
| 88 annotationClassifier)); | |
| 86 } | 89 } |
| 87 riverName = river; | 90 riverName = river; |
| 88 wstFile = null; | 91 wstFile = null; |
| 89 bbInfoFile = null; | 92 bbInfoFile = null; |
| 90 } | 93 } |
| 107 String bbInfo = m.group(1); | 110 String bbInfo = m.group(1); |
| 108 bbInfoFile = new File(normalize(bbInfo)); | 111 bbInfoFile = new File(normalize(bbInfo)); |
| 109 } | 112 } |
| 110 } | 113 } |
| 111 if (riverName != null) { | 114 if (riverName != null) { |
| 112 rivers.add(new ImportRiver(riverName, wstFile, bbInfoFile)); | 115 rivers.add(new ImportRiver( |
| 116 riverName, | |
| 117 wstFile, | |
| 118 bbInfoFile, | |
| 119 annotationClassifier)); | |
| 113 } | 120 } |
| 114 } | 121 } |
| 115 finally { | 122 finally { |
| 116 if (in != null) { | 123 if (in != null) { |
| 117 in.close(); | 124 in.close(); |