Changeset 6541

Timestamp:

09/22/15 09:58:16 (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

@@ -95 +95 @@
         public synchronized void csv2xml(String map) throws IOException, JAXBException{
                 _logger.info("Current directory: {}", System.getProperty("user.dir"));
-                _logger.info("reading from file {}{}.csv.", Constants.CSV_PATH, map);
-                InputStream input;
-                try{
-                        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");
-                        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");
-                        }
-                        
-                        
-                }
-                
-                _logger.info("output will be saved into {}{}.xml.", Constants.MAPS_PATH, map);
-            OutputStream output = new FileOutputStream(Constants.MAPS_PATH + map + ".xml");
+                
+                _logger.info("reading from file {}{}.csv.", Constants.CSV_PATH, map);           
+                InputStream input = CSVTransformer.class.getResourceAsStream("/" + Constants.CSV_PATH + map + ".csv");
+                
+                _logger.info("output will be saved into {}{}.xml.", Constants.MAPS_PATH, map);          
+            OutputStream output = CSVTransformer.class.getResource("/" + Constants.MAPS_PATH + map + ".xml").openConnection().getOutputStream();
             
             csv2xml(input, output);