Changeset 32348 for main/trunk/greenstone3/src

Timestamp:

2018-08-20T21:45:39+12:00 (6 years ago)

Author:

Georgiy Litvinov

Message:

Fixed no metadata problem using relative link to access document.

File:

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

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

@@ -590 +590 @@
         for (int i = 0; i < doc_nodes.getLength(); i++)
         {
+            Node dcNode;
             String node_idd = ((Element)doc_nodes.item(i)).getAttribute(GSXML.NODE_ID_ATT);
-            Node dcNode = GSXML.getNamedElement(dm_response_doc_list, "documentNode", GSXML.NODE_ID_ATT, node_idd);
+            if (node_idd.isEmpty()) {
+                String href_id_att = ((Element)doc_nodes.item(i)).getAttribute(GSXML.HREF_ID_ATT);
+                dcNode = GSXML.getNamedElement(dm_response_doc_list, "documentNode", GSXML.HREF_ID_ATT, href_id_att);
+            } else {
+                dcNode = GSXML.getNamedElement(dm_response_doc_list, "documentNode", GSXML.NODE_ID_ATT, node_idd);  
+            }
             GSXML.mergeMetadataLists(doc_nodes.item(i), dcNode);
         }