Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/TkhColumnParser.java @ 8977:bf8a9df86f32
Two fixes for the tkh and selected additionals import
author | mschaefer |
---|---|
date | Tue, 03 Apr 2018 17:23:51 +0200 |
parents | 50416a0df385 |
children | 1f57381b3bb5 |
comparison
equal
deleted
inserted
replaced
8976:e541938dd3ab | 8977:bf8a9df86f32 |
---|---|
13 import java.io.File; | 13 import java.io.File; |
14 | 14 |
15 import org.apache.log4j.Logger; | 15 import org.apache.log4j.Logger; |
16 import org.dive4elements.river.importer.ImportRiver; | 16 import org.dive4elements.river.importer.ImportRiver; |
17 import org.dive4elements.river.importer.common.AbstractParser; | 17 import org.dive4elements.river.importer.common.AbstractParser; |
18 import org.dive4elements.river.importer.common.ParsingState; | |
18 import org.dive4elements.river.importer.sinfo.importitem.TkhColumnSeriesImport; | 19 import org.dive4elements.river.importer.sinfo.importitem.TkhColumnSeriesImport; |
19 import org.dive4elements.river.importer.sinfo.importitem.TkhKmLineImport; | 20 import org.dive4elements.river.importer.sinfo.importitem.TkhKmLineImport; |
20 import org.dive4elements.river.importer.sinfo.importitem.TkhSeriesImport; | 21 import org.dive4elements.river.importer.sinfo.importitem.TkhSeriesImport; |
21 import org.dive4elements.river.model.sinfo.TkhColumn; | 22 import org.dive4elements.river.model.sinfo.TkhColumn; |
22 import org.dive4elements.river.model.sinfo.TkhValue; | 23 import org.dive4elements.river.model.sinfo.TkhValue; |
63 getLog().info(String.format("Start parsing column %d '%s':;'%s'", this.colIndex, this.colName, this.rootRelativePath)); | 64 getLog().info(String.format("Start parsing column %d '%s':;'%s'", this.colIndex, this.colName, this.rootRelativePath)); |
64 } | 65 } |
65 | 66 |
66 @Override | 67 @Override |
67 protected boolean handleMetaOther() { | 68 protected boolean handleMetaOther() { |
68 // Skip any header line | 69 this.headerParsingState = ParsingState.IGNORE; |
69 return true; | 70 return false; |
70 } | 71 } |
71 | 72 |
72 @Override | 73 @Override |
73 protected TkhColumnSeriesImport createSeriesImport(final String filename) { | 74 protected TkhColumnSeriesImport createSeriesImport(final String filename) { |
74 return new TkhColumnSeriesImport(filename, this.parent, this.colName, this.rootRelativePath); | 75 return new TkhColumnSeriesImport(filename, this.parent, this.colName, this.rootRelativePath); |