Changeset 6578

Timestamp:

09/23/15 08:23:16 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

 

Location:

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

Files:

• CSVTransformer.java (modified) (1 diff)
• VariantsMapMarshaller.java (modified) (2 diffs)

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

@@ -70 +70 @@
                 _logger.info("starting with conversion from csv to xml.");
                 
-                InputStreamReader isr = new InputStreamReader(csv, Charset.forName("UTF-8"));
+                InputStreamReader isr = new InputStreamReader(csv);
                 BufferedReader br = new BufferedReader(isr);
                 VariantsMap vm = csv2xmlTransformer(br);

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

@@ -17 +17 @@
         JAXBContext jc = JAXBContext.newInstance(VariantsMap.class);
         Unmarshaller unmarshaller = jc.createUnmarshaller();
-        unmarshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        //unmarshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
         return (VariantsMap) unmarshaller.unmarshal(input);        
     }
@@ -27 +27 @@
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
-        marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        //marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
         
         marshaller.marshal(map, output);