Optimize the templates for SMS size constraints

Signed-off-by: Jason Etheridge <jason@esilibrary.com>

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 81e2d26..9654f5d 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -11702,29 +11702,16 @@ INSERT INTO action_trigger.event_definition (
 [%- 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) %]
-Subject: Hold Available Notification
+Subject: [% target.size %] holds ready
 
-Dear [% user.family_name %], [% user.first_given_name %]
-The item(s) you requested are available for pickup from the Library.
-
-[% FOR hold IN target %]
-[%-
+[% FOR hold IN target %][%-
   bibxml = helpers.xml_doc( hold.current_copy.call_number.record.marc );
   title = "";
-  FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a" or @code="b"]'');
+  FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a"]'');
     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 %]
+%][% hold.usr.first_given_name %]:[% title %] @ [% hold.pickup_lib.name %]
 [% END %]
 '
 );
@@ -11788,14 +11775,15 @@ Subject: Call Number
   END;
   author = bibxml.findnodes(''//*[@tag="100"]/*[@code="a"]'').textContent;
 %]
+Call Number: [% target.label %]
+Location: [% helpers.get_most_populous_location( target.id ).name %]
+Library: [% target.owning_lib.name %]
 [%- IF title %]
 Title: [% title %]
 [%- END %]
 [%- IF author %]
 Author: [% author %]
 [%- END %]
-Call Number: [% target.label %]
-Library: [% target.owning_lib.name %]
 '
 );
 
@@ -11810,3 +11798,4 @@ 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 1b7b259..87cfc47 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sms_carriers.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.sms_carriers.sql
@@ -1309,29 +1309,16 @@ INSERT INTO action_trigger.event_definition (
 [%- 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) %]
-Subject: Hold Available Notification
+Subject: [% target.size %] holds ready
 
-Dear [% user.family_name %], [% user.first_given_name %]
-The item(s) you requested are available for pickup from the Library.
-
-[% FOR hold IN target %]
-[%-
+[% FOR hold IN target %][%-
   bibxml = helpers.xml_doc( hold.current_copy.call_number.record.marc );
   title = "";
-  FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a" or @code="b"]'');
+  FOR part IN bibxml.findnodes(''//*[@tag="245"]/*[@code="a"]'');
     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 %]
+%][% hold.usr.first_given_name %]:[% title %] @ [% hold.pickup_lib.name %]
 [% END %]
 '
 );
@@ -1395,15 +1382,15 @@ Subject: Call Number
   END;
   author = bibxml.findnodes(''//*[@tag="100"]/*[@code="a"]'').textContent;
 %]
+Call Number: [% target.label %]
+Location: [% helpers.get_most_populous_location( target.id ).name %]
+Library: [% target.owning_lib.name %]
 [%- IF title %]
 Title: [% title %]
 [%- END %]
 [%- IF author %]
 Author: [% author %]
 [%- END %]
-Call Number: [% target.label %]
-Location: [% helpers.get_most_populous_location( target.id ).name %]
-Library: [% target.owning_lib.name %]
 '
 );