Changeset 6933 for SRUClient

Timestamp:

02/03/16 21:16:40 (8 years ago)

Author:

Oliver Schonefeld

Message:

• add first version of Advanced Data View parser (does not handle timestamps, yet)

Location:

SRUClient/trunk/src

Files:

• main/java/eu/clarin/sru/client/fcs/ClarinFCSClientBuilder.java (modified) (1 diff)
• main/java/eu/clarin/sru/client/fcs/ClarinFCSEndpointDescription.java (modified) (1 diff)
• main/java/eu/clarin/sru/client/fcs/DataViewAdvanced.java (added)
• main/java/eu/clarin/sru/client/fcs/DataViewParserAdvanced.java (added)
• test/java/eu/clarin/sru/client/TestUtils.java (modified) (3 diffs)

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

@@ -75 +75 @@
     public ClarinFCSClientBuilder addDefaultDataViewParsers() {
         doRegisterDataViewParser(parsers, new DataViewParserHits());
+        doRegisterDataViewParser(parsers, new DataViewParserAdvanced());
         return this;
     }

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

@@ -231 +231 @@
 
 
-        public Layer(String identifier, URI resultId, String layerType,
+        /**
+         * Constructor. <em>Internal use only!</em>
+         */
+        Layer(String identifier, URI resultId, String layerType,
                 ContentEncoding encoding, String qualifier,
                 String altValueInfo, URI altValueInfoURI) {

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestUtils.java

@@ -30 +30 @@
 import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
 import eu.clarin.sru.client.fcs.DataView;
+import eu.clarin.sru.client.fcs.DataViewAdvanced;
 import eu.clarin.sru.client.fcs.DataViewGenericDOM;
 import eu.clarin.sru.client.fcs.DataViewGenericString;
@@ -59 +60 @@
     public static SRUSearchRetrieveRequest makeSearchRequest(String baseURI, String query) {
         if ((query == null) || query.isEmpty()) {
-            query = "Faustus";
+            query = "'Faustus'";
         }
         SRUSearchRetrieveRequest request = new SRUSearchRetrieveRequest(baseURI);
-        request.setQuery(SRUClientConstants.QUERY_TYPE_CQL, query);
+        request.setQuery("fcs" /*SRUClientConstants.QUERY_TYPE_CQL*/, query);
 //        request.setRecordSchema(ClarinFCSRecordData.LEGACY_RECORD_SCHEMA);
         request.setMaximumRecords(5);
@@ -308 +309 @@
                 logger.info("{}DataView: {}",
                         s, addHitHighlights(hits));
+            } else if (dataview instanceof DataViewAdvanced) {
+                final DataViewAdvanced adv = (DataViewAdvanced) dataview;
+                logger.info("{}DataView: unit={}",
+                        s, adv.getUnit());
+                for (DataViewAdvanced.Layer layer : adv.getLayers()) {
+                    logger.info("{}DataView: Layer: id={}",
+                            s, layer.getId());
+                    for (DataViewAdvanced.Span span : layer.getSpans()) {
+                        logger.info("{}DataView:   Span: start={}, end={}, content={}",
+                                s, span.getStartOffset(), span.getEndOffset(), span.getContent());
+                    }
+                }
             } else {
                 logger.info("{}DataView: cannot display " +