Changeset 6322

Timestamp:

06/24/15 12:21:17 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

#768

in case of non existing data root WARN msg instead of ERROR is printed
public static String CL_DATAROOTS_LIST changed to private String
more understandable var names
comments

File:

• vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (7 diffs)

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

@@ -93 +93 @@
      */
     public MetadataImporter() {}
+    
+    public MetadataImporter(String clDatarootsList) {
+        this.clDatarootsList = clDatarootsList;
+    }
 
     /**
@@ -207 +211 @@
         for (DataRoot dataRoot : dataRoots) {
             if (!dataRoot.getRootFile().exists()) {
-                LOG.error("Root file " + dataRoot.getRootFile() + " does not exist. It could be configuration error! Proceeding with next ...");
+                LOG.warn("Root file " + dataRoot.getRootFile() + " does not exist. It could be configuration error! Proceeding with next ...");
             } else{
                 existingDataRoots.add(dataRoot);
@@ -223 +227 @@
      */
     protected List<DataRoot> filterDataRootsWithCLArgs(List<DataRoot> dataRoots){
-        if(CL_DATAROOTS_LIST == null)
+        if(clDatarootsList == null)
                 return dataRoots;
         
-        //filter data
         
-        LOG.info("Filtering configured data root files with command line arguments: " + CL_DATAROOTS_LIST) ;
+        LOG.info("Filtering configured data root files with command line arguments: \"" + clDatarootsList + "\"" ) ;
         
-        LinkedList<File> cl_dataroots = new LinkedList<File>();
+        LinkedList<File> fsDataRoots = new LinkedList<File>();
         
-        List<String> paths = Arrays.asList((CL_DATAROOTS_LIST.split("\\s+")));
+        List<String> paths = Arrays.asList((clDatarootsList.split("\\s+")));
         
+        //Convert String paths to File objects for comparison
         for(String path: paths)
-                cl_dataroots.add(new File(path));
+                fsDataRoots.add(new File(path));
         
         List<DataRoot> filteredDataRoots = new LinkedList<DataRoot>();
         try{
+                //filter data
         dr: for(DataRoot dataRoot: dataRoots){
-                        for(File cldr: cl_dataroots){
-                        if(cldr.getCanonicalPath().equals(dataRoot.getRootFile().getCanonicalPath())){
+                        for(File fsDataRoot: fsDataRoots){
+                        if(fsDataRoot.getCanonicalPath().equals(dataRoot.getRootFile().getCanonicalPath())){
                                 filteredDataRoots.add(dataRoot);
-                                cl_dataroots.remove(cldr);
+                                fsDataRoots.remove(fsDataRoot);
                                 continue dr;
                         }
@@ -566 +571 @@
     
     //data roots passed from command line    
-    public static String CL_DATAROOTS_LIST = null;
+    private String clDatarootsList = null;
     
     /**
@@ -580 +585 @@
         // use the Apache cli framework for getting command line parameters
         Options options = new Options();
+        
+        // Data root list passed from command line with -l option
+        String cldrList = null;
 
         /**
          * Add a "c" option, the option indicating the specification of an XML
          * configuration file
+         * 
+         * "l" option - to specify which data roots (from config file) to import 
+         * imports all by default
          */
         options.addOption("c", true, "-c <file> : use parameters specified in <file>");
@@ -602 +613 @@
             
             if(cmd.hasOption("l")){
-                CL_DATAROOTS_LIST = cmd.getOptionValue("l");
+                cldrList = cmd.getOptionValue("l");
             }
             
@@ -651 +662 @@
             // optionally, modify the configuration here
             // create and start the importer
-            MetadataImporter importer = new MetadataImporter();
+            MetadataImporter importer = new MetadataImporter(cldrList);
             importer.startImport();