From 703c3aa62fc33f43f819b7631bf2bcae291e41bc Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Fri, 18 Nov 2011 15:00:29 -0500 Subject: [PATCH] Don't lowercase author/title Also omit author and/or title entirely if they don't have values. Signed-off-by: Jason Etheridge --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 43 ++++++++++++++++------ .../sql/Pg/upgrade/XXXX.schema.sms_carriers.sql | 42 ++++++++++++++++----- 2 files changed, 64 insertions(+), 21 deletions(-) diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 56d9104566..81e2d263c3 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -11698,8 +11698,7 @@ INSERT INTO action_trigger.event_definition ( '00:30:00', 'shelf_time', 'sms_notify', - ' -[%- USE date -%] + '[%- USE date -%] [%- user = target.0.usr -%] From: [%- params.sender_email || default_sender %] To: [%- params.recipient_email || helpers.get_sms_gateway_email(target.0.sms_carrier,target.0.sms_notify) %] @@ -11709,13 +11708,25 @@ Dear [% user.family_name %], [% user.first_given_name %] The item(s) you requested are available for pickup from the Library. [% FOR hold IN target %] - Title: [% hold.current_copy.call_number.record.simple_record.title %] - Author: [% hold.current_copy.call_number.record.simple_record.author %] +[%- + bibxml = helpers.xml_doc( hold.current_copy.call_number.record.marc ); + title = ""; + FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a" or @code="b"]''); + title = title _ part.textContent; + END; + author = bibxml.findnodes(''//*[@tag="100"]/*[@code="a"]'').textContent; +%] +[%- IF title %] + Title: [% title %] +[%- END %] +[%- IF author %] + Author: [% author %] +[%- END %] Call Number: [% hold.current_copy.call_number.label %] Barcode: [% hold.current_copy.barcode %] Library: [% hold.pickup_lib.name %] [% END %] - ' +' ); INSERT INTO action_trigger.environment ( @@ -11764,17 +11775,28 @@ INSERT INTO action_trigger.event_definition ( 'acn.format.sms_text', 'NOOP_True', 'SendSMS', - ' -[%- USE date -%] + '[%- USE date -%] From: [%- params.sender_email || default_sender %] To: [%- params.recipient_email || helpers.get_sms_gateway_email(user_data.sms_carrier,user_data.sms_notify) %] Subject: Call Number -Title: [% target.record.simple_record.title %] -Author: [% target.record.simple_record.author %] +[%- + bibxml = helpers.xml_doc( target.record.marc ); + title = ""; + FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a" or @code="b"]''); + title = title _ part.textContent; + END; + author = bibxml.findnodes(''//*[@tag="100"]/*[@code="a"]'').textContent; +%] +[%- IF title %] +Title: [% title %] +[%- END %] +[%- IF author %] +Author: [% author %] +[%- END %] Call Number: [% target.label %] Library: [% target.owning_lib.name %] - ' +' ); INSERT INTO action_trigger.environment ( @@ -11788,4 +11810,3 @@ INSERT INTO action_trigger.environment ( 'owning_lib.billing_address' ); - diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sms_carriers.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sms_carriers.sql index 5cd87d9eee..04871fc538 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sms_carriers.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sms_carriers.sql @@ -1305,8 +1305,7 @@ INSERT INTO action_trigger.event_definition ( '00:30:00', 'shelf_time', 'sms_notify', - ' -[%- USE date -%] + '[%- USE date -%] [%- user = target.0.usr -%] From: [%- params.sender_email || default_sender %] To: [%- params.recipient_email || helpers.get_sms_gateway_email(target.0.sms_carrier,target.0.sms_notify) %] @@ -1316,13 +1315,25 @@ Dear [% user.family_name %], [% user.first_given_name %] The item(s) you requested are available for pickup from the Library. [% FOR hold IN target %] - Title: [% hold.current_copy.call_number.record.simple_record.title %] - Author: [% hold.current_copy.call_number.record.simple_record.author %] +[%- + bibxml = helpers.xml_doc( hold.current_copy.call_number.record.marc ); + title = ""; + FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a" or @code="b"]''); + title = title _ part.textContent; + END; + author = bibxml.findnodes(''//*[@tag="100"]/*[@code="a"]'').textContent; +%] +[%- IF title %] + Title: [% title %] +[%- END %] +[%- IF author %] + Author: [% author %] +[%- END %] Call Number: [% hold.current_copy.call_number.label %] Barcode: [% hold.current_copy.barcode %] Library: [% hold.pickup_lib.name %] [% END %] - ' +' ); INSERT INTO action_trigger.environment ( @@ -1371,17 +1382,28 @@ INSERT INTO action_trigger.event_definition ( 'acn.format.sms_text', 'NOOP_True', 'SendSMS', - ' -[%- USE date -%] + '[%- USE date -%] From: [%- params.sender_email || default_sender %] To: [%- params.recipient_email || helpers.get_sms_gateway_email(user_data.sms_carrier,user_data.sms_notify) %] Subject: Call Number -Title: [% target.record.simple_record.title %] -Author: [% target.record.simple_record.author %] +[%- + bibxml = helpers.xml_doc( target.record.marc ); + title = ""; + FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a" or @code="b"]''); + title = title _ part.textContent; + END; + author = bibxml.findnodes(''//*[@tag="100"]/*[@code="a"]'').textContent; +%] +[%- IF title %] +Title: [% title %] +[%- END %] +[%- IF author %] +Author: [% author %] +[%- END %] Call Number: [% target.label %] Library: [% target.owning_lib.name %] - ' +' ); INSERT INTO action_trigger.environment ( -- 2.11.0