Changeset 6257

Timestamp:

06/01/15 12:51:04 (9 years ago)

Author:

teckart@informatik.uni-leipzig.de

Message:

Update of TemporalCoverage? postprocessor + extension of unit test

Location:

vlo/trunk/vlo-importer/src

Files:

• main/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostProcessor.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostProcessorTest.java (modified) (2 diffs)

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostProcessor.java

@@ -9 +9 @@
 
     // Open Date Range Format
-    private static final Pattern ODRF_PATTERN = Pattern.compile("(([0-9]{4}(-[0-9]{2})?(-[0-9]{2})?)?/([0-9]{4}(-[0-9]{2})?(-[0-9]{2})?)?)");
-    // simple year
-    private static final Pattern YEAR_PATTERN = Pattern.compile("([0-9]{4}(-[0-9]{2})?(-[0-9]{2})?)");
+    private static final Pattern ODRF_PATTERN = Pattern.compile("^(([0-9]{4}(-[0-9]{2})?(-[0-9]{2})?)?/([0-9]{4}(-[0-9]{2})?(-[0-9]{2})?)?)");
+    // Simplified W3C DateTime
+    private static final Pattern DATETIME_PATTERN = Pattern.compile("^([0-9]{4}(-[0-9]{2})?(-[0-9]{2})?)");
 
     /**
-     * Tries to identify relevant year substrings in input
+     * Tries to identify relevant temporal substrings in input
      *
-     * @param value extracted year or date range String
+     * @param value extracted date or date range String
      * @return List of accepted values
      */
     @Override
     public List<String> process(final String value) {
-        Matcher odrfMatcher = ODRF_PATTERN.matcher(value);
-        Matcher yearMatcher = YEAR_PATTERN.matcher(value);
+        String coverageString = value.trim();
+        
+        Matcher odrfMatcher = ODRF_PATTERN.matcher(coverageString);
+        Matcher yearMatcher = DATETIME_PATTERN.matcher(coverageString);
         List<String> resultList = new ArrayList<String>();
 

vlo/trunk/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/TemporalCoveragePostProcessorTest.java

@@ -2 +2 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import org.junit.Test;
 
@@ -12 +11 @@
         assertEquals("/2012", processor.process("/2012").get(0));
         assertEquals("2012-02", processor.process("2012-02").get(0));
+        assertEquals("1997-07-16/1997-07-17", processor.process("1997-07-16/1997-07-17").get(0));
+        assertEquals("1994-11-05", processor.process("1994-11-05T08:15:30-05:00").get(0));
+        assertEquals(0, processor.process("northlimit=-16.4933; southlimit=-16.5617; westlimit=167.419; eastlimit=167.46").size());
         assertEquals(0, processor.process("1. November").size());
     }