Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 4716:6016b9aa827a
Adjust callbacks after Parsers new interface implementation, re-enable file hashing for da66s.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 19 Dec 2012 14:59:55 +0100 |
parents | 70842db72ee4 |
children | c30152f77f77 |
comparison
equal
deleted
inserted
replaced
4715:2f7a509f5acf | 4716:6016b9aa827a |
---|---|
20 import de.intevation.artifacts.common.utils.FileTools.HashedFile; | 20 import de.intevation.artifacts.common.utils.FileTools.HashedFile; |
21 import de.intevation.flys.importer.parsers.AnnotationClassifier; | 21 import de.intevation.flys.importer.parsers.AnnotationClassifier; |
22 import de.intevation.flys.importer.parsers.AnnotationsParser; | 22 import de.intevation.flys.importer.parsers.AnnotationsParser; |
23 import de.intevation.flys.importer.parsers.BedHeightEpochParser; | 23 import de.intevation.flys.importer.parsers.BedHeightEpochParser; |
24 import de.intevation.flys.importer.parsers.BedHeightSingleParser; | 24 import de.intevation.flys.importer.parsers.BedHeightSingleParser; |
25 import de.intevation.flys.importer.parsers.CrossSectionParser; | |
25 import de.intevation.flys.importer.parsers.DA66Parser; | 26 import de.intevation.flys.importer.parsers.DA66Parser; |
26 import de.intevation.flys.importer.parsers.FlowVelocityMeasurementParser; | 27 import de.intevation.flys.importer.parsers.FlowVelocityMeasurementParser; |
27 import de.intevation.flys.importer.parsers.FlowVelocityModelParser; | 28 import de.intevation.flys.importer.parsers.FlowVelocityModelParser; |
28 import de.intevation.flys.importer.parsers.HYKParser; | 29 import de.intevation.flys.importer.parsers.HYKParser; |
29 import de.intevation.flys.importer.parsers.MeasurementStationsParser; | 30 import de.intevation.flys.importer.parsers.MeasurementStationsParser; |
97 public static final String MINFO_BASE_DIR = "Basisdaten"; | 98 public static final String MINFO_BASE_DIR = "Basisdaten"; |
98 | 99 |
99 public static final String MINFO_CORE_DATA_FILE = "Stammdaten_Messstellen.csv"; | 100 public static final String MINFO_CORE_DATA_FILE = "Stammdaten_Messstellen.csv"; |
100 | 101 |
101 public static final String MINFO_SQ_DIR = "Feststofftransport-Abfluss-Beziehung"; | 102 public static final String MINFO_SQ_DIR = "Feststofftransport-Abfluss-Beziehung"; |
102 | |
103 | 103 |
104 protected String name; | 104 protected String name; |
105 | 105 |
106 protected File wstFile; | 106 protected File wstFile; |
107 | 107 |
900 File riverDir = wstFile | 900 File riverDir = wstFile |
901 .getParentFile() // Basisdaten | 901 .getParentFile() // Basisdaten |
902 .getParentFile() // Hydrologie | 902 .getParentFile() // Hydrologie |
903 .getParentFile(); // <river> | 903 .getParentFile(); // <river> |
904 | 904 |
905 parser.parseDA66s(riverDir, new DA66Parser.Callback() { | 905 parser.parseDA66s(riverDir, new CrossSectionParser.Callback() { |
906 | 906 |
907 Set<HashedFile> da66s = new HashSet<HashedFile>(); | 907 Set<HashedFile> da66s = new HashSet<HashedFile>(); |
908 | 908 |
909 @Override | 909 @Override |
910 public boolean da66Accept(File file) { | 910 public boolean accept(File file) { |
911 HashedFile hf = new HashedFile(file); | 911 HashedFile hf = new HashedFile(file); |
912 boolean success = da66s.add(hf); | 912 boolean success = da66s.add(hf); |
913 return true; | |
914 // TODO for some reason they are all duplicates, reenable the check! | |
915 /* | |
916 if (!success) { | 913 if (!success) { |
917 log.warn("DA66 file '" + file + "' seems to be a duplicate."); | 914 log.warn("DA66 file '" + file + "' seems to be a duplicate."); |
918 } | 915 } |
919 return success; | 916 return success; |
920 */ | |
921 } | 917 } |
922 | 918 |
923 @Override | 919 @Override |
924 public void da66Parsed(DA66Parser parser) { | 920 public void parsed(CrossSectionParser parser) { |
925 log.debug("callback from DA66 parser"); | 921 log.debug("callback from DA66 parser"); |
926 | 922 |
927 // TODO populate with real-world data | 923 // TODO populate with real-world data |
928 String description = "dummy";//parser.getDescription(); | 924 String description = "dummy";//parser.getDescription(); |
929 Integer year = 2012;//parser.getYear(); | 925 Integer year = 2012;//parser.getYear(); |
962 | 958 |
963 parser.parsePRFs(riverDir, new PRFParser.Callback() { | 959 parser.parsePRFs(riverDir, new PRFParser.Callback() { |
964 | 960 |
965 Set<HashedFile> prfs = new HashSet<HashedFile>(); | 961 Set<HashedFile> prfs = new HashSet<HashedFile>(); |
966 | 962 |
963 // TODO merge Callback implementation with DA66 one. | |
967 @Override | 964 @Override |
968 public boolean prfAccept(File file) { | 965 public boolean accept(File file) { |
969 HashedFile hf = new HashedFile(file); | 966 HashedFile hf = new HashedFile(file); |
970 boolean success = prfs.add(hf); | 967 boolean success = prfs.add(hf); |
971 if (!success) { | 968 if (!success) { |
972 log.warn("PRF file '" + file + "' seems to be a duplicate."); | 969 log.warn("PRF file '" + file + "' seems to be a duplicate."); |
973 } | 970 } |
974 return success; | 971 return success; |
975 } | 972 } |
976 | 973 |
977 @Override | 974 @Override |
978 public void prfParsed(PRFParser parser) { | 975 public void parsed(CrossSectionParser parser) { |
979 log.debug("callback from PRF parser"); | 976 log.debug("callback from PRF parser"); |
980 | 977 |
981 String description = parser.getDescription(); | 978 String description = parser.getDescription(); |
982 Integer year = parser.getYear(); | 979 Integer year = parser.getYear(); |
983 ImportTimeInterval ti = year != null | 980 ImportTimeInterval ti = year != null |