From b28d6c8b3c65f3aa2101c3c1ed3a158689f78d65 Mon Sep 17 00:00:00 2001
From: Dan Scott <dan@coffeecode.net>
Date: Thu, 23 Jun 2011 09:51:25 -0400
Subject: [PATCH] Fix a few thinkos in SFX-based ISBN display in search results

Also, change "E-Journals" to "Electronic Resources" to be more
inclusive.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 .../web/opac/skin/uwin/xml/result/result_table.xml | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/web/opac/skin/uwin/xml/result/result_table.xml b/Open-ILS/web/opac/skin/uwin/xml/result/result_table.xml
index b8c20d9a2b..96d84264b7 100644
--- a/Open-ILS/web/opac/skin/uwin/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/uwin/xml/result/result_table.xml
@@ -78,7 +78,7 @@
                                 <td class='sfx_display'> 
                                     <span class='sfx_image'>
                                     <img src='../../../../images/sfxinfo.jpg' alt=''/>
-                                    <i>SFX E-Journals</i>
+                                    <i>SFX Electronic Resource</i>
                                     </span>
                                     <span id='result_table_recid_span' name='result_table_recid_span' class='recid'>
                                         <span name='recid_holder' class='hide_me'></span>
@@ -95,21 +95,27 @@
                                 -->
                                 <span type='opac/slot-data' query='record' class='hide_me'>
                                 <span class='hide_me' debug='true' type='opac/slot-format'><![CDATA[
+                                    var found_issn = false;
+                                    dojo.query('datafield[tag="022"]', item).forEach(function(item) {
+                                        found_issn = true;
+                                    });
+                                    var found_isbn_sfx = false;
+                                    dojo.query('datafield[tag="020"] subfield[code="9"]', item).forEach(function(item) {
+                                        found_isbn_sfx = true;
+                                    });
+                                    if (!found_issn && !found_isbn_sfx) {
+                                        return;
+                                    }
+
                                     var this_title_id;
-                                
                                     dojo.query('datafield[tag="901"] subfield[code="c"]', item).forEach(function (item) {
                                         this_title_id = dojo.trim(BT.textContent(item));
                                     });
 
-                                    dojo.query('datafield[tag="020"]', item).forEach(function(item) {
-                                        var sfx_mark = false;
-                                        dojo.query('subfield[code="9"]', item).forEach(function(item) {
-                                            sfx_mark = true;
-                                        });
-                                        if (!sfx_mark) {
+                                    dojo.query('datafield[tag="020"] subfield', item).forEach(function(item) {
+                                        if (item.getAttribute('code') == '9') {
                                             return;
                                         }
-
                                         var isbn = '';
                                         isbn = BT.textContent(item) + '';
                                         isbn = isbn.replace(/^\s|.*?(\d\S*).*?$/, "$1");
@@ -118,7 +124,7 @@
                                             try {
                                                 var ses = new OpenSRF.ClientSession('open-ils.resolver');
                                                 var req = ses.request('open-ils.resolver.resolve_holdings.raw',
-                                                                                        'isbn', isbn, 'http://sfx.scholarsportal.info/windsor');
+                                                    'isbn', isbn, 'http://sfx.scholarsportal.info/windsor');
                                                 req.oncomplete = function(r) {
                                                     var resolverInfo = "";
                                                     dojo.forEach(r.recv().content(), function(entry) {
@@ -293,7 +299,7 @@
                                         dojo.query('datafield[tag="020"] subfield[code="9"]', item).forEach(function(isbn) {
                                             found_isbn = true;
                                         });
-                                        if (found_issn or found_isbn) { return; }
+                                        if (found_issn || found_isbn) { return; }
 
                                         var this_title_id;
                                     
-- 
2.11.0