Changeset 6821 for SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServer.java

Timestamp:

11/17/15 17:14:53 (9 years ago)

Author:

Oliver Schonefeld

Message:

• implement basic SRU 2.0 query handling ... kind of ...

File:

• SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServer.java (modified) (2 diffs)

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

@@ -979 +979 @@
 
     private void writeEchoedSearchRetrieveRequest(SRUXMLStreamWriter out,
-            SRUNamespaces ns, SRURequestImpl request, CQLNode cql)
+            SRUNamespaces ns, SRURequestImpl request, SRUQuery<?> query)
             throws XMLStreamException, SRUException {
         // echoedSearchRetrieveRequest
@@ -990 +990 @@
         }
 
-        // echoedSearchRetrieveRequest/query
-        out.writeStartElement(ns.getResponseNS(), "query");
-        out.writeCharacters(request.getRawQuery());
-        out.writeEndElement(); // "query"
-
-        // echoedSearchRetrieveRequest/xQuery
-        out.setDefaultNamespace(ns.getXcqlNS());
-        out.writeStartElement(ns.getResponseNS(), "xQuery");
-        out.writeDefaultNamespace(ns.getXcqlNS());
-        out.writeXCQL(cql, true);
-        out.writeEndElement(); // "xQuery" element
+        /*
+         * XXX: unclear, if <query> should only be echoed if queryType is CQL!?
+         */
+        if (SRUConstants.SRU_QUERY_TYPE_CQL.equals(query.getQueryType())) {
+            final CQLQueryParser.CQLQuery cql = (CQLQueryParser.CQLQuery) query;
+            // echoedSearchRetrieveRequest/query
+            out.writeStartElement(ns.getResponseNS(), "query");
+            out.writeCharacters(cql.getRawQuery());
+            out.writeEndElement(); // "query"
+
+            // echoedSearchRetrieveRequest/xQuery
+            out.setDefaultNamespace(ns.getXcqlNS());
+            out.writeStartElement(ns.getResponseNS(), "xQuery");
+            out.writeDefaultNamespace(ns.getXcqlNS());
+            out.writeXCQL(cql.getParsedQuery(), true);
+            out.writeEndElement(); // "xQuery" element
+        }
 
         // echoedSearchRetrieveRequest/startRecord