Changeset 25793

Timestamp:

2012-06-14T20:39:57+12:00 (12 years ago)

Author:

ak19

Message:

Fixed a bug where the requested metadata for a classifierNode format statement wasn't being passed on to getRequiredMetadataNames() since the java code tried to match on a format statement's template named classifierNode exactly, rather than match on a format statement's template name that starts with classifierNode. As a consequence of this bugfix, the request for numleafdocs metadata works again.

File:

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

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

@@ -446 +446 @@
             Element template = (Element) templates.item(i);
             String match = template.getAttribute("match");
-            if (match.equals("documentNode"))
+            if (match.startsWith("documentNode"))
             {
                 getRequiredMetadataNames(template, doc_meta_names);
             }
-            else if (match.equals("classifierNode"))
+            else if (match.startsWith("classifierNode")) // not match.equals, as we want to match nodes like: classifierNode[@classifierStyle = 'VList']
             {
                 getRequiredMetadataNames(template, class_meta_names);