From 2b199771ee27379c8c28127756c7b3373a45be70 Mon Sep 17 00:00:00 2001
From: Jeff Godin <jgodin@tadl.org>
Date: Wed, 25 Jul 2012 14:02:00 -0400
Subject: [PATCH] Teach TPAC to show jacket images by Record ID

Retrieve AC jackets by record ID in TPAC and include jacket image
even if we lack an ISBN/UPC.

Conditional output of the jacket image <img> tag breaks local added
content overrides by record ID. Make the inclusion of the jacket
image unconditional.

Use an onerror handler to hide broken jacket images for those cases
where we receive a 404 instead of a 1x1 placeholder.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---
 Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 | 3 ++-
 Open-ILS/src/templates/opac/parts/record/summary.tt2  | 7 +++----
 Open-ILS/src/templates/opac/parts/result/table.tt2    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
index 661c1320f7..d250ea1784 100644
--- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
@@ -36,7 +36,8 @@
                             IF ident %]
                         <a href="[% mkurl(ctx.opac_root _ '/record/' _ cn.record.id, {$loc_name => loc_value}, 1) %]"><img height='60' width='50' 
                             class='cn_browse_info' name='cn_browse_pic' border='0'
-                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]" /></a>
+                            onerror='this.style.display="none";'
+                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% cn.record.id | uri %]" /></a>
                         [% END %]
                         <div class='cn_browse_info bold' name='cn_browse_cn'>[% cn.label | html %]</div>
                         <div class='cn_browse_info'>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index a38bd54f7e..1acc5a8467 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -10,11 +10,10 @@
 [%-# This holds the record summary information %]
 <div id="rdetail_summary_header">
     <div id="rdetail_image_div">
-        [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
-        <a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/[% ident | uri %]'><img
+        <a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/r/[% ctx.bre_id | uri %]'><img
             alt="[% l('Image of item') %]" id='rdetail_image'
-            src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/[% ident | uri %]' /></a>
-        [% END %]
+            onerror="this.style.display='none';"
+            src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/r/[% ctx.bre_id | uri %]' /></a>
         <br />
     </div>
 
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index e0f3f2a9d2..5257a1be6f 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -41,11 +41,11 @@
                                                     result_count; result_count = result_count + 1
                                                 %].</td>
                                             <td class='result_table_pic_header'>
-                                                [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
+                                                [% ident = attrs.isbn_clean || attrs.upc; %]
                                                 <a href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"><img alt="[% l('Image of item') %]"
                                                         name='item_jacket' class='result_table_pic' width="55"
-                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]' /></a><br />
-                                                [% END %]
+                                                        onerror='this.style.display="none";'
+                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% rec.id | uri %]' /></a><br />
                                             </td>
                                             <td class='result_table_title_cell' name='result_table_title_cell'>
                                                 <div class="bold">
-- 
2.11.0