Changeset 5188

Timestamp:

2003-08-19T14:39:39+12:00 (21 years ago)

Author:

kjdon

Message:

query responses now can include 2 metadatas - numDocsMatched and numDocsReturned - use numDocsReturned when you are limiting the docs returned eg as in mg and mgpp

Location:

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

Files:

• GS2MGPPSearch.java (modified) (1 diff)
• GS2MGSearch.java (modified) (1 diff)

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

@@ -439 +439 @@
     // Add a metadata element specifying the number of matching documents
     long totalDocs = mqr.getTotalDocs();
-    Element num_matches_elem = this.doc.createElement(GSXML.METADATA_ELEM);
-    num_matches_elem.setAttribute(GSXML.NAME_ATT, "numDocsMatched");
-    num_matches_elem.setAttribute(GSXML.VALUE_ATT, "" + totalDocs);
-    metadata_list.appendChild(num_matches_elem);
+    GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", ""+totalDocs);
 
     // Create a document list to store the matching documents, and add them
     Vector docs = mqr.getDocs();
+
+    // add a metadata item to specify docs returned
+    GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", ""+docs.size());
     Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(document_list);

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

@@ -132 +132 @@
 
     // Add a metadata element specifying the number of matching documents
-    Element num_matches_elem = this.doc.createElement(GSXML.METADATA_ELEM);
-    num_matches_elem.setAttribute(GSXML.NAME_ATT, "numDocsMatched");
-    num_matches_elem.setAttribute(GSXML.VALUE_ATT, "" + totalDocs);
-    metadata_list.appendChild(num_matches_elem);
-
+    // because teh total number is just the number returned, use numDocsReturned, not numDocsMatched
+    GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", ""+totalDocs);
     // 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);