Changeset 6804

Timestamp:

11/13/15 15:19:58 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

trying to read maps from files within given path and in case of error from classpath

File:

• vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) (1 diff)

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

@@ -61 +61 @@
                 
 
-                        _logger.info("Reading vocabulary file from: {}", mapUrl);
-                        // load records from file
-                        // in the future this should be loaded from CLAVAS directly and the
-                        // file only used as fallback
+                InputStream is = null;
+                File mapUrlFile = new File(mapUrl);
+                _logger.info("Reading vocabulary file from: {}", mapUrl);
+                // load records from file
+                // in the future this should be loaded from CLAVAS directly and the
+                // file only used as fallback
+                
+                
+                //try from file and if not exists fetch it from classpath (root of the vlo-vocabularies project)
+                Path p = Paths.get(mapUrl);
+                
+                try {
+                        is = new FileInputStream(mapUrlFile);
+                } catch (Exception e) {
+                        _logger.warn("File {} not found, trying to fetch it from classpath ...", mapUrl);
                         
-                        InputStream is = PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrl);
+                        is = PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrlFile.getName());
                         if(is == null)
                                 throw new RuntimeException("Cannot instantiate postProcessor, " + mapUrl + " is not on the classpath");
-                        
-                        try{
-                                return VariantsMapMarshaller.unmarshal(is);
-                        } catch (Exception e) {
-                                throw new RuntimeException("Cannot instantiate postProcessor: ", e);
-                        }
+                }
+                
+                try{
+                        return VariantsMapMarshaller.unmarshal(is);
+                } catch (Exception e) {
+                        throw new RuntimeException("Cannot instantiate postProcessor: ", e);
+                }