Changeset 6317

Timestamp:

06/23/15 09:27:58 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

issue 768
https://trac.clarin.eu/ticket/768
checkDataRoot method from MetadataImporter? won't exist if dataRoot doesn't exist and it returns the list of existing data roots

MetadataImporterMultiDatarootsTest? tests checkDataRoot method

Location:

vlo/branches/vlo-3.3-oeaw/vlo-importer/src

Files:

• main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterMultiDatarootsTest.java (added)

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -19 +19 @@
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -200 +201 @@
     protected List<DataRoot> checkDataRoots() {
         List<DataRoot> dataRoots = config.getDataRoots();
+        List<DataRoot> existingDataRoots = new LinkedList<DataRoot>();
         for (DataRoot dataRoot : dataRoots) {
             if (!dataRoot.getRootFile().exists()) {
-                LOG.error("Root file " + dataRoot.getRootFile() + " does not exist. Probable configuration error so stopping import.");
-                System.exit(1);
-            }
-        }
-        return dataRoots;
+                LOG.error("Root file " + dataRoot.getRootFile() + " does not exist. Could be configuration error (see VLOConfig.xml)! Proceeding with next ...");
+//              LOG.error("Root file " + dataRoot.getRootFile() + " does not exist. Probable configuration error so stopping import.");
+//                System.exit(1);
+            } else{
+                existingDataRoots.add(dataRoot);
+            }
+        }
+        return existingDataRoots;
     }