Changeset 14525

Timestamp:

2007-09-17T15:27:38+12:00 (16 years ago)

Author:

qq6

Message:

adding href and rl values into the document node, if they can be identified from the params list

File:

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

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

@@ -83 +83 @@
     // just in case there are some that need to get passed to the services
     HashMap service_params = (HashMap)params.get("s0"); 
-
+    
+    String has_rl = null;
+    String has_href = null;
+    has_href = (String) params.get("href");//for an external link : get the href URL if it is existing in the params list 
+    has_rl = (String) params.get("rl");//for an external link : get the rl value if it is existing in the params list
     String collection = (String) params.get(GSParams.COLLECTION);
     String lang = request.getAttribute(GSXML.LANG_ATT);
     String uid = request.getAttribute(GSXML.USER_ID_ATT);
     String document_name = (String) params.get(GSParams.DOCUMENT);
-    if (document_name == null || document_name.equals("")) {
+    if ((document_name == null || document_name.equals("")) && (has_href == null || has_href.equals(""))) {
         logger.error("no document specified!");
         return result;
@@ -141 +145 @@
     Element current_doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
     basic_doc_list.appendChild(current_doc);
-    current_doc.setAttribute(GSXML.NODE_ID_ATT, document_name);
-    
+    if (document_name.length()!=0){
+        current_doc.setAttribute(GSXML.NODE_ID_ATT, document_name);
+    }else if (has_href.length()!=0){
+        current_doc.setAttribute(GSXML.NODE_ID_ATT, has_href);
+        current_doc.setAttribute("externalURL", has_rl);
+    }
+
     // Create a parameter list to specify the required structure information
     Element ds_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -239 +248 @@
         // no structure nodes, so put in a dummy doc node
         Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
-        doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
+        if (document_name.length()!=0){
+            doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
+        }else if (has_href.length()!=0){
+            doc_node.setAttribute(GSXML.NODE_ID_ATT, has_href);
+            doc_node.setAttribute("externalURL", has_rl);
+        }
         the_document.appendChild(doc_node);
         has_dummy = true;
@@ -247 +261 @@
         // no structure request, so just put in a dummy doc node
         Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
-        doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
+        if (document_name.length()!=0){
+        doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name);
+        }else if (has_href.length()!=0){
+        doc_node.setAttribute(GSXML.NODE_ID_ATT, has_href);
+        doc_node.setAttribute("externalURL", has_rl);
+        }
         the_document.appendChild(doc_node);
         has_dummy = true;
@@ -312 +331 @@
     Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
     // the node we want is the root document node
-    doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name+".rt");
+    if (document_name.length()!=0){
+        doc_node.setAttribute(GSXML.NODE_ID_ATT, document_name+".rt");
+    }else if (has_href.length()!=0){
+        doc_node.setAttribute(GSXML.NODE_ID_ATT, has_href+".rt"); 
+        doc_node.setAttribute("externalURL", has_rl);
+    }
     doc_list.appendChild(doc_node);
     Element dm_response_message = (Element) this.mr.process(dm_message);
@@ -374 +398 @@
         }
     } else {
-        
         //path = GSPath.appendLink(path, GSXML.DOC_NODE_ELEM);
         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);
+        Element dc_response_doc_external = (Element) GSXML.getChildByTagName(dc_response_doc, "external");
         
         if (dc_response_doc_content == null) {
         // no content to add
+        if (dc_response_doc_external !=null){
+            String modified_doc_id = dc_response_doc.getAttribute(GSXML.NODE_ID_ATT);
+            
+            the_document.setAttribute("selectedNode", modified_doc_id);
+            the_document.setAttribute("external", dc_response_doc_external.getAttribute("external_link"));
+        }
         return result;
         }