Changeset 8833

Timestamp:

2004-12-16T15:36:53+13:00 (19 years ago)

Author:

kjdon

Message:

query term highlighting and annotations are now controlled by interfaceCOnfig.xml. also now check for empty doc content

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (6 diffs)

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

@@ -48 +48 @@
     /** if this is set to true, when a document is displayed, any annotation
      * type services (enrich) will be offered to the user as well */
-    protected static final boolean provide_annotations = false; //true;
-
-
+    protected boolean provide_annotations = false; 
+    
+    protected boolean highlight_query_terms = false;
+
+    public boolean configure() {
+    super.configure();
+    String highlight = (String)config_params.get("highlightQueryTerms");
+    if (highlight != null && highlight.equals("true")) {
+        highlight_query_terms = true;
+    }
+    String annotate = (String)config_params.get("displayAnnotationService");
+    if (annotate != null && annotate.equals("true")) {
+        provide_annotations = true;
+    }
+    return true;
+    }
     public Element process (Element message)
     {
@@ -326 +339 @@
     dc_request.appendChild(dc_param_list);
 
+    // get the content
     // the doc list for the content request is the same as the one for the structure request unless we want the whole document, in which case its the same as for the metadata request.
     if (expand_document) {
@@ -332 +346 @@
         dc_request.appendChild(basic_doc_list);
     }
+    System.err.println("request = "+converter.getString(dc_message));
     Element dc_response_message = (Element) this.mr.process(dc_message);
     Element dc_response_doc_list = (Element) GSXML.getNodeByPath(dc_response_message, path);
@@ -339 +354 @@
         NodeList dc_response_docs = dc_response_doc_list.getChildNodes();
         for (int i = 0; i < doc_nodes.getLength(); i++) {
-        doc_nodes.item(i).appendChild(this.doc.importNode(GSXML.getChildByTagName((Element)dc_response_docs.item(i), "nodeContent"), true));
+        Node content = GSXML.getChildByTagName((Element)dc_response_docs.item(i), "nodeContent");
+        if (content != null) {
+            doc_nodes.item(i).appendChild(this.doc.importNode(content, true));
+        }
         //GSXML.mergeMetadataLists(doc_nodes.item(i), dm_response_docs.item(i));
         }
@@ -347 +365 @@
         Element dc_response_doc = (Element) GSXML.getChildByTagName(dc_response_doc_list, GSXML.DOC_NODE_ELEM);
         Element dc_response_doc_content = (Element) GSXML.getChildByTagName(dc_response_doc, GSXML.NODE_CONTENT_ELEM);
-    
-            
-        boolean highlight_query_terms = true;
+        
+        if (dc_response_doc_content == null) {
+        // no content to add
+        return result;
+        }
         if (highlight_query_terms) {
         dc_response_doc.removeChild(dc_response_doc_content);
-        
+        
         dc_response_doc_content = highlightQueryTerms(request, dc_response_doc_content);
         dc_response_doc.appendChild(dc_response_doc.getOwnerDocument().importNode(dc_response_doc_content, true));
@@ -385 +405 @@
         
         } 
-    }
+    } // if provide_annotations