Changeset 4943 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2003-07-16T13:51:31+12:00 (21 years ago)

Author:

kjdon

Message:

when get back the coll descriptions, want all the contents now, not just the metadata

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -38 +38 @@
 
     result.appendChild(doc_.importNode(response, true));
+    ///ystem.out.println("page action result: "+converter_.getPrettyString(result));
     return result;
     }
@@ -81 +82 @@
         Element c2 = (Element)coll_responses.item(i);
         if (c1.getAttribute(GSXML.NAME_ATT).equals(c2.getAttribute(GSXML.FROM_ATT))) {
-            // add the metadata to the original response   
-            GSXML.mergeMetadataLists(c1, GSXML.getChildByTagName(c2, GSXML.COLLECTION_ELEM));  
+            //add the collection data into the original response
+            GSXML.mergeElements(c1, (Element)GSXML.getChildByTagName(c2, GSXML.COLLECTION_ELEM));
         } else {
             System.err.println("PageAction Error: response does not correspond to request!");
@@ -89 +90 @@
         }
     }
-
+    
     //now the full response message is in coll_list_response
     // return the response element