Use INCLUDE instead of PROCESS for marc info

Because of variable leakage that breaks org selectors.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>

diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2
index 72619b0..2819193 100644 (file)
--- a/Open-ILS/src/templates/kpac/getit.tt2
+++ b/Open-ILS/src/templates/kpac/getit.tt2
@@ -3,7 +3,7 @@
     PROCESS "opac/parts/misc_util.tt2"; # MARC 
     WRAPPER "kpac/parts/subpage.tt2";
     attrs = {marc_xml => ctx.marc_xml};
-    PROCESS get_marc_attrs args=attrs;
+    INCLUDE get_marc_attrs args=attrs;
     ctx.page_title = attrs.title | html 
 %]
 

diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2
index bdcfd7f..50fcb74 100644 (file)
--- a/Open-ILS/src/templates/kpac/getit_results.tt2
+++ b/Open-ILS/src/templates/kpac/getit_results.tt2
@@ -3,7 +3,7 @@
     WRAPPER "kpac/parts/subpage.tt2";
     PROCESS "opac/parts/misc_util.tt2"; # MARC 
     attrs = {marc_xml => ctx.marc_xml};
-    PROCESS get_marc_attrs args=attrs;
+    INCLUDE get_marc_attrs args=attrs;
     ctx.page_title = l('Get it');
     kill_params = ['list', 'hold', 'hold_failed', 'pickup_lib', 'action'];
     title_html = attrs.title | html;

diff --git a/Open-ILS/src/templates/kpac/record.tt2 b/Open-ILS/src/templates/kpac/record.tt2
index f727b4a..23476c5 100644 (file)
--- a/Open-ILS/src/templates/kpac/record.tt2
+++ b/Open-ILS/src/templates/kpac/record.tt2
@@ -3,7 +3,7 @@
     PROCESS "opac/parts/misc_util.tt2"; # MARC 
     WRAPPER "kpac/parts/subpage.tt2";
     attrs = {marc_xml => ctx.marc_xml};
-    PROCESS get_marc_attrs args=attrs;
+    INCLUDE get_marc_attrs args=attrs;
     ctx.page_title = attrs.title | html 
 %]
 

diff --git a/Open-ILS/src/templates/kpac/results.tt2 b/Open-ILS/src/templates/kpac/results.tt2
index b13da77..4386e24 100644 (file)
--- a/Open-ILS/src/templates/kpac/results.tt2
+++ b/Open-ILS/src/templates/kpac/results.tt2
@@ -22,7 +22,7 @@
     <div id="search_results_parent"> [%
         FOR rec IN ctx.records;
             attrs = {marc_xml => rec.marc_xml};
-            PROCESS get_marc_attrs args=attrs;
+            INCLUDE get_marc_attrs args=attrs;
             INCLUDE 'kpac/parts/record_row.tt2' show_actions=1 rec_id=rec.id;
         END;
     %] </div>

diff --git a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates/opac/myopac/circ_history.tt2
index 9b6d78d..af37c39 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2
@@ -57,7 +57,7 @@
             <tbody>
                 [% FOR circ IN ctx.circs;
                     attrs = {marc_xml => circ.marc_xml};
-                    PROCESS get_marc_attrs args=attrs; %]
+                    INCLUDE get_marc_attrs args=attrs; %]
                     <tr>
                         <td>
                             <a href="[% mkurl(ctx.opac_root _ '/record/' _ circ.circ.target_copy.call_number.record.id) %]" 

diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index 8ff44ac..17454de 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -70,7 +70,7 @@
             <tbody>
                     [% FOR circ IN ctx.circs;
                         attrs = {marc_xml => circ.marc_xml};
-                        PROCESS get_marc_attrs args=attrs; %]
+                        INCLUDE get_marc_attrs args=attrs; %]
                     <tr>
                         <td class="checkbox_column" valign="top">
                             <input type="checkbox" name="circ"

diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index 7276c9d..a0faea9 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -67,7 +67,7 @@
             <tbody>
                 [% FOR hold IN ctx.holds;
                     attrs = {marc_xml => hold.marc_xml};
-                    PROCESS get_marc_attrs args=attrs;
+                    INCLUDE get_marc_attrs args=attrs;
                     ahr = hold.hold.hold %]
 
                 <tr id="acct_holds_temp" name="acct_holds_temp" class="acct_holds_temp">

diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 5b5a36a..a9f5e8e 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -125,7 +125,7 @@
             <tbody id="holds_temp_parent">
                 [% FOR hold IN ctx.holds;
                     attrs = {marc_xml => hold.marc_xml};
-                    PROCESS get_marc_attrs args=attrs;
+                    INCLUDE get_marc_attrs args=attrs;
                     ahr = hold.hold.hold %]
                 <tr id="acct_holds_temp" name="acct_holds_temp"
                     class="acct_holds_temp[% ahr.frozen == 't' ? ' inactive-hold' : '' %]">

diff --git a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2 b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
index 175d319..2a4d33a 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
@@ -8,7 +8,7 @@
     hold = ctx.holds.0;
     ahr = hold.hold.hold;
     attrs = {marc_xml => hold.marc_xml};
-    PROCESS get_marc_attrs args=attrs;
+    INCLUDE get_marc_attrs args=attrs;
     hold.human_status = PROCESS get_hold_status hold=hold;
 
     # Do this up front to avoid verbosity later

diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 2103ae0..4b41e27 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -270,7 +270,7 @@
                 [% FOR item IN bbag.items;
                     rec_id = item.target_biblio_record_entry.id;
                     attrs = {marc_xml => ctx.bookbags_marc_xml.$rec_id};
-                    PROCESS get_marc_attrs args=attrs %]
+                    INCLUDE get_marc_attrs args=attrs %]
                 <tr class="bookbag-item-row">
                     <td class="list_checkbox">
                         <input type="checkbox" name="selected_item" value="[% item.id %]" bbag='[% bbag.id %]'/>

diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 793653b..4274b37 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -39,7 +39,7 @@
                 [% FOR f IN ctx.fines.circulation;
                     attrs = {marc_xml => f.marc_xml};
                     IF f.marc_xml;
-                        PROCESS get_marc_attrs args=attrs;
+                        INCLUDE get_marc_attrs args=attrs;
                     ELSIF f.xact.reservation;
                         attrs.title = f.xact.reservation.target_resource_type.name;
                     END %]

diff --git a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
index e91838a..d31d9fd 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
@@ -54,7 +54,7 @@
                                     !CGI.param('xact').grep(f.xact.id).size;
                                 attrs = {marc_xml => f.marc_xml};
                                 IF f.marc_xml;
-                                    PROCESS get_marc_attrs args=attrs;
+                                    INCLUDE get_marc_attrs args=attrs;
                                 ELSIF f.xact.reservation;
                                     attrs.title = f.xact.reservation.target_resource_type.name;
                                 END %]

diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2
index 00a898d..62807bf 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2
@@ -46,7 +46,7 @@
                 <tbody>
                     [% FOR item IN ctx.mylist;
                         attrs = {marc_xml => ctx.mylist_marc_xml.$item};
-                        PROCESS get_marc_attrs args=attrs %]
+                        INCLUDE get_marc_attrs args=attrs %]
                     <tr>
                         <td class="item_list_padding" style="padding-left: 10px;">
                             <input type="checkbox" name="record" value="[% item %]" />

diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 2066616..7c22377 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -39,7 +39,7 @@
         <table id='hold-items-list'>
         [% FOR hdata IN ctx.hold_data;
             attrs = {marc_xml => hdata.marc_xml};
-            PROCESS get_marc_attrs args=attrs %]
+            INCLUDE get_marc_attrs args=attrs %]
             <tr>
                 <td>
                     <input type="hidden" name="hold_target" value="[% hdata.target.id | html %]" />

diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
index eb05167..4843cd7 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
@@ -19,7 +19,7 @@
 
         [% FOR hdata IN ctx.hold_data;
             attrs = {marc_xml => hdata.marc_xml};
-            PROCESS get_marc_attrs args=attrs %]
+            INCLUDE get_marc_attrs args=attrs %]
             <tr>
                 <td>
                     [% 

diff --git a/Open-ILS/src/templates/opac/parts/record/body.tt2 b/Open-ILS/src/templates/opac/parts/record/body.tt2
index 0d9a58b..58cac5d 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/body.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/body.tt2
@@ -1,6 +1,6 @@
 [%-  attrs = {marc_xml => ctx.marc_xml};
     PROCESS "opac/parts/misc_util.tt2";
-    PROCESS get_marc_attrs args=attrs;
+    INCLUDE get_marc_attrs args=attrs;
     stop_parms = ['expand','cnoffset'];
     ctx.record_attrs = attrs; # capture for JS
 %]

diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
index 661c132..28d3e2e 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
@@ -31,7 +31,7 @@
                 [% END -%]
                     <td class='cn_browse_item' width='25%' valign='top'>
                         [%  rec_attrs = {marc_xml => cn.record.marc};
-                            PROCESS get_marc_attrs args=rec_attrs;
+                            INCLUDE 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' 

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index b63ec88..e8e827b 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -31,7 +31,7 @@
                     <tbody id="result_table">
                     [%  FOR rec IN ctx.records;
                             attrs = {marc_xml => rec.marc_xml};
-                            PROCESS get_marc_attrs args=attrs;
+                            INCLUDE get_marc_attrs args=attrs;
                             IF CGI.param('detail_record_view');
                                 attrs.title = attrs.title_extended;
                             END;