Changeset 6773

Timestamp:

11/09/15 16:05:52 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

postprocessor will try first to obtain normalisation map from file system and then from class path

File:

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

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

@@ -59 +59 @@
 
         protected VariantsMap getMappingFromFile(String mapUrl) {
-                try {
+                
 
                         _logger.info("Reading vocabulary file from: {}", mapUrl);
@@ -65 +65 @@
                         // in the future this should be loaded from CLAVAS directly and the
                         // file only used as fallback
-
-                        // InputStream is =
-                        // PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrl);
-                        InputStream is = new FileInputStream(new File(mapUrl));
-
-                        return VariantsMapMarshaller.unmarshal(is);
-                } catch (Exception e) {
-                        throw new RuntimeException("Cannot instantiate postProcessor:", e);
-                }
+                        
+                        
+                        //try from file first
+                        try {
+                                InputStream is = new FileInputStream(new File(mapUrl));
+                        } catch (Exception e) {
+                                _logger.warn("File {} not found, trying to fetch it from classpath ...", mapUrl);
+                                
+                                
+                        }
+                        
+                        //try from classpath
+                        
+                        InputStream is = PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrl);
+                        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);
+                        }
+                        
+                
         }