Changeset 24889 for main/trunk/greenstone3

Timestamp:

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

Author:

sjm84

Message:

Adjusted how metadata names (to return) are aquired

Location:

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

Files:

• Action.java (modified) (5 diffs)
• BrowseAction.java (modified) (1 diff)
• DocumentAction.java (modified) (7 diffs)
• GS2BrowseAction.java (modified) (2 diffs)
• QueryAction.java (modified) (1 diff)

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

@@ -21 +21 @@
 abstract public class Action
 {
+
     /** the system set up variables */
     protected HashMap config_params = null;
@@ -89 +90 @@
     {
         return true;
+    }
+
+    protected void getRequiredMetadataNames(Element format, HashSet meta_names)
+    {
+        extractMetadataNames(format, meta_names);
+        addLinkMetadataNames(format, meta_names);
     }
 
@@ -124 +131 @@
             meta_names.add(metadata.toString());
         }
-
+    }
+
+    protected void addLinkMetadataNames(Element format, HashSet meta_names)
+    {
         // The XSL tranform for
         //   gsf:link type="source" 
@@ -144 +154 @@
         // so that we can build up the equivlink from the metadata components it needs
         link_nodes = format.getElementsByTagName("gsf:equivlinkgs3");
-        if (link_nodes != null)
-        {
-
+        if (link_nodes.getLength() > 0)
+        {
             String[] equivlink_metanames = { "equivDocIcon", "equivDocLink", "/equivDocLink" };
 
@@ -163 +172 @@
                 metadata.append(equivlink_metanames[i]);
                 meta_names.add(metadata.toString());
+            }
+        }
+        
+        NodeList image_nodes = format.getElementsByTagName("gsf:image");
+        for(int i = 0; i < image_nodes.getLength(); i++)
+        {
+            if(format.getElementsByTagName("gsf:image").getLength() > 0)
+            {
+                meta_names.add("Thumb");
+                meta_names.add("Screen");
+                meta_names.add("SourceFile");
             }
         }

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

@@ -128 +128 @@
 
         page_response.appendChild(new_format);
-        extractMetadataNames(new_format, metadata_names);
+        getRequiredMetadataNames(new_format, metadata_names);
         }
     }

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)

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

@@ -334 +334 @@
    
     protected void extractMetadataNames(Element new_format, HashSet doc_meta_names, HashSet class_meta_names) {
-
+    
     NodeList templates = new_format.getElementsByTagName("gsf:template");
     for (int i=0; i<templates.getLength(); i++) {
@@ -340 +340 @@
         String match = template.getAttribute("match");
         if (match.equals("documentNode")) {
-        extractMetadataNames(template, doc_meta_names);
+            getRequiredMetadataNames(template, doc_meta_names);
         } else if (match.equals("classifierNode")) {
-        extractMetadataNames(template, class_meta_names);
+            getRequiredMetadataNames(template, class_meta_names);
         }
     }

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

@@ -175 +175 @@
         // for now just add to the response
         page_response.appendChild(this.doc.importNode(format_elem, true));
-        extractMetadataNames(format_elem, metadata_names);
+        getRequiredMetadataNames(format_elem, metadata_names);
     }