add ilidata logic to ili2pgimport

sogis · Oct 26, 2023 · 673f0e9 · 673f0e9
1 parent 1c16a3d
commit 673f0e9
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 14 deletions.
diff --git a/gretl/src/integrationTest/jobs/Csv2Excel/20230124_sap_Gebaeude.xlsx b/gretl/src/integrationTest/jobs/Csv2Excel/20230124_sap_Gebaeude.xlsx
diff --git a/...nTest/jobs/XslTransformerFile/MeldungAnGeometer_G-0098981_20230214_104054_Koordinaten.xtf b/...nTest/jobs/XslTransformerFile/MeldungAnGeometer_G-0098981_20230214_104054_Koordinaten.xtf
@@ -19,7 +19,7 @@
             <Grundstuecksnummer>1505</Grundstuecksnummer>
             <EGRID>CH940632814686</EGRID>
             <NBIdent>SO0200002580</NBIdent>
-            <Datum_Meldung>2023-10-23</Datum_Meldung>
+            <Datum_Meldung>2023-10-26</Datum_Meldung>
             <Meldegrund>Anbau</Meldegrund>
             <Baujahr>2009</Baujahr>
             <Gebaeudebezeichnung>Reine Wohngebäude (Wohnnutzung ausschliesslich)</Gebaeudebezeichnung>

diff --git a/gretl/src/main/java/ch/so/agi/gretl/tasks/Ili2pgImport.java b/gretl/src/main/java/ch/so/agi/gretl/tasks/Ili2pgImport.java
@@ -30,21 +30,50 @@ public void importData() {
         if (dataFile == null) {
             return;
         }
-        FileCollection dataFilesCollection=null;
-        if(dataFile instanceof FileCollection) {
-            dataFilesCollection=(FileCollection)dataFile;
-        }else {
-            dataFilesCollection=getProject().files(dataFile);
-        }
-        if (dataFilesCollection == null || dataFilesCollection.isEmpty()) {
-            return;
-        }
+
+        // Liste mit saemtlicheen Dateipfaeden oder ilidata-Ids.
         List<String> files = new ArrayList<String>();
-        for (java.io.File fileObj : dataFilesCollection) {
-            String fileName = fileObj.getPath();
-            files.add(fileName);
+
+        FileCollection dataFilesCollection = null;
+        if(dataFile instanceof FileCollection) {
+            dataFilesCollection = (FileCollection) dataFile;
+
+            if (dataFilesCollection == null || dataFilesCollection.isEmpty()) {
+                return;
+            }
+
+            for (File fileObj : dataFilesCollection) {
+                String fileName = fileObj.getPath();
+                files.add(fileName);
+            }
+        } else if(dataFile instanceof File) {
+            File file = (File) dataFile;
+            files.add(file.getAbsolutePath());
+        } else if(dataFile instanceof String) {
+            String fileName = (String) dataFile;
+            if (fileName.startsWith("ilidata")) {
+                files.add(fileName);
+            } else {
+                File file = this.getProject().file(fileName);
+                files.add(file.getAbsolutePath());
+            }
+        } else {            
+            List<String> dataFileList = (ArrayList) dataFile;
+            for (String fileName : dataFileList) {
+
+                if (fileName.startsWith("ilidata")) {
+                    files.add(fileName);
+                } else {
+                    File file = this.getProject().file(fileName);
+                    files.add(file.getAbsolutePath());
+                }
+            }    
+            if (files.size() == 0) {
+                return;
+            }
         }
-        java.util.List<String> datasetNames=null;
+
+        List<String> datasetNames = null;
         if (dataset != null) {
             if(dataset instanceof String) {
                 datasetNames=new ArrayList<String>();