From: Dan Scott <dan@coffeecode.net>
Date: Wed, 29 Jun 2011 22:48:38 +0000 (-0400)
Subject: Current master creates XPath of volumes/volume/uris/uri
X-Git-Tag: sprint4-merge-nov22~5128^2~75^2~3
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9049c7dd8cdf3e4ef9562bfaff30bce88b71b78d;p=working%2FEvergreen.git

Current master creates XPath of volumes/volume/uris/uri

In the master integration template-toolkit branch, we can correct the
XPath to match reality.

Signed-off-by: Dan Scott <dan@coffeecode.net>
---

diff --git a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
index 752ce5744c..3bc2fa8936 100644
--- a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2
@@ -61,7 +61,6 @@
             END;
         END;
 
-        # URI info is in volumes/volume/uris/volume, instead of uri element
         FOR volume IN xml.findnodes('//*[local-name()="volumes"]/*[local-name()="volume"]');
 
             # Check volume visibility - could push this into XPath
@@ -71,7 +70,7 @@
             NEXT IF volume.getAttribute('deleted') == 'true';
 
             IF vol.label == '##URI##';
-                FOR uri IN volume.findnodes('./*[local-name()="uris"]/*[local-name()="volume"]');
+                FOR uri IN volume.findnodes('./*[local-name()="uris"]/*[local-name()="uri"]');
                     res.href = uri.getAttribute('href');
                     res.link = uri.getAttribute('label');
                     res.note = uri.getAttribute('use_restriction');