Changeset 6895

Timestamp:

01/11/16 17:12:55 (8 years ago)

Author:

Oliver Schonefeld

Message:

• fix handling of recordXMLEscaping vs recordPacking

Location:

SRUServer/trunk/src/main/java/eu/clarin/sru/server

Files:

• SRURequestImpl.java (modified) (3 diffs)
• SRUServer.java (modified) (6 diffs)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRURequestImpl.java

@@ -467 +467 @@
                         break;
                     case RECORD_PACKING:
+                        logger.debug("XXXX: RECORD PAXCKING: {}", value);
                         if (value.equals(RECORD_PACKING_PACKED)) {
                             recordPacking = SRURecordPacking.PACKED;
@@ -711 +712 @@
 
 
-    SRURecordXmlEscaping getRawRecordPacking() {
-        return recordXmlEscaping;
+    String getRawRecordXmlEscaping() {
+        if (isVersion(SRUVersion.VERSION_2_0)) {
+            return getParameter(PARAM_RECORD_XML_ESCAPING, true, false);
+        } else {
+            return getParameter(PARAM_RECORD_PACKING, true, false);
+        }
+    }
+
+
+    String getRawRecordPacking() {
+        if (isVersion(SRUVersion.VERSION_2_0)) {
+            return getParameter(PARAM_RECORD_PACKING, true, false);
+        } else {
+            return null;
+        }
     }
 
@@ -792 +806 @@
         }
         final SRUVersion v = getVersion();
-        return (min.getVersionNumber() >= v.getVersionNumber()) &&
+        return (v.getVersionNumber() >= min.getVersionNumber()) &&
                 (v.getVersionNumber() <= max.getVersionNumber());
     }

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServer.java

@@ -478 +478 @@
                         out.writeEndElement(); // "recordSchema" element
 
-                        // recordPacking
-                        writeRecordPacking(out, ns, request.getRecordXmlEscaping());
+                        /*
+                         *  recordPacking (SRU 2.0)
+                         *  Only serialize, of it was in request.
+                         */
+                        if (request.isVersion(SRUVersion.VERSION_2_0) &&
+                                (request.getRawRecordPacking() != null)) {
+                            writeRecordPacking(out, ns,
+                                    request.getRecordPacking());
+                        }
+
+                        /*
+                         * recordXMLEscaping (SRU 2.0) or
+                         *   recordPacking (SRU 1.1 and 1.2)
+                         */
+                        writeRecordXmlEscaping(out, ns, request);
 
                         /*
@@ -724 +737 @@
         out.writeEndElement(); // "recordSchema" element
 
-        // recordPacking
-        writeRecordPacking(out, ns, request.getRecordXmlEscaping());
+        /*
+         *  recordPacking (SRU 2.0)
+         *  Only serialize, of it was in request.
+         *
+         *  XXX: not sure, if this makes sense for explain
+         */
+        if (request.isVersion(SRUVersion.VERSION_2_0) &&
+                (request.getRawRecordPacking() != null)) {
+            writeRecordPacking(out, ns, request.getRecordPacking());
+        }
+
+        /*
+         * recordXMLEscaping (SRU 2.0) or
+         *   recordPacking (SRU 1.1 and 1.2)
+         */
+        writeRecordXmlEscaping(out, ns, request);
 
         out.writeStartElement(ns.getResponseNS(), "recordData");
@@ -926 +953 @@
         }
 
-        // echoedExplainRequest/recordPacking
+        // echoedExplainRequest/recordXmlEscpaing / recordPacking
         if (request.getRawRecordPacking() != null) {
-            writeRecordPacking(out, ns, request.getRawRecordPacking());
+            writeRecordXmlEscaping(out, ns, request);
         }
 
@@ -1036 +1063 @@
         }
 
-        // echoedSearchRetrieveRequest/recordPacking
-        if (request.getRawRecordPacking() != null) {
-            writeRecordPacking(out, ns, request.getRawRecordPacking());
+        // (SRU 2.0) echoedSearchRetrieveRequest/recordPacking
+        if (request.isVersion(SRUVersion.VERSION_2_0) &&
+                (request.getRawRecordPacking() != null)) {
+            out.writeStartElement(ns.getResponseNS(), "recordPacking");
+            out.writeCharacters(request.getRawRecordPacking());
+            out.writeEndElement(); // "recordPacking" element
+        }
+
+        // echoedSearchRetrieveRequest/recordXmlEscaping / recordPacking
+        if (request.getRawRecordXmlEscaping() != null) {
+            if (request.isVersion(SRUVersion.VERSION_2_0)) {
+                out.writeStartElement(ns.getResponseNS(), "recordXMLEscaping");
+
+            } else {
+                out.writeStartElement(ns.getResponseNS(), "recordPacking");
+            }
+            out.writeCharacters(request.getRawRecordXmlEscaping());
+            out.writeEndElement(); // "recordXmlEscaping"  / "recordPacking" element
         }
 
@@ -1133 +1175 @@
 
 
-    private void writeRecordPacking(SRUXMLStreamWriter out, SRUNamespaces ns,
-            SRURecordXmlEscaping recordPacking) throws XMLStreamException {
-        out.writeStartElement(ns.getResponseNS(), "recordPacking");
-        switch (recordPacking) {
+    private void writeRecordXmlEscaping(SRUXMLStreamWriter out,
+            SRUNamespaces ns, SRURequest request) throws XMLStreamException {
+        if (request.isVersion(SRUVersion.VERSION_2_0)) {
+            out.writeStartElement(ns.getResponseNS(), "recordXMLEscaping");
+        } else {
+            out.writeStartElement(ns.getResponseNS(), "recordPacking");
+        }
+        switch (request.getRecordXmlEscaping()) {
         case XML:
             out.writeCharacters("xml");
@@ -1144 +1190 @@
             break;
         } // switch
-        out.writeEndElement(); // "recordPacking" element
-    }
-
-
-    private void writeLocalizedStrings(XMLStreamWriter writer,
-            SRUNamespaces ns, String name, List<LocalizedString> list)
-            throws XMLStreamException {
+        out.writeEndElement(); // "recordXMLEscaping" / "recordPacking" element
+    }
+
+
+    private void writeRecordPacking(SRUXMLStreamWriter out, SRUNamespaces ns,
+            SRURecordPacking recordPacking) throws XMLStreamException {
+        out.writeStartElement(ns.getResponseNS(), "recordPacking");
+        switch (recordPacking) {
+        case PACKED:
+            out.writeCharacters("packed");
+            break;
+        case UNPACKED:
+            out.writeCharacters("unpacked");
+            break;
+        }
+        out.writeEndElement(); // (SRU 2.0) "recordPacking" element
+    }
+
+
+    private void writeLocalizedStrings(XMLStreamWriter writer, SRUNamespaces ns,
+            String name, List<LocalizedString> list) throws XMLStreamException {
         if ((list != null) && !list.isEmpty()) {
             for (LocalizedString item : list) {