Changeset 2199

Timestamp:

09/10/12 09:11:41 (12 years ago)

Author:

oschonef

Message:

• fix in-valid XML output with XCQL scanClause

Location:

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

Files:

• SRUServer.java (modified) (2 diffs)
• SRUXMLStreamWriter.java (modified) (3 diffs)

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

@@ -852 +852 @@
         out.writeStartElement(SRU_NS, "xScanClause");
         out.writeDefaultNamespace(SRU_XCQL_NS);
-        out.writeXCQL(cql);
+        out.writeXCQL(cql, false);
         out.writeEndElement(); // "xScanClause" element
 
@@ -906 +906 @@
         out.writeStartElement(SRU_NS, "xQuery");
         out.writeDefaultNamespace(SRU_XCQL_NS);
-        out.writeXCQL(cql);
+        out.writeXCQL(cql, true);
         out.writeEndElement(); // "xQuery" element
 

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

@@ -414 +414 @@
 
 
-    public void writeXCQL(CQLNode query) throws XMLStreamException {
+    public void writeXCQL(CQLNode query, final boolean searchRetrieveMode)
+            throws XMLStreamException {
         /*
          * HACK: Parsing the XCQL to serialize is wasting resources.
@@ -429 +430 @@
                         String qName, Attributes attributes)
                                 throws SAXException {
+                    if (!searchRetrieveMode && qName.equals("searchClause")) {
+                        return;
+                    }
                     try {
                         SRUXMLStreamWriter.this.writeStartElement(qName);
@@ -443 +447 @@
                 public void endElement(String uri, String localName,
                         String qName) throws SAXException {
+                    if (!searchRetrieveMode && qName.equals("searchClause")) {
+                        return;
+                    }
                     try {
                         SRUXMLStreamWriter.this.writeEndElement();