Changeset 26274 for main/trunk/greenstone3/src

Timestamp:

2012-10-01T19:06:42+13:00 (12 years ago)

Author:

ak19

Message:

Bugfix: sometimes GS3 asks for docnodes with ids like hash.dir, which aren't fedoraPIDs. They shouldn't be passed onto fedora.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

@@ -593 +593 @@
     }
 
+    // get the requested nodeIDs out of a request message
     protected String[] parse(Element request, String nodeType, String attribute) {  
     String[] nodevalues = null;
+    int count = 0;
 
     Element docList = (Element) GSXML.getChildByTagName(request, nodeType+GSXML.LIST_MODIFIER);
@@ -603 +605 @@
         for(int i = 0; i < nodevalues.length; i++) {
             Element e = (Element)docNodes.item(i);
-            nodevalues[i] = e.getAttribute(attribute);
-        }
-        }
-    }
+            String id = e.getAttribute(attribute);
+            // Not sure why there are at times requests for hashXXX.dir, which is not a fedora PID
+            // To skip these: if not requesting an externalURL and if requesting a docNode, 
+            // then the ID has to contain the : character special to fedora PIDs
+            if(attribute == "externalURL" || (nodeType != GSXML.DOC_NODE_ELEM || id.contains(":"))) {
+            nodevalues[count++] = id;
+            }
+        }
+        }
+    }
+
+    if(count == 0) {
+        return null;
+    }
+
+    String[] tmp = new String[count];
+    for(int i = 0; i < count; i++) {
+        tmp[i] = nodevalues[i];
+    }
+    nodevalues = null;
+    nodevalues = tmp;
+
     return nodevalues;
     }