Changeset 9966

Timestamp:

2005-05-26T09:58:36+12:00 (19 years ago)

Author:

kjdon

Message:

only add in the docNodeList if there are some query results

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/service

Files:

• AbstractMGPPSearch.java (modified) (1 diff)
• AbstractMGSearch.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGPPSearch.java

@@ -505 +505 @@
     // add a metadata item to specify what actual query was done - eg if stuff was stripped out etc. and then we can use the query later, cos we don't know which parameter was the query
     GSXML.addMetadata(this.doc, metadata_list, "query", query);
-    Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-    result.appendChild(document_list);
-    for (int d = 0; d < docs.size(); d++) {
-        long docnum = ((MGPPDocInfo) docs.elementAt(d)).num_;
-        float rank = ((MGPPDocInfo) docs.elementAt(d)).rank_;
-        String doc_id = MGPPNum2OID(docnum);
-        Element doc_node = createDocNode(doc_id, Float.toString(rank));
-        //doc_node.setAttribute("rank", Float.toString(rank));
-        document_list.appendChild(doc_node);
-    }
-
+    if (docs.size()>0) {
+        Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        result.appendChild(document_list);
+        for (int d = 0; d < docs.size(); d++) {
+        long docnum = ((MGPPDocInfo) docs.elementAt(d)).num_;
+        float rank = ((MGPPDocInfo) docs.elementAt(d)).rank_;
+        String doc_id = MGPPNum2OID(docnum);
+        Element doc_node = createDocNode(doc_id, Float.toString(rank));
+        //doc_node.setAttribute("rank", Float.toString(rank));
+        document_list.appendChild(doc_node);
+        }
+    }
     // Create a term list to store the term information, and add it
     String query_level = (String)params.get(LEVEL_PARAM); // the current query level

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGSearch.java

@@ -220 +220 @@
     GSXML.addMetadata(this.doc, metadata_list, "query", query);
 
-    // Create a document list to store the matching documents, and add them
-    Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-    result.appendChild(document_list);
-    for (int d = 0; d < docs.size(); d++) {
-        long docnum = ((MGDocInfo) docs.elementAt(d)).num_;
-        float rank = ((MGDocInfo) docs.elementAt(d)).rank_;
-        String doc_id = MGNum2OID(docnum);
-        Element doc_node = createDocNode(doc_id, Float.toString(rank));
-        document_list.appendChild(doc_node);
-    }
-
+    if (docs.size() > 0) {
+        // Create a document list to store the matching documents, and add them
+        Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        result.appendChild(document_list);
+        for (int d = 0; d < docs.size(); d++) {
+        long docnum = ((MGDocInfo) docs.elementAt(d)).num_;
+        float rank = ((MGDocInfo) docs.elementAt(d)).rank_;
+        String doc_id = MGNum2OID(docnum);
+        Element doc_node = createDocNode(doc_id, Float.toString(rank));
+        document_list.appendChild(doc_node);
+        }
+    }
+    
     // Create a term list to store the term information, and add it
     Element term_list = this.doc.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);