Changeset 7171 for SRUClient

Timestamp:

03/22/18 20:46:25 (6 years ago)

Author:

Oliver Schonefeld

Message:

• fix parsing of SRU 2.0 responses that include a record identifier

Location:

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

Files:

• SRUSimpleClient.java (modified) (6 diffs)
• SRUVersion.java (modified) (1 diff)

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

@@ -511 +511 @@
                 // XXX: what to do with it?
                 SRURecordPacking recordPacking = null;
-                if (version == SRUVersion.VERSION_2_0) {
+                if (version.isVersion(SRUVersion.VERSION_2_0)) {
                     recordPacking = parseRecordPacking(reader,
                             ns.sruNS(), strictMode);
                 }
 
+                // recordXmlEscaping (used to be recordPacking in SRU 1.0/1.2)
                 if (recordXmlEscaping == null) {
                     recordXmlEscaping = parseRecordXmlEscaping(reader, ns,
@@ -571 +572 @@
                 reader.readEnd(ns.sruNS(), "recordData", true);
 
-                if (version == SRUVersion.VERSION_1_2) {
+                if (version.isVersion(SRUVersion.VERSION_1_2,
+                        SRUVersion.VERSION_2_0)) {
                     reader.readContent(ns.sruNS(), "recordIdentifier", false);
                 }
@@ -967 +969 @@
                             // XXX: what to do with it?
                             SRURecordPacking recordPacking = null;
-                            if (version == SRUVersion.VERSION_2_0) {
+                            if (version.isVersion(SRUVersion.VERSION_2_0)) {
                                 recordPacking = parseRecordPacking(reader,
                                         ns.sruNS(), strictMode);
@@ -1085 +1087 @@
 
                             String identifier = null;
-                            if (version == SRUVersion.VERSION_1_2) {
+                            if (version.isVersion(SRUVersion.VERSION_1_2,
+                                    SRUVersion.VERSION_2_0)) {
                                 identifier = reader.readContent(ns.sruNS(),
                                         "recordIdentifier", false);
@@ -1221 +1224 @@
                 }
 
-                if (version == SRUVersion.VERSION_2_0) {
+                if (version.isVersion(SRUVersion.VERSION_2_0)) {
                     // SRU (2.0) arbitrary stuff
                     // SRU (2.0) resultSetTTL (replaces resultSetIdleTime)
@@ -1373 +1376 @@
             throws XMLStreamException, SRUClientException {
 
-        final String name = (version == SRUVersion.VERSION_2_0)
+        final String name = version.isVersion(SRUVersion.VERSION_2_0)
                           ? "recordXMLEscaping" : "recordPacking";
         final String s = reader.readContent(ns.sruNS(), name, true);

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

@@ -24 +24 @@
      * SRU/CQL version 1.1
      */
-    VERSION_1_1,
+    VERSION_1_1 {
+        @Override
+        public int getVersionNumber() {
+            return ((1 << 16) | 1);
+        }
+    },
 
     /**
      * SRU/CQL version 1.2
      */
-    VERSION_1_2,
+    VERSION_1_2 {
+        @Override
+        public int getVersionNumber() {
+            return ((1 << 16) | 2);
+        }
+    },
 
     /**
      * SRU/CQL version 2.0
      */
-    VERSION_2_0;
+    VERSION_2_0 {
+        @Override
+        public int getVersionNumber() {
+            return ((2 << 16) | 0);
+        }
+    };
+
+    
+    /**
+     * Get a numerical representation of the version.
+     * 
+     * @return numerical representation of the version
+     */
+    public abstract int getVersionNumber();
+    
+
+    public boolean isVersion(SRUVersion version) {
+        if (version == null) {
+            throw new NullPointerException("version == null");
+        }
+        return (this == version);
+    }
+
+
+    public boolean isVersion(SRUVersion min, SRUVersion max) {
+        if (min == null) {
+            throw new NullPointerException("min == null");
+        }
+        if (max == null) {
+            throw new NullPointerException("max == null");
+        }
+        return ((this.getVersionNumber() >= min.getVersionNumber()) &
+                (this.getVersionNumber() <= max.getVersionNumber()));
+    }
 
 } // enum SRUVersion