Try more specific subject display. Let's see if this is crazy slow

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@728 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/web/opac/locale/en-CA/opac_conifer.dtd b/web/opac/locale/en-CA/opac_conifer.dtd
index 9b1f735..b59b82c 100644 (file)
--- a/web/opac/locale/en-CA/opac_conifer.dtd
+++ b/web/opac/locale/en-CA/opac_conifer.dtd
@@ -11,6 +11,21 @@
 <!ENTITY common.additional.authors "Additional authors">
 <!ENTITY common.preceding.entry "Preceding entry">
 <!ENTITY common.succeeding.entry "Succeeding entry">
+<!-- from http://www.loc.gov/marc/bibliographic/bd6xx.html -->
+<!ENTITY common.subject.600 "Subjects - personal name">
+<!ENTITY common.subject.610 "Subjects - corporate name">
+<!ENTITY common.subject.611 "Subjects - meeting name">
+<!ENTITY common.subject.630 "Subjects - uniform title">
+<!ENTITY common.subject.648 "Subjects - chronological term">
+<!ENTITY common.subject.651 "Subjects - geographic name">
+<!ENTITY common.subject.653 "Index term">
+<!ENTITY common.subject.654 "Faceted topical term">
+<!ENTITY common.subject.655 "Subjects - genre or form">
+<!ENTITY common.subject.656 "Subjects - occupation">
+<!ENTITY common.subject.657 "Subjects - function">
+<!ENTITY common.subject.658 "Subjects - curriculum objective">
+<!ENTITY common.subject.662 "Subjects - hierarchical place name">
+
 
 <!ENTITY rdetail.extras.preview "Preview">
 <!ENTITY rdetail.extras.performer.notes "Performer or Participant Notes">

diff --git a/web/opac/locale/en-US/opac_conifer.dtd b/web/opac/locale/en-US/opac_conifer.dtd
index 49f4ba8..44d4462 100644 (file)
--- a/web/opac/locale/en-US/opac_conifer.dtd
+++ b/web/opac/locale/en-US/opac_conifer.dtd
@@ -11,6 +11,20 @@
 <!ENTITY common.additional.authors "Additional authors">
 <!ENTITY common.preceding.entry "Preceding entry">
 <!ENTITY common.succeeding.entry "Succeeding entry">
+<!-- from http://www.loc.gov/marc/bibliographic/bd6xx.html -->
+<!ENTITY common.subject.600 "Subjects - personal name">
+<!ENTITY common.subject.610 "Subjects - corporate name">
+<!ENTITY common.subject.611 "Subjects - meeting name">
+<!ENTITY common.subject.630 "Subjects - uniform title">
+<!ENTITY common.subject.648 "Subjects - chronological term">
+<!ENTITY common.subject.651 "Subjects - geographic name">
+<!ENTITY common.subject.653 "Index term">
+<!ENTITY common.subject.654 "Faceted topical term">
+<!ENTITY common.subject.655 "Subjects - genre or form">
+<!ENTITY common.subject.656 "Subjects - occupation">
+<!ENTITY common.subject.657 "Subjects - function">
+<!ENTITY common.subject.658 "Subjects - curriculum objective">
+<!ENTITY common.subject.662 "Subjects - hierarchical place name">
 
 <!ENTITY rdetail.extras.preview "Preview">
 <!ENTITY rdetail.extras.performer.notes "Performer or Participant Notes">

diff --git a/web/opac/locale/fr-CA/opac_conifer.dtd b/web/opac/locale/fr-CA/opac_conifer.dtd
index 3725551..0b94d20 100644 (file)
--- a/web/opac/locale/fr-CA/opac_conifer.dtd
+++ b/web/opac/locale/fr-CA/opac_conifer.dtd
@@ -11,6 +11,20 @@
 <!ENTITY common.additional.authors "Autre auteurs">
 <!ENTITY common.preceding.entry "Liaison au document prédécesseur">
 <!ENTITY common.succeeding.entry "Liaison au document successeur">
+<!-- from http://www.collectionscanada.gc.ca/marc/040010-1600-f.html -->
+<!ENTITY common.subject.600 "Sujets - nom de personne">
+<!ENTITY common.subject.610 "Sujets - nom de collectivité">
+<!ENTITY common.subject.611 "Sujets - nom de réunion">
+<!ENTITY common.subject.630 "Sujets - titre uniforme">
+<!ENTITY common.subject.648 "Sujets - terme chronologique">
+<!ENTITY common.subject.651 "Sujets - nom géographique">
+<!ENTITY common.subject.653 "Terme d'indexation">
+<!ENTITY common.subject.654 "Termes à facettes">
+<!ENTITY common.subject.655 "Sujets - genre ou forme">
+<!ENTITY common.subject.656 "Sujets - occupation">
+<!ENTITY common.subject.657 "Sujets - fonction">
+<!ENTITY common.subject.658 "Sujets - objectif du programme études">
+<!ENTITY common.subject.662 "Sujets - Nom hiérarchique de lieu">
 
 <!ENTITY rdetail.extras.preview "Preview">
 <!ENTITY rdetail.extras.performer.notes "Note sur les participants ou les interprètes">

diff --git a/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml b/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
index eea8583..37f843d 100644 (file)
--- a/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
+++ b/web/opac/skin/lul/xml/rdetail/rdetail_summary.xml
@@ -173,11 +173,11 @@
 
             <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
                  *** summary screen with complex information, such as new search links on subjects. -->
-                <tr class='hide_me' id='tag6__'>
-                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects;</td>
-                        <td type='opac/slot-data' query='datafield[tag^=6]' class='rdetail_item'>
+                <tr class='hide_me' id='tag600'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.600;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=600]' class='rdetail_item'>
                         <script type='opac/slot-format'><![CDATA[
-                               dojo.query('#tag6__').removeClass('hide_me');
+                               dojo.query('#tag600').removeClass('hide_me');
                                var cgi = new CGI();
                                var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
                                var total = '';
@@ -197,6 +197,319 @@
                        ]]></script>
                        </td>
                </tr>
+               <tr class='hide_me' id='tag610'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.610;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=610]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag610').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag611'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.611;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=611]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag611').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag630'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.630;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=630]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag630').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag648'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.648;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=648]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag648').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag650'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.650;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=650]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag650').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag651'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.651;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=651]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag651').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag653'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.653;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=653]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag653').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag654'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.654;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=654]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag654').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag655'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.655;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=655]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag655').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag656'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.656;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=656]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag656').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag657'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.657;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=657]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag657').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag658'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.658;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=658]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag658').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+               <tr class='hide_me' id='tag662'>
+                        <td nowrap='nowrap' class='rdetail_desc'>&common.subjects.662;</td>
+                        <td type='opac/slot-data' query='datafield[tag^=662]' class='rdetail_item'>
+                        <script type='opac/slot-format'><![CDATA[
+                               dojo.query('#tag662').removeClass('hide_me');
+                               var cgi = new CGI();
+                               var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+                               var total = '';
+                               var output = [];
+                               var list = dojo.query( 'subfield', item );
+                               for (var i =0; i < list.length; i++) {
+                                       total += dojox.data.dom.textContent(list[i]) + ' ';
+                                       var current = '<a 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 += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+                                       output.push(current);
+                               }
+                               return '<span>' + output.join(' &#x2d;&#x2d; ') + '</span><br/>';
+                       ]]></script>
+                       </td>
+               </tr>
+
                <tr class='hide_me' id='tag500'>
                        <td nowrap='nowrap' class='rdetail_desc'>&common.general.note;</td>
                        <td type='opac/slot-data' query='datafield[tag=500]' class='rdetail_item'>