Changeset 5743 for SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java

Timestamp:

10/24/14 14:01:20 (10 years ago)

Author:

Oliver Schonefeld

Message:

• more work-in-progress

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java (modified) (4 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java

@@ -29 +29 @@
     private static final String FCS_KWIC_NS = "http://clarin.eu/fcs/1.0/kwic";
     private static final String KWIC_LEGACY_TYPE = "kwic";
+    private static final String KWIC_TYPE =
+            "application/x-clarin-fcs-kwic+xml";
     private static final Logger logger =
             LoggerFactory.getLogger(DataViewParserKWIC.class);
@@ -34 +36 @@
     @Override
     public boolean acceptType(String type) {
-        return DataViewKWIC.TYPE.equals(type) ||
-                KWIC_LEGACY_TYPE.equals(type);
+        return KWIC_TYPE.equals(type) || KWIC_LEGACY_TYPE.equals(type);
     }
 
@@ -47 +48 @@
             String ref) throws XMLStreamException, SRUClientException {
         if (KWIC_LEGACY_TYPE.equals(type)) {
-            logger.warn("type '" + KWIC_LEGACY_TYPE + "' is deprecteded for a KWIC <DataView>, please use '" + DataViewKWIC.TYPE + "' instead");
+            logger.warn("type '" + KWIC_LEGACY_TYPE + "' is deprecated " +
+                    "for a KWIC <DataView>, please use '" +
+                    KWIC_TYPE + "' instead");
         }
         String left = null;
@@ -67 +70 @@
         logger.debug("left='{}' keyword='{}', right='{}'",
                 left, keyword, right);
-        return new DataViewKWIC(pid, ref, left, keyword, right);
+
+        logger.warn("Upgraded deprecated KWIC dataview to HITS dataview. " +
+                "Please upgrade to the new CLARIN-FCS specification " +
+                "as soon as possible.");
+        final int[] offsets    = new int[3];
+        final StringBuilder sb = new StringBuilder();
+        if (left != null) {
+            sb.append(left);
+            if (!Character.isWhitespace(sb.charAt(sb.length() - 1))) {
+                sb.append(" ");
+            }
+        }
+        offsets[0] = sb.length();
+        sb.append(keyword);
+        offsets[1] = sb.length();
+        if (right != null) {
+            if (!Character.isWhitespace(sb.charAt(sb.length() - 1))) {
+                sb.append(" ");
+            }
+            sb.append(right);
+        }
+        return new DataViewHits(pid, ref, sb.toString(), offsets, 3);
     }