OpenURL resolution in TPAC - further cleanup

We appear to be getting one null or empty value in the args.issns array,
which was causing spurious lookups of null ISSNs, so skip the entry if
it is an empty string.

Also, switch from the product-specific "sfx" variable name to the
product-neutral "openurls" as we have CUFTS in the mix these days.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Art <artrhyno@uwindsor.ca>

diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index e21b086..51798fb 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -52,17 +52,18 @@
 </div>
 
 [%- IF openurl.enabled == 'true';
-    sfx = []
-    FOR issn IN args.issns;
-        sfx = sfx.import(ResolverResolver.resolve_issn(issn, openurl.baseurl));
+    openurls = []
+    FOREACH issn IN args.issns;
+        NEXT IF issn == '';
+        openurls = openurls.import(ResolverResolver.resolve_issn(issn, openurl.baseurl));
     END;
-    IF sfx.size && sfx.0 != '';
+    IF openurls.size && openurls.0 != '';
 %]
     <div id='rdetail_openurl'>
         <strong class='rdetail_openurl_title'>[% l("Electronic resources") %]</strong>
         <table><tbody>
 [%-
-        FOR res IN sfx;
+        FOREACH res IN openurls;
 %]
         <tr>
             <td class='rdetail_openurl_entry'><a href="[% res.target_url %]">[% res.public_name %]</a></td>
@@ -71,7 +72,7 @@
     [%- END %]
     </tbody></table>
 [%- END %]
-[%- IF sfx.size && sfx.0 != '' %]
+[%- IF openurls.size && openurls.0 != '' %]
     </div>    
 [%- END %]
 [%- merged_uris = args.uris.merge(args.online_res);

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index a5a9ea3..8312379 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -91,9 +91,10 @@
                                                             </tr>
                                                         [% END %]
                                                         [%- IF openurl.enabled == 'true';
-                                                            FOR issn IN args.issns;
-                                                                sfx = ResolverResolver.resolve_issn(issn, openurl.baseurl);
-                                                                FOR res IN sfx;
+                                                            FOREACH issn IN args.issns;
+                                                                NEXT IF issn == '';
+                                                                res_urls = ResolverResolver.resolve_issn(issn, openurl.baseurl);
+                                                                FOREACH res IN res_urls;
                                                         %]
                                                         <tr name="results_issn_tr">
                                                             <td valign="top">