Changeset 3998

Timestamp:

2003-03-26T12:13:33+12:00 (21 years ago)

Author:

kjdon

Message:

now gets the collection info if a collection is specified - this is needed for the httpPath metadata used to find the coll image, and code tidy

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/BrowseAction.java (modified) (5 diffs)

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

@@ -53 +53 @@
 
     // the first part of the data for the page is the cgi-params
-    // Element page_request = GSXML.duplicateWithNewName(doc_, request, "pageRequest", true);
-    // page.appendChild(page_request);
-    Element cgi_request = (Element)doc_.importNode(request, true);
-    page.appendChild(cgi_request);
-
+    Element page_request = GSXML.duplicateWithNewName(doc_, request, GSXML.PAGE_REQUEST_ELEM, true);
+    page.appendChild(page_request);
+    
     // extract the params from the cgi-request, and check that we have a coll specified
     Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -70 +68 @@
     }
     
+    // the main response for the page is in a pageResponse element
+    Element page_response = doc_.createElement(GSXML.PAGE_RESPONSE_ELEM);
+    page.appendChild(page_response);
+
     String lang = request.getAttribute(GSXML.LANG_ATT);
     String to = GSPath.appendLink(collection, service_name);
@@ -80 +82 @@
     Element info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang); 
     info_message.appendChild(info_request);
-
+    
+    // also get the collection description (should be just metadata?) for the http address stuff
+    Element coll_info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, collection, lang);
+    info_message.appendChild(coll_info_request);
     // also get the format stuff now if there is some
     Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, to, lang);
     info_message.appendChild(format_request);
     // process the requests
+
     Element info_response = (Element) mr_.process(info_message);
 
-    // get out the description
-    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
-    Element description = (Element)doc_.importNode(GSXML.getNodeByPath(info_response, path), true);
-    page.appendChild(description);
-    
-    Element format_response = (Element)info_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1); // the second response
-    
-    // the main response for the page is in a response element
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
-    page.appendChild(response);
-    
+    // the three responses
+    NodeList responses = info_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
+    Element service_response = (Element)responses.item(0);
+    Element coll_response = (Element)responses.item(1);
+    Element format_response = (Element)responses.item(2);
+
+    Element service_description = (Element)GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM);
+    page_response.appendChild(doc_.importNode(service_description, true));
+    
+    Element coll_description = (Element)GSXML.getChildByTagName(coll_response, GSXML.COLLECTION_ELEM);
+    page_response.appendChild(doc_.importNode(coll_description, true));
+    
+        
     // get the node that the user has clicked on
     String classifier_node = (String)params.get(CLASSIFIER_ARG);
@@ -110 +118 @@
     // create a classifier elem to return in the page
     Element page_classifier = doc_.createElement(GSXML.CLASSIFIER_ELEM);
-    response.appendChild(page_classifier);
+    page_response.appendChild(page_classifier);
 
     // the id of the classifier is the top id of the selected node
@@ -149 +157 @@
     Element classify_response = (Element)mr_.process(classify_message);
     // get the structure element
-    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
+    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     path = GSPath.appendLink(path, GSXML.CLASS_NODE_ELEM);
     path = GSPath.appendLink(path, GSXML.NODE_STRUCTURE_ELEM);