From b69ffb6a8377282d9e1978bb732c439c28cdec1a Mon Sep 17 00:00:00 2001
From: Jeff Godin <jgodin@tadl.org>
Date: Thu, 19 Sep 2013 11:17:27 -0400
Subject: [PATCH] Teach TPAC and selfcheck jackets by record ID

Teach TPAC and web-based selfcheck to display jackets by record ID.

Not covered yet: KPAC (uses a non-1x1 placeholder at this time) and
Acq (where we don't always have a bre.id).

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  | 5 +----
 Open-ILS/src/templates/opac/parts/record/summary.tt2   | 4 ++--
 Open-ILS/src/templates/opac/parts/result/table.tt2     | 5 ++---
 Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js | 6 +++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
index 153dc9ad3c..c75c088977 100644
--- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
@@ -32,12 +32,9 @@
                     <td class='cn_browse_item' width='25%' valign='top'>
                         [%  rec_attrs = {marc_xml => cn.record.marc};
                             PROCESS get_marc_attrs args=rec_attrs;
-                            ident = rec_attrs.isbn_clean || rec_attrs.upc;
-                            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>
-                        [% END %]
+                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% cn.record_id | uri %]" /></a>
                         <div class='cn_browse_info bold' name='cn_browse_cn'>[% cn.label | html %]</div>
                         <div class='cn_browse_info'>
                             <a name='cn_browse_title' class='classic_link record_title'
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 0f892d4912..0f14297535 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -26,9 +26,9 @@
     </div>
     <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>
+            src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/r/[% ctx.bre_id | uri %]' /></a>
         [% END %]
         <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 81ca68a54d..fd1c20f8bd 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -40,11 +40,9 @@
                                                     result_count; result_count = result_count + 1
                                                 %].</td>
                                             <td class='result_table_pic_header'>
-                                                [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
                                                 <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 %]
+                                                        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="result_metadata">
@@ -323,6 +321,7 @@ END;
                                                             [% END %]
                                                         </div>
                                                         [% IF ENV.OILS_CONTENT_CAFE_USER %]
+                                                        [% ident = attrs.isbn_clean || attrs.upc %]
                                                         <div class="results_aux_utils result_util">
                                                             <a title="[% l('Reviews and More') %]" target='_blank' 
                                                                 href="[% ctx.ext_proto %]://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=[%- 
diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
index 04360cd033..7ee02fd961 100644
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -735,7 +735,7 @@ SelfCheckManager.prototype.insertHold = function(data) {
     var row = this.holdTemplate.cloneNode(true);
 
     if(data.mvr.isbn()) {
-        this.byName(row, 'jacket').setAttribute('src', '/opac/extras/ac/jacket/small/' + data.mvr.isbn());
+        this.byName(row, 'jacket').setAttribute('src', '/opac/extras/ac/jacket/small/r/' + data.mvr.doc_id());
     }
 
     this.byName(row, 'title').innerHTML = data.mvr.title();
@@ -1186,8 +1186,8 @@ SelfCheckManager.prototype.displayCheckout = function(evt, type, itemsOut) {
     var circ = evt.payload.circ;
     var row = this.circTemplate.cloneNode(true);
 
-    if(record.isbn()) {
-        this.byName(row, 'jacket').setAttribute('src', '/opac/extras/ac/jacket/small/' + record.isbn());
+    if(record.id()) {
+        this.byName(row, 'jacket').setAttribute('src', '/opac/extras/ac/jacket/small/r/' + record.doc_id());
     }
 
     this.byName(row, 'barcode').innerHTML = copy.barcode();
-- 
2.43.2