From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 10 Dec 2014 22:38:18 +0000 (-0500)
Subject: Prevent URIs when we have OpenURLs in search results
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2Ftpac_eresources_highlander_2_7;p=contrib%2FConifer.git

Prevent URIs when we have OpenURLs in search results

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

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index baebf636b6..fe2a877864 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -237,6 +237,7 @@ END;
                                                                 NEXT IF issn == '';
                                                                 res_urls = ResolverResolver.resolve_issn(issn, openurl.baseurl);
                                                                 FOREACH res IN res_urls;
+                                                                    found_openurl = 1;
                                                         %]
                                                         <tr name="results_issn_tr">
                                                             <td valign="top">
@@ -289,14 +290,14 @@ END;
                                                                 </td>
                                                             </tr>
                                                         [% END %]
-                                                        [% FOR uri IN args.uris %]
+                                                        [% UNLESS found_openurl; FOR uri IN args.uris %]
                                                             <tr name='bib_uri_list' class='result_table_title_cell'>
                                                                 <td valign='top'>
                                                                     <strong>[% l('Electronic resource') %]</strong>
                                                                 </td>
                                                                 <td><a href="[% uri.href %]">[% uri.link | html %]</a>[% ' - ' _ uri.note | html IF uri.note %]</td>
                                                             </tr>
-                                                            [% END %]
+                                                            [% END; END %]
                                                             [%- IF args.holdings.size > 0;
                                                                 FOREACH copy IN args.holdings;
                                                                     IF copy.part_label != '';