Changeset 4189

Timestamp:

2003-04-17T15:26:50+12:00 (21 years ago)

Author:

kjdon

Message:

added a bit more info to the page data, now looks for sibling arg

File:

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

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

@@ -17 +17 @@
     
     public static final String CLASSIFIER_ARG = "cl";
-
+    public static final String SIBLING_ARG = "sib";
     /* add the action specific args to the cgi param list
      */
@@ -67 +67 @@
     }
     
+    //whether to retrieve siblings or not
+    boolean get_siblings = false;
+    String sibs = (String) params.get(SIBLING_ARG);
+    if (sibs != null && sibs.equals("1")) {
+        get_siblings = true;
+    }
+
     // the main response for the page is in a pageResponse element
     Element page_response = doc_.createElement(GSXML.PAGE_RESPONSE_ELEM);
@@ -114 +121 @@
     }
     
-    // create a classifier elem to return in the page
-    Element page_classifier = doc_.createElement(GSXML.CLASSIFIER_ELEM);
-    page_response.appendChild(page_classifier);
-
     // the id of the classifier is the top id of the selected node
     String top_id = OID.getTop(classifier_node);
-    page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
 
     // add in the format info into the stylesheet
-    System.out.println("transforming format:"+converter_.getString(format_response));
+    //System.out.println("transforming format:"+converter_.getString(format_response));
     Element format_elem = getAndTransformFormat(format_response);
-    System.out.println("transformed format:"+converter_.getString(format_elem));
+    //System.out.println("transformed format:"+converter_.getString(format_elem));
     if (format_elem != null) {
         Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
@@ -155 +157 @@
     param.setAttribute(GSXML.NAME_ATT, "structure");
     param.setAttribute(GSXML.VALUE_ATT, "children");
+    if (get_siblings) {
+        param = doc_.createElement(GSXML.PARAM_ELEM);
+        param_list.appendChild(param);
+        param.setAttribute(GSXML.NAME_ATT, "structure");
+        param.setAttribute(GSXML.VALUE_ATT, "siblings");
+    }
 
     // put the classifier node into a classifier node list
@@ -169 +177 @@
     path = GSPath.appendLink(path, GSXML.CLASS_NODE_ELEM);
     path = GSPath.appendLink(path, GSXML.NODE_STRUCTURE_ELEM);
-    // assume that we always get back the top level CL1 node - want to throw this away
+    // assume that we always get back the top level CL1 node - this becomes the page_classifier node
     path = GSPath.appendLink(path, GSXML.CLASS_NODE_ELEM);
     Element cl_structure = (Element)GSXML.getNodeByPath(classify_response,
@@ -181 +189 @@
     }   
     
-    // add the classifier nodes from the structure request into teh page_classifier
-    NodeList cl_nodes = cl_structure.getChildNodes();
-    for (int i=0; i<cl_nodes.getLength(); i++) {
-        Node n = cl_nodes.item(i);
-        if (n.getNodeType() == Node.TEXT_NODE) {
-        // ignore
-        continue;
-        }
-        page_classifier.appendChild(doc_.importNode(n, true));
-    }
-
+    // add the classifier node as the page classifier 
+    Element page_classifier = GSXML.duplicateWithNewName(doc_, cl_structure,  GSXML.CLASSIFIER_ELEM, true);
+    page_response.appendChild(page_classifier);
+    page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
     
     // get the metadata for each classifier node, 
@@ -205 +206 @@
     // create a metadata request for the classifier, and add it to 
     // the the message
-    cl_nodes = page_classifier.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
+    NodeList cl_nodes = page_classifier.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
     
     if (cl_nodes.getLength() > 0) {
@@ -304 +305 @@
         
 
-    //System.out.println("(BrowseAction) Page:\n" + converter_.getPrettyString(page));
+    System.out.println("(BrowseAction) Page:\n" + converter_.getPrettyString(page));
 
     // transform the page