Changeset 2098

Timestamp:

08/15/12 13:39:03 (12 years ago)

Author:

oschonef

Message:

• fix invalid XML response if scan operation yielded no results

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

@@ -243 +243 @@
 
             try {
-                out.writeStartElement(SRU_NS, "terms");
+                boolean wroteTerms = false;
+                /*
+                 * a scan result without a list of terms is a valid response;
+                 * make sure, to produce the correct output and omit in that case
+                 * the <terms> ...
+                 */
                 while (result.nextTerm()) {
+                    if (!wroteTerms) {
+                        out.writeStartElement(SRU_NS, "terms");
+                    }
                     out.writeStartElement(SRU_NS, "term");
 
@@ -291 +299 @@
                     out.writeEndElement(); // "term" element
                 } // while
-                out.writeEndElement(); // "terms" element
+                if (wroteTerms) {
+                    out.writeEndElement(); // "terms" element
+                }
             } catch (NoSuchElementException e) {
                 throw new SRUException(SRUConstants.SRU_GENERAL_SYSTEM_ERROR,