Changeset 4611

Timestamp:

03/03/14 11:33:20 (10 years ago)

Author:

teckart

Message:

Fix ticket #490: "Sanitise document ID's on import" -> replacing problematic characters with their ASCII code in underscores

Location:

vlo/branches/vlo-3.0/vlo-importer/src

Files:

• main/java/eu/clarin/cmdi/vlo/importer/IdPostProcessor.java (added)
• main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java (modified) (5 diffs)
• test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -74 +74 @@
     final static Map<String, PostProcessor> POST_PROCESSORS = new HashMap<String, PostProcessor>();
     static {
+        POST_PROCESSORS.put(FacetConstants.FIELD_ID, new IdPostProcessor());
                 POST_PROCESSORS.put(FacetConstants.FIELD_CONTINENT, new ContinentNamePostProcessor());
         POST_PROCESSORS.put(FacetConstants.FIELD_COUNTRY, new CountryNamePostProcessor());

vlo/branches/vlo-3.0/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java

@@ -71 +71 @@
         CMDIDataProcessor processor = getDataParser();
         CMDIData data = processor.process(cmdiFile);
-        assertEquals("test-hdl:1839/00-0000-0000-0000-0001-D", data.getId());
+        assertEquals("test-hdl_58_1839_47_00-0000-0000-0000-0001-D", data.getId());
         List<Resource> resources = data.getMetadataResources();
         assertEquals(3, resources.size());
@@ -377 +377 @@
         CMDIDataProcessor processor = getDataParser();
         CMDIData data = processor.process(cmdiFile);
-        assertEquals("test-hdl:1839/00-0000-0000-0009-294C-9", data.getId());
+        assertEquals("test-hdl_58_1839_47_00-0000-0000-0009-294C-9", data.getId());
         List<Resource> resources = data.getMetadataResources();
         assertEquals(0, resources.size());
@@ -513 +513 @@
         CMDIDataProcessor processor = getDataParser();
         CMDIData data = processor.process(cmdiFile);
-        assertEquals("test-hdl:1839/00-0000-0000-0009-294C-9", data.getId());
+        assertEquals("test-hdl_58_1839_47_00-0000-0000-0009-294C-9", data.getId());
         List<Resource> resources = data.getMetadataResources();
         assertEquals(0, resources.size());
@@ -584 +584 @@
         CMDIDataProcessor processor = getDataParser();
         CMDIData data = processor.process(cmdiFile);
-        assertEquals("oai:ailla.utexas.edu:1", data.getId());
+        assertEquals("oai_58_ailla.utexas.edu_58_1", data.getId());
         List<Resource> resources = data.getMetadataResources();
         assertEquals(0, resources.size());
@@ -890 +890 @@
         CMDIDataProcessor processor = getDataParser();
         CMDIData data = processor.process(cmdiFile);
-        assertEquals("clarin.eu:lrt:433", data.getId());
+        assertEquals("clarin.eu_58_lrt_58_433", data.getId());
         List<Resource> resources = data.getMetadataResources();
         assertEquals(0, resources.size());

vlo/branches/vlo-3.0/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java

@@ -165 +165 @@
         assertEquals(1, docs.size());
         SolrInputDocument doc = docs.get(0);
-        assertEquals("hdl:11858/00-175C-0000-0000-E180-8", getValue(doc, FacetConstants.FIELD_ID));
+        assertEquals("hdl_58_11858_47_00-175C-0000-0000-E180-8", getValue(doc, FacetConstants.FIELD_ID));
         assertEquals("L'Est R\u00e9publicain : \u00e9dition du 17 mai 1999", getValue(doc, FacetConstants.FIELD_NAME));
         assertEquals("unknown type|http://hdl.handle.net/11858/00-175C-0000-0000-E180-8?urlappend=/TEI", getValue(doc,