Changeset 2995 for SRUClient

Timestamp:

06/05/13 14:30:15 (11 years ago)

Author:

oschonef

Message:

• add support for parsing schemaInfo within ZeeRex? (explain) record data

Location:

SRUClient/trunk/src

Files:

• main/java/eu/clarin/sru/client/SRUExplainRecordData.java (modified) (3 diffs)
• main/java/eu/clarin/sru/client/SRUExplainRecordDataParser.java (modified) (8 diffs)
• test/java/eu/clarin/sru/client/TestUtils.java (modified) (2 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUExplainRecordData.java

@@ -403 +403 @@
     } // class IndexInfo
 
+    public static class Schema {
+        private final String identifier;
+        private final String name;
+        private final String location;
+        private final boolean sort;
+        private final boolean retrieve;
+        private final List<LocalizedString> title;
+
+
+        Schema(String identifier, String name, String location, boolean sort,
+                boolean retrieve, List<LocalizedString> title) {
+            this.identifier = identifier;
+            this.name       = name;
+            this.location   = location;
+            this.sort       = sort;
+            this.retrieve   = retrieve;
+            if ((title != null) && !title.isEmpty()) {
+                this.title = Collections.unmodifiableList(title);
+            } else {
+                this.title = null;
+            }
+        }
+
+
+        public String getIdentifier() {
+            return identifier;
+        }
+
+
+        public String getName() {
+            return name;
+        }
+
+
+        public String getLocation() {
+            return location;
+        }
+
+
+        public boolean getSort() {
+            return sort;
+        }
+
+
+        public boolean getRetrieve() {
+            return retrieve;
+        }
+
+
+        public List<LocalizedString> getTitle() {
+            return title;
+        }
+    } // class SchemaInfo
+
     public static class ConfigInfo {
         private final Map<String, String> defaults;
@@ -447 +501 @@
     private final DatabaseInfo databaseInfo;
     private final IndexInfo indexInfo;
+    private final List<Schema> schemaInfo;
     private final ConfigInfo configInfo;
 
 
     SRUExplainRecordData(ServerInfo serverInfo, DatabaseInfo databaseInfo,
-            IndexInfo indexInfo, ConfigInfo configInfo) {
+            IndexInfo indexInfo, List<Schema> schemaInfo,
+            ConfigInfo configInfo) {
         this.serverInfo   = serverInfo;
         this.databaseInfo = databaseInfo;
         this.indexInfo    = indexInfo;
+        if ((schemaInfo != null) && !schemaInfo.isEmpty()) {
+            this.schemaInfo = Collections.unmodifiableList(schemaInfo);
+        } else {
+            this.schemaInfo = null;
+        }
         this.configInfo   = configInfo;
     }
@@ -481 +542 @@
 
 
+    public List<Schema> getSchemaInfo() {
+        return schemaInfo;
+    }
+
+
     public IndexInfo getIndexInfo() {
         return indexInfo;

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUExplainRecordDataParser.java

@@ -35 +35 @@
 import eu.clarin.sru.client.SRUExplainRecordData.IndexInfo;
 import eu.clarin.sru.client.SRUExplainRecordData.LocalizedString;
+import eu.clarin.sru.client.SRUExplainRecordData.Schema;
 import eu.clarin.sru.client.SRUExplainRecordData.ServerInfo;
 
@@ -134 +135 @@
 
         // explain/recordInfo or explain/schemaInfo
+        List<Schema> schemaInfo = null;
         if (XmlStreamReaderUtils.peekStart(reader, ns, "recordInfo") ||
             XmlStreamReaderUtils.peekStart(reader, ns, "schemaInfo")) {
             if (XmlStreamReaderUtils.readStart(reader,
                     ns, "recordInfo", false)) {
-                logger.debug("recordInfo");
+                logger.debug("skipping 'recordInfo'");
                 XmlStreamReaderUtils.readEnd(reader, ns, "recordInfo", true);
             } else if (XmlStreamReaderUtils.readStart(reader,
                     ns, "schemaInfo", false)) {
-                logger.debug("schemaInfo");
-                XmlStreamReaderUtils.readEnd(reader, ns, "schemaInfo", true);
+                schemaInfo = parseSchemaInfo(reader, strict, ns);
+                XmlStreamReaderUtils.readEnd(reader, ns, "schemaInfo");
             } else {
                 throw new XMLStreamException("unexpected start element '" +
@@ -159 +161 @@
         XmlStreamReaderUtils.readEnd(reader, ns, "explain", true);
         return new SRUExplainRecordData(serverInfo, databaseInfo, indexInfo,
-                configInfo);
+                schemaInfo, configInfo);
     }
 
@@ -448 +450 @@
                 final String id =
                         XmlStreamReaderUtils.readAttributeValue(reader, null, "id");
-                final boolean can_search =
-                        parseBooleanAttribute(reader, strict,null, "search");
-                final boolean can_scan =
-                        parseBooleanAttribute(reader, strict,null, "search");
-                final boolean can_sort =
-                        parseBooleanAttribute(reader, strict,null, "search");
+                final boolean can_search = parseBooleanAttribute(reader,
+                        strict, null, "search", false);
+                final boolean can_scan = parseBooleanAttribute(reader,
+                        strict, null, "scan", false);
+                final boolean can_sort = parseBooleanAttribute(reader,
+                        strict, null, "sort", false);
                 XmlStreamReaderUtils.consumeStart(reader);
 
@@ -476 +478 @@
                         first_map, true)) {
                     final boolean primary = parseBooleanAttribute(reader,
-                            strict, null, "primary");
+                            strict, null, "primary", false);
                     XmlStreamReaderUtils.consumeStart(reader);
 
@@ -599 +601 @@
         }
         final boolean primary =
-                parseBooleanAttribute(reader, strict, null, "primary");
+                parseBooleanAttribute(reader, strict, null, "primary", false);
         XmlStreamReaderUtils.consumeStart(reader);
         String value = XmlStreamReaderUtils.readString(reader, false);
@@ -608 +610 @@
 
     private static boolean parseBooleanAttribute(XMLStreamReader reader,
-            boolean strict, String ns, String localName)
+            boolean strict, String ns, String localName, boolean defaultValue)
             throws XMLStreamException {
-        boolean result = false;
+        boolean result = defaultValue;
         final String s = XmlStreamReaderUtils.readAttributeValue(reader,
                 ns, localName, false);
@@ -643 +645 @@
 
 
+    private static List<Schema> parseSchemaInfo(XMLStreamReader reader,
+            boolean strict, String ns) throws XMLStreamException {
+        /*
+         * schemaInfo (schema+)
+         * schema (title*)
+         */
+        List<Schema> schemaInfo = null;
+        boolean first_schema = true;
+        while (XmlStreamReaderUtils.readStart(reader, ns, "schema",
+                first_schema, true)) {
+            final String identifier =
+                    XmlStreamReaderUtils.readAttributeValue(reader,
+                            null, "identifier", true);
+            final String name = XmlStreamReaderUtils.readAttributeValue(reader,
+                    null, "name", true);
+            final String location =
+                    XmlStreamReaderUtils.readAttributeValue(reader,
+                            null, "location");
+            final boolean sort = parseBooleanAttribute(reader, strict,
+                    null, "sort", false);
+            final boolean retrieve = parseBooleanAttribute(reader, strict,
+                    null, "retrieve", true);
+            XmlStreamReaderUtils.consumeStart(reader);
+
+            List<LocalizedString> titles = null;
+            for (;;) {
+                LocalizedString title =
+                        parseStringI18N(reader, strict, ns, "title", false);
+                if (title == null) {
+                    break;
+                }
+                if (titles == null) {
+                    titles = new ArrayList<LocalizedString>();
+                }
+                titles.add(title);
+            } // for
+            XmlStreamReaderUtils.readEnd(reader, ns, "schema");
+
+            if (schemaInfo == null) {
+                schemaInfo = new ArrayList<Schema>();
+            }
+            schemaInfo.add(new Schema(identifier, name, location, sort,
+                    retrieve, titles));
+            first_schema = false;
+        }
+        return schemaInfo;
+    }
+
+
     private static Map<String, String> parseConfigInfoItem(
             XMLStreamReader reader, boolean strict, String ns,

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

@@ -25 +25 @@
 
 import eu.clarin.sru.client.SRUExplainRecordData.ConfigInfo;
+import eu.clarin.sru.client.SRUExplainRecordData.Schema;
 import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
 import eu.clarin.sru.client.fcs.DataView;
@@ -155 +156 @@
                     data.getServerInfo().getPort(),
                     data.getServerInfo().getDatabase());
+            List<Schema> schemaInfo = data.getSchemaInfo();
+            if (schemaInfo != null) {
+                for (Schema schema : schemaInfo) {
+                    logger.debug("schema: identifier={}, name={}, " +
+                            "location={}, sort={}, retrieve={}",
+                            schema.getIdentifier(),
+                            schema.getName(),
+                            schema.getLocation(),
+                            schema.getSort(),
+                            schema.getRetrieve());
+                }
+            }
             ConfigInfo configInfo = data.getConfigInfo();
             if (configInfo != null) {