Changeset 5692 for trunk/gsdl3

Timestamp:

2003-10-21T11:09:58+13:00 (21 years ago)

Author:

kjdon

Message:

doc format stuff now comes with content service, added another structure option for entire structure

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (7 diffs)

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

@@ -66 +66 @@
     protected static final String STRUCT_CHILDREN = "children";
     protected static final String STRUCT_DESCENDS = "descendants";
+    protected static final String STRUCT_ENTIRE = "entire";
 
     protected static final String INFO_NUM_SIBS = "numSiblings";
@@ -125 +126 @@
     // the classifiers
     extractExtraClassifierInfo(info, extra_info);
+    
     this.config_info = info;
     
@@ -173 +175 @@
     Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
     if (display_format != null) {
-        this.format_info_map.put(DOCUMENT_METADATA_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
+        this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
         // shoudl we make a copy?
     }
@@ -502 +504 @@
     boolean want_descendants = false;
 
+    boolean want_entire_structure = false;
     // Process the request parameters
     NodeList params = param_list.getElementsByTagName(GSXML.PARAM_ELEM);
@@ -524 +527 @@
         else if (p_value.equals(STRUCT_DESCENDS))
             want_descendants = true;
+        else if (p_value.equals(STRUCT_ENTIRE))
+            want_entire_structure = true;
         else
             System.err.println("GS2Retrieve Warning: Unknown value \"" + p_value + "\".");
@@ -558 +563 @@
         doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
 
-
+        
         if (want_info) {
 
@@ -576 +581 @@
         Element structure_elem = this.doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
         doc.appendChild(structure_elem);
+        
+        if (want_entire_structure) {
+            String top_id = OID.getTop(doc_id);
+            Element top_node = createDocNode(top_id, true, false);
+            addDescendants(top_node, top_id, true);
+            structure_elem.appendChild(top_node);
+            continue; // with the next document, we dont need to do any more here
+        }
         
         // Add the requested structure information