Changeset 24889 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

Timestamp:

2011-12-13T10:01:05+13:00 (12 years ago)

Author:

sjm84

Message:

Adjusted how metadata names (to return) are aquired

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -186 +186 @@
         boolean get_structure = false;
         boolean get_structure_info = false;
-        if (document_type.equals("paged"))
+        if (document_type.equals(GSXML.DOC_TYPE_PAGED))
         {
             get_structure_info = true;
+
+            if (expand_contents)
+            {
+                ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
+                ds_param_list.appendChild(ds_param);
+                ds_param.setAttribute(GSXML.NAME_ATT, "structure");
+                ds_param.setAttribute(GSXML.VALUE_ATT, "entire");
+            }
+
             // get teh info needed for paged naviagtion
             ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
@@ -203 +212 @@
             ds_param.setAttribute(GSXML.VALUE_ATT, "siblingPosition");
 
-        }
-        else if (document_type.equals("hierarchy"))
+            if (get_siblings)
+            {
+                ds_param = this.doc.createElement(GSXML.PARAM_ELEM);
+                ds_param_list.appendChild(ds_param);
+                ds_param.setAttribute(GSXML.NAME_ATT, "structure");
+                ds_param.setAttribute(GSXML.VALUE_ATT, "siblings");
+            }
+
+        }
+        else if (document_type.equals(GSXML.DOC_TYPE_HIERARCHY))
         {
             get_structure = true;
@@ -330 +347 @@
         if (format_elem != null)
         {
-            extractMetadataNames(format_elem, meta_names);
+            getRequiredMetadataNames(format_elem, meta_names);
         }
 
@@ -391 +408 @@
         }
         doc_list.appendChild(doc_node);
+
         Element dm_response_message = (Element) this.mr.process(dm_message);
         if (processErrorElements(dm_response_message, page_response))
@@ -671 +689 @@
      * ends in query). should this action do the query or should it send a
      * message to the query action? but that will involve lots of extra stuff.
-     * also doesn't handle phrases properly - just highlights all the terms found
-     * in the text.
+     * also doesn't handle phrases properly - just highlights all the terms
+     * found in the text.
      */
     protected Element highlightQueryTerms(Element request, Element dc_response_doc_content)
@@ -860 +878 @@
         }
 
-        System.err.println(query_term_variants + " *** " + phrase_query_term_variants_hierarchy);
         return highlightQueryTermsInternal(content, query_term_variants, phrase_query_term_variants_hierarchy);
     }
@@ -897 +914 @@
             
             boolean is_character_letter_or_digit = Character.isLetterOrDigit(content_characters[i]);
-
+            
             // Has a word just started?
             if (in_word == false && is_character_letter_or_digit == true)