Changeset 5799 for SRUClient

Timestamp:

11/12/14 00:07:48 (10 years ago)

Author:

Oliver Schonefeld

Message:

• add support for EndpointDescription? parsing

Location:

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

Files:

• TestClient.java (modified) (2 diffs)
• TestUtils.java (modified) (5 diffs)

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

@@ -21 +21 @@
 
 import eu.clarin.sru.client.fcs.ClarinFCSClientBuilder;
+import eu.clarin.sru.client.fcs.ClarinFCSEndpointDescriptionParser;
 
 
@@ -36 +37 @@
                     .unknownDataViewAsString()
                     .enableLegacySupport()
+                    .registerExtraResponseDatar(
+                            new ClarinFCSEndpointDescriptionParser())
                     .buildClient();
 

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

@@ -17 +17 @@
 package eu.clarin.sru.client;
 
+import java.net.URI;
 import java.util.List;
 
@@ -25 +26 @@
 import eu.clarin.sru.client.SRUExplainRecordData.ConfigInfo;
 import eu.clarin.sru.client.SRUExplainRecordData.Schema;
+import eu.clarin.sru.client.fcs.ClarinFCSEndpointDescription;
+import eu.clarin.sru.client.fcs.ClarinFCSEndpointDescription.ResourceInfo;
 import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
 import eu.clarin.sru.client.fcs.DataView;
@@ -39 +42 @@
         SRUExplainRequest request = new SRUExplainRequest(baseURI);
         request.setExtraRequestData("x-indent-response", "4");
+        request.setExtraRequestData("x-fcs-endpoint-description", "true");
         request.setParseRecordDataEnabled(true);
         return request;
@@ -82 +86 @@
             if (record.isRecordSchema(SRUExplainRecordData.RECORD_SCHEMA)) {
                 dumpExplainRecordData(record.getRecordData());
+            }
+            if (record.hasExtraRecordData()) {
+                logger.info("extraRecordInfo = {}",
+                        record.getExtraRecordData());
+            }
+        }
+        if (response.hasExtraResponseData()) {
+            for (SRUExtraResponseData data : response.getExtraResponseData()) {
+                if (data instanceof ClarinFCSEndpointDescription) {
+                    dumpEndpointDescription(
+                            (ClarinFCSEndpointDescription) data);
+                } else {
+                    logger.info("extraResponseData = {} (class={})",
+                            data.getRootElement(), data.getClass().getName());
+                }
+
             }
         }
@@ -200 +220 @@
                     dumpDataView("CLARIN-FCS: ResourceFragment/", fragment.getDataViews());
                 }
+            }
+        }
+    }
+
+
+    private static void dumpEndpointDescription(ClarinFCSEndpointDescription ed) {
+        logger.info("dumping <EndpointDescription> (version={})",
+                ed.getVersion());
+        for (URI capability : ed.getCapabilities()) {
+            logger.info("  capability: {}", capability);
+        } // for
+        for (ClarinFCSEndpointDescription.DataView dataView :
+            ed.getSupportedDataViews()) {
+            logger.info("  supportedDataView: id={}, type={}, policy={}",
+                    dataView.getIdentifier(),
+                    dataView.getMimeType(),
+                    dataView.getDeliveryPolicy());
+        } // for
+        dumpResourceInfo(ed.getResources(), 1, "  ");
+    }
+
+
+    private static void dumpResourceInfo(List<ResourceInfo> ris, int depth,
+            String indent) {
+        for (ResourceInfo ri : ris) {
+            logger.info("{}[depth={}] <ResourceInfo>", indent, depth);
+            logger.info("{}    pid={}", indent, ri.getPid());
+            logger.info("{}    title: {}", indent, ri.getTitle());
+            if (ri.getDescription() != null) {
+                logger.info("{}    description: {}",
+                        indent, ri.getDescription());
+            }
+            if (ri.getLandingPageURI() != null) {
+                logger.info("{}    landingPageURI: {}",
+                        indent, ri.getLandingPageURI());
+            }
+            for (ClarinFCSEndpointDescription.DataView dv :
+                ri.getAvailableDataViews()) {
+                logger.info("{}    available dataviews: type={}, policy={}",
+                        indent, dv.getMimeType(), dv.getDeliveryPolicy());
+            }
+            if (ri.hasSubResources()) {
+                dumpResourceInfo(ri.getSubResources(),
+                        depth + 1, indent + "  ");
             }
         }