Changeset 6540

Timestamp:

09/22/15 09:51:12 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

 

File:

• vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/CSVTransformer.java (modified) (1 diff)

vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/CSVTransformer.java

@@ -98 +98 @@
                 InputStream input;
                 try{
-                        input = CSVTransformer.class.getResourceAsStream("/" + Constants.CSV_PATH + map + ".csv");
-                        //input = new FileInputStream(Constants.CSV_PATH + map + ".csv");
-                }catch(NullPointerException e){
+                        input = new FileInputStream(Constants.CSV_PATH + map + ".csv");
+                }catch(FileNotFoundException e){
                         _logger.error("Could not find the file " + Constants.CSV_PATH + map + ".csv", e);
                         _logger.info("trying with /" + Constants.CSV_PATH + map + ".csv");
-                        input = new FileInputStream("/" + Constants.CSV_PATH + map + ".csv");
+                        try{
+                                input = new FileInputStream("/" + Constants.CSV_PATH + map + ".csv");
+                        }catch(FileNotFoundException ex){
+                                _logger.error("Could not find the file /" + Constants.CSV_PATH + map + ".csv", e);
+                                _logger.info("trying to fetch from classpath /" + Constants.CSV_PATH + map + ".csv");
+                                input = CSVTransformer.class.getResourceAsStream("/" + Constants.CSV_PATH + map + ".csv");
+                        }
+                        
                         
                 }