Changeset 13525

Timestamp:

2006-12-20T11:19:54+13:00 (17 years ago)

Author:

shaoqun

Message:

fixed the bug that failed to get collection details from the remote site

File:

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

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

@@ -71 +71 @@
     // elements but for now, we'll just get it all
     Element collection_list = (Element)GSXML.getChildByTagName(info_response, GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER);
-    if (collection_list != null) {
+    logger.info(GSXML.xmlNodeToString(collection_list));
+        if (collection_list != null) {
         NodeList colls = GSXML.getChildrenByTagName(collection_list, GSXML.COLLECTION_ELEM);
         if (colls.getLength()>0) {
@@ -205 +206 @@
         Element c1 = (Element)items.item(i);
         Element c2 = (Element)GSXML.getChildByTagName((Element)responses.item(i), c1.getTagName());
-        if (c1.getAttribute(GSXML.NAME_ATT).equals(c2.getAttribute(GSXML.NAME_ATT))) {
+            if (c1.getAttribute(GSXML.NAME_ATT).endsWith(c2.getAttribute(GSXML.NAME_ATT))) {
         //add the new data into the original element
         GSXML.mergeElements(c1, c2);