From 2d7f2212770787632ebd930089cba8491eae53cc Mon Sep 17 00:00:00 2001
From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Tue, 26 Apr 2011 15:06:07 +0000
Subject: [PATCH] Adopt the more sophisticated subject handling from trunk

The core skin limits display of subject subfields to the a-z range,
which is useful as we begin to add subfield 0 via the authority
control fields.


git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_2_0@1422 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 .../skin/algoma/xml/rdetail/rdetail_summary.xml    | 28 ++++++++-----
 .../skin/default/xml/rdetail/rdetail_summary.xml   | 28 ++++++++-----
 web/opac/skin/lul/xml/rdetail/rdetail_summary.xml  | 28 ++++++++-----
 web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml | 46 +++++++++++++---------
 4 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/web/opac/skin/algoma/xml/rdetail/rdetail_summary.xml b/web/opac/skin/algoma/xml/rdetail/rdetail_summary.xml
index 78e9d14b0b..dc618fb815 100644
--- a/web/opac/skin/algoma/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/algoma/xml/rdetail/rdetail_summary.xml
@@ -481,27 +481,35 @@
             var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
             var total = '';
             var output = [];
-            dojo.query( 'subfield:not([code=2])', item ).forEach( function (onesub) {
+            dojo.query( 'subfield', item ).forEach( function (onesub) {
                 var subtext = '';
+                var sub_code = onesub.getAttribute('code');
                 try {   
                     if (dojo.isIE) {
                         subtext = onesub.firstChild.nodeValue;
                     } else {
                         subtext = onesub.textContent;
                     }
-                    total +=  subtext + ' ';
+                    if ( sub_code.match(/[a-z]/i) ) {
+                        var current = '';
+                        if ( sub_code.match(/[vxyz]/ ) ) {
+                            current += '&#x2d;&#x2d; ';
+                        }
+                        total += subtext + ' ';
+                        current += '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total.replace(/\s+$/, '');
+                        for (var p in other_params) {
+                            if (cgi.param(other_params[p])) {
+                                current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
+                            }
+                        }
+                        current += '">' + subtext + '</a>'
+                        output.push(current);
+                    }
                 } catch (e) {
                     return;
                 }
-                var current = '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                for (var p in other_params) {
-                if (cgi.param(other_params[p]))
-                    current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                }
-                current += '">' + subtext + '</a>'
-                output.push(current);
             });
-            return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+            return '<span>' + output.join(' ') + '</span><br/>';
         }
 
         dojo.addOnLoad( function () {
diff --git a/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
index fdb3e7cff5..68b74fc7b5 100644
--- a/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
@@ -461,27 +461,35 @@
             var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
             var total = '';
             var output = [];
-            dojo.query( 'subfield:not([code=2])', item ).forEach( function (onesub) {
+            dojo.query( 'subfield', item ).forEach( function (onesub) {
                 var subtext = '';
+                var sub_code = onesub.getAttribute('code');
                 try {   
                     if (dojo.isIE) {
                         subtext = onesub.firstChild.nodeValue;
                     } else {
                         subtext = onesub.textContent;
                     }
-                    total +=  subtext + ' ';
+                    if ( sub_code.match(/[a-z]/i) ) {
+                        var current = '';
+                        if ( sub_code.match(/[vxyz]/ ) ) {
+                            current += '&#x2d;&#x2d; ';
+                        }
+                        total += subtext + ' ';
+                        current += '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total.replace(/\s+$/, '');
+                        for (var p in other_params) {
+                            if (cgi.param(other_params[p])) {
+                                current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
+                            }
+                        }
+                        current += '">' + subtext + '</a>'
+                        output.push(current);
+                    }
                 } catch (e) {
                     return;
                 }
-                var current = '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                for (var p in other_params) {
-                if (cgi.param(other_params[p]))
-                    current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                }
-                current += '">' + subtext + '</a>'
-                output.push(current);
             });
-            return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+            return '<span>' + output.join(' ') + '</span><br/>';
         }
 
         dojo.addOnLoad( function () {
diff --git a/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml b/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
index da70ad97c5..2ec3e81d8e 100644
--- a/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
@@ -481,27 +481,35 @@
             var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
             var total = '';
             var output = [];
-            dojo.query( 'subfield:not([code=2])', item ).forEach( function (onesub) {
+            dojo.query( 'subfield', item ).forEach( function (onesub) {
                 var subtext = '';
+                var sub_code = onesub.getAttribute('code');
                 try {   
                     if (dojo.isIE) {
                         subtext = onesub.firstChild.nodeValue;
                     } else {
                         subtext = onesub.textContent;
                     }
-                    total +=  subtext + ' ';
+                    if ( sub_code.match(/[a-z]/i) ) {
+                        var current = '';
+                        if ( sub_code.match(/[vxyz]/ ) ) {
+                            current += '&#x2d;&#x2d; ';
+                        }
+                        total += subtext + ' ';
+                        current += '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total.replace(/\s+$/, '');
+                        for (var p in other_params) {
+                            if (cgi.param(other_params[p])) {
+                                current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
+                            }
+                        }
+                        current += '">' + subtext + '</a>'
+                        output.push(current);
+                    }
                 } catch (e) {
                     return;
                 }
-                var current = '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                for (var p in other_params) {
-                if (cgi.param(other_params[p]))
-                    current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                }
-                current += '">' + subtext + '</a>'
-                output.push(current);
             });
-            return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+            return '<span>' + output.join(' ') + '</span><br/>';
         }
 
         dojo.addOnLoad( function () {
diff --git a/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml b/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml
index 9e3a1bf565..0f215783d1 100644
--- a/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml
@@ -91,7 +91,7 @@
 			</tr>
 			<tr class='hide_me' id='tag022'>
 				<td nowrap='nowrap' class='rdetail_desc' id='issn_title'>&common.issn;</td>			
-				<td type='opac/slot-data' query='datafield[tag=022]' class='rdetail_ite' id='rdetail_issn'>
+				<td type='opac/slot-data' query='datafield[tag=022]' class='rdetail_item' id='rdetail_issn'>
 				    <script type='opac/slot-format'><![CDATA[
 					dojo.query('#tag022').removeClass('hide_me');
 					var issn_raw = dojo.trim(BT.textContent(item));
@@ -430,40 +430,48 @@
             var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
             var total = '';
             var output = [];
-            dojo.query( 'subfield:not([code=2])', item ).forEach( function (onesub) {
+            dojo.query( 'subfield', item ).forEach( function (onesub) {
                 var subtext = '';
+                var sub_code = onesub.getAttribute('code');
                 try {   
                     if (dojo.isIE) {
                         subtext = onesub.firstChild.nodeValue;
                     } else {
                         subtext = onesub.textContent;
                     }
-                    total +=  subtext + ' ';
+                    if ( sub_code.match(/[a-z]/i) ) {
+                        var current = '';
+                        if ( sub_code.match(/[vxyz]/ ) ) {
+                            current += '&#x2d;&#x2d; ';
+                        }
+                        total += subtext + ' ';
+                        current += '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total.replace(/\s+$/, '');
+                        for (var p in other_params) {
+                            if (cgi.param(other_params[p])) {
+                                current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
+                            }
+                        }
+                        current += '">' + subtext + '</a>'
+                        output.push(current);
+                    }
                 } catch (e) {
                     return;
                 }
-                var current = '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total;
-                for (var p in other_params) {
-                if (cgi.param(other_params[p]))
-                    current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
-                }
-                current += '">' + subtext + '</a>'
-                output.push(current);
             });
-            return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+            return '<span>' + output.join(' ') + '</span><br/>';
         }
 
         dojo.addOnLoad( function () {
             setTimeout( function () {
-            var here = findOrgUnit(getLocation());
-            if (getDepth() > 0 || getDepth === 0 ) {
-                while (getDepth() < findOrgDepth(here))
-                    here = findOrgUnit( here.parent_ou() );
-            }
+                var here = findOrgUnit(getLocation());
+                if (getDepth() > 0 || getDepth === 0 ) {
+                    while (getDepth() < findOrgDepth(here))
+                        here = findOrgUnit( here.parent_ou() );
+                }
 
-            dojo.require('openils.BibTemplate');
-            new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();
-	    }, 0);
+                dojo.require('openils.BibTemplate');
+                new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();
+            }, 0);
         });
 	]]></script>
 
-- 
2.11.0