From: Lebbeous Fogle-Weekley Date: Wed, 13 Mar 2013 19:09:31 +0000 (-0400) Subject: Upgrade script numbering for acq order indentifier selector X-Git-Tag: sprint4-merge-nov22~3286 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b11da34c3d94b25f2a3c5877849e9484d48c6a84;p=working%2FEvergreen.git Upgrade script numbering for acq order indentifier selector Signed-off-by: Lebbeous Fogle-Weekley --- diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index a11edd5250..649d665bab 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps BEFORE INSERT OR UPDATE ON config.db_patch_dependencies FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0775', :eg_version); -- berick/miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0778', :eg_version); -- berick/senator CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/0776.schema.acq-order-ident.sql b/Open-ILS/src/sql/Pg/upgrade/0776.schema.acq-order-ident.sql new file mode 100644 index 0000000000..2185e5535e --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0776.schema.acq-order-ident.sql @@ -0,0 +1,30 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('0776', :eg_version); + +ALTER TABLE acq.lineitem_attr + ADD COLUMN order_ident BOOLEAN NOT NULL DEFAULT FALSE; + +INSERT INTO permission.perm_list ( id, code, description ) VALUES ( + 547, -- VERIFY + 'ACQ_ADD_LINEITEM_IDENTIFIER', + oils_i18n_gettext( + 547,-- VERIFY + 'When granted, newly added lineitem identifiers will propagate to linked bib records', + 'ppl', + 'description' + ) +); + +INSERT INTO permission.perm_list ( id, code, description ) VALUES ( + 548, -- VERIFY + 'ACQ_SET_LINEITEM_IDENTIFIER', + oils_i18n_gettext( + 548,-- VERIFY + 'Allows staff to change the lineitem identifier', + 'ppl', + 'description' + ) +); + +COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/0777.data.acq-order-ident.sql b/Open-ILS/src/sql/Pg/upgrade/0777.data.acq-order-ident.sql new file mode 100644 index 0000000000..4146b16baf --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0777.data.acq-order-ident.sql @@ -0,0 +1,374 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('0777', :eg_version); + +-- Listed here for reference / ease of access. The update +-- is not applied here (see the WHERE clause). +UPDATE action_trigger.event_definition SET template = +$$ +[%- USE date -%] +[% + # extract some commonly used variables + + VENDOR_SAN = target.provider.san; + VENDCODE = target.provider.edi_default.vendcode; + VENDACCT = target.provider.edi_default.vendacct; + ORG_UNIT_SAN = target.ordering_agency.mailing_address.san; + + # set the vendor / provider + + VENDOR_BT = 0; # Baker & Taylor + VENDOR_INGRAM = 0; + VENDOR_BRODART = 0; + VENDOR_MW_TAPE = 0; # Midwest Tape + VENDOR_RB = 0; # Recorded Books + VENDOR_ULS = 0; # ULS + + IF VENDOR_SAN == '1556150'; VENDOR_BT = 1; + ELSIF VENDOR_SAN == '1697684'; VENDOR_BRODART = 1; + ELSIF VENDOR_SAN == '1697978'; VENDOR_INGRAM = 1; + ELSIF VENDOR_SAN == '2549913'; VENDOR_MW_TAPE = 1; + ELSIF VENDOR_SAN == '1113984'; VENDOR_RB = 1; + ELSIF VENDOR_SAN == '1699342'; VENDOR_ULS = 1; + END; + + # if true, pass the PO name as a secondary identifier + # RFF+LI:/li_id + INC_PO_NAME = 0; + IF VENDOR_INGRAM; + INC_PO_NAME = 1; + END; + + # GIR configuration -------------------------------------- + + INC_COPIES = 1; # copies on/off switch + INC_FUND = 0; + INC_CALLNUMBER = 0; + INC_ITEM_TYPE = 1; + INC_LOCATION = 0; + INC_COLLECTION_CODE = 1; + INC_OWNING_LIB = 1; + INC_QUANTITY = 1; + INC_COPY_ID = 0; + + IF VENDOR_BT; + INC_CALLNUMBER = 1; + END; + + IF VENDOR_BRODART; + INC_FUND = 1; + END; + + IF VENDOR_MW_TAPE; + INC_FUND = 1; + INC_COLLECTION_CODE = 0; + INC_ITEM_TYPE = 0; + END; + + # END GIR configuration --------------------------------- + +-%] +[%- BLOCK big_block -%] +{ + "recipient":"[% VENDOR_SAN %]", + "sender":"[% ORG_UNIT_SAN %]", + "body": [{ + "ORDERS":[ "order", { + + "po_number":[% target.id %], + + [% IF INC_PO_NAME %] + "po_name":"[% target.name | replace('\/', ' ') | replace('"', '\"') %]", + [% END %] + + "date":"[% date.format(date.now, '%Y%m%d') %]", + + "buyer":[ + [% IF VENDOR_BT %] + {"id-qualifier": 91, "id":"[% ORG_UNIT_SAN %] [% VENDCODE %]"} + [% ELSE %] + {"id":"[% ORG_UNIT_SAN %]"}, + {"id-qualifier": 91, "id":"[% VENDACCT %]"} + [% END %] + ], + + "vendor":[ + "[% VENDOR_SAN %]", + {"id-qualifier": 92, "id":"[% target.provider.id %]"} + ], + + "currency":"[% target.provider.currency_type %]", + + "items":[ + [%- FOR li IN target.lineitems %] + { + "line_index":"[% li.id %]", + "identifiers":[ + [%- + idval = ''; + idqual = 'EN'; # default ISBN/UPC/EAN-13 + ident_attr = helpers.get_li_order_ident(li.attributes); + IF ident_attr; + idname = ident_attr.attr_name; + idval = ident_attr.attr_value; + IF idname == 'isbn' AND idval.length != 13; + idqual = 'IB'; + ELSIF idname == 'issn'; + idqual = 'IS'; + END; + ELSE; + idqual = 'IN'; + idval = li.id; + END -%] + {"id-qualifier":"[% idqual %]","id":"[% idval %]"} + ], + "price":[% li.estimated_unit_price || '0.00' %], + "desc":[ + {"BTI":"[% helpers.get_li_attr_jedi('title', '', li.attributes) %]"}, + {"BPU":"[% helpers.get_li_attr_jedi('publisher', '', li.attributes) %]"}, + {"BPD":"[% helpers.get_li_attr_jedi('pubdate', '', li.attributes) %]"}, + [% IF VENDOR_ULS -%] + {"BEN":"[% helpers.get_li_attr_jedi('edition', '', li.attributes) %]"}, + {"BAU":"[% helpers.get_li_attr_jedi('author', '', li.attributes) %]"} + [%- ELSE -%] + {"BPH":"[% helpers.get_li_attr_jedi('pagination','', li.attributes) %]"} + [%- END %] + ], + [%- ftx_vals = []; + FOR note IN li.lineitem_notes; + NEXT UNLESS note.vendor_public == 't'; + ftx_vals.push(note.value); + END; + IF VENDOR_BRODART; # look for copy-level spec code + FOR lid IN li.lineitem_details; + IF lid.note; + spec_note = lid.note.match('spec code ([a-zA-Z0-9_])'); + IF spec_note.0; ftx_vals.push(spec_note.0); END; + END; + END; + END; + IF xtra_ftx; ftx_vals.unshift(xtra_ftx); END; + + # BT & ULS want FTX+LIN for every LI, even if empty + IF ((VENDOR_BT OR VENDOR_ULS) AND ftx_vals.size == 0); + ftx_vals.unshift(''); + END; + -%] + + "free-text":[ + [% FOR note IN ftx_vals -%] "[% note %]"[% UNLESS loop.last %], [% END %][% END %] + ], + + "quantity":[% li.lineitem_details.size %], + + [%- IF INC_COPIES -%] + "copies" : [ + [%- compressed_copies = []; + FOR lid IN li.lineitem_details; + fund = lid.fund.code; + item_type = lid.circ_modifier; + callnumber = lid.cn_label; + owning_lib = lid.owning_lib.shortname; + location = lid.location; + collection_code = lid.collection_code; + + # when we have real copy data, treat it as authoritative for some fields + acp = lid.eg_copy_id; + IF acp; + item_type = acp.circ_modifier; + callnumber = acp.call_number.label; + location = acp.location.name; + END ; + + + # collapse like copies into groups w/ quantity + + found_match = 0; + IF !INC_COPY_ID; # INC_COPY_ID implies 1 copy per GIR + FOR copy IN compressed_copies; + IF (fund == copy.fund OR (!fund AND !copy.fund)) AND + (item_type == copy.item_type OR (!item_type AND !copy.item_type)) AND + (callnumber == copy.callnumber OR (!callnumber AND !copy.callnumber)) AND + (owning_lib == copy.owning_lib OR (!owning_lib AND !copy.owning_lib)) AND + (location == copy.location OR (!location AND !copy.location)) AND + (collection_code == copy.collection_code OR (!collection_code AND !copy.collection_code)); + + copy.quantity = copy.quantity + 1; + found_match = 1; + END; + END; + END; + + IF !found_match; + compressed_copies.push({ + fund => fund, + item_type => item_type, + callnumber => callnumber, + owning_lib => owning_lib, + location => location, + collection_code => collection_code, + copy_id => lid.id, # for INC_COPY_ID + quantity => 1 + }); + END; + END; + FOR copy IN compressed_copies; + + # If we assume owning_lib is required and set, + # it is safe to prepend each following copy field w/ a "," + + # B&T EDI requires expected GIR fields to be + # present regardless of whether a value exists. + # some fields are required to have a value in ACQ, + # though, so they are not forced into place below. + + %]{[%- IF INC_OWNING_LIB AND copy.owning_lib %] "owning_lib":"[% copy.owning_lib %]"[% END -%] + [%- IF INC_FUND AND copy.fund %],"fund":"[% copy.fund %]"[% END -%] + [%- IF INC_CALLNUMBER AND (VENDOR_BT OR copy.callnumber) %],"call_number":"[% copy.callnumber %]"[% END -%] + [%- IF INC_ITEM_TYPE AND (VENDOR_BT OR copy.item_type) %],"item_type":"[% copy.item_type %]"[% END -%] + [%- IF INC_LOCATION AND copy.location %],"copy_location":"[% copy.location %]"[% END -%] + [%- IF INC_COLLECTION_CODE AND (VENDOR_BT OR copy.collection_code) %],"collection_code":"[% copy.collection_code %]"[% END -%] + [%- IF INC_QUANTITY %],"quantity":"[% copy.quantity %]"[% END -%] + [%- IF INC_COPY_ID %],"copy_id":"[% copy.copy_id %]" [% END %]}[% ',' UNLESS loop.last -%] + [%- END -%] [%# FOR compressed_copies -%] + ] + [%- END -%] [%# IF INC_COPIES %] + + }[% UNLESS loop.last %],[% END -%] + + [% END %] [%# END lineitems %] + ], + "line_items":[% target.lineitems.size %] + }] [%# close ORDERS array %] + }] [%# close body array %] +} +[% END %] +[% tempo = PROCESS big_block; helpers.escape_json(tempo) %] +$$ +WHERE ID = 23 AND FALSE; -- remove 'AND FALSE' to apply this update + + +-- lineitem worksheet +UPDATE action_trigger.event_definition SET template = +$$ +[%- USE date -%] +[%- + # find a lineitem attribute by name and optional type + BLOCK get_li_attr; + FOR attr IN li.attributes; + IF attr.attr_name == attr_name; + IF !attr_type OR attr_type == attr.attr_type; + attr.attr_value; + LAST; + END; + END; + END; + END +-%] + +

Purchase Order [% target.id %]

+
+date [% date.format(date.now, '%Y%m%d') %] +
+ + + + + + + + + +
Vendor +
[% target.provider.name %]
+
[% target.provider.addresses.0.street1 %]
+
[% target.provider.addresses.0.street2 %]
+
[% target.provider.addresses.0.city %]
+
[% target.provider.addresses.0.state %]
+
[% target.provider.addresses.0.country %]
+
[% target.provider.addresses.0.post_code %]
+ 		Ship to / Bill to +
[% target.ordering_agency.name %]
+
[% target.ordering_agency.billing_address.street1 %]
+
[% target.ordering_agency.billing_address.street2 %]
+
[% target.ordering_agency.billing_address.city %]
+
[% target.ordering_agency.billing_address.state %]
+
[% target.ordering_agency.billing_address.country %]
+
[% target.ordering_agency.billing_address.post_code %]
+
+ +

+
+ Notes to the Vendor +
    + [% FOR note IN target.notes %] + [% IF note.vendor_public == 't' %] +
  • [% note.value %]
    • + [% END %] + [% END %] +
+
+

+ + + + + + + + + + + + + + + + [% subtotal = 0 %] + [% FOR li IN target.lineitems %] + + + [% count = li.lineitem_details.size %] + [% price = li.estimated_unit_price %] + [% litotal = (price * count) %] + [% subtotal = subtotal + litotal %] + [% + ident_attr = helpers.get_li_order_ident(li.attributes); + SET ident_value = ident_attr.attr_value IF ident_attr; + %] + + + + + + + + + [% END %] + + + + + +
PO#ISBN or Item #TitleQuantityUnit PriceLine TotalNotes
[% target.id %][% ident_value %][% PROCESS get_li_attr attr_name = 'title' %][% count %][% price %][% litotal %] +
    + [% FOR note IN li.lineitem_notes %] + [% IF note.vendor_public == 't' %] +
  • [% note.value %]
    • + [% END %] + [% END %] +
+
+ Subtotal[% subtotal %]
+ +
+ +Total Line Item Count: [% target.lineitems.size %] +$$ +WHERE ID = 4; -- PO HTML + +COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/0778.schema.acq-multi-attrs.sql b/Open-ILS/src/sql/Pg/upgrade/0778.schema.acq-multi-attrs.sql new file mode 100644 index 0000000000..1cd2880609 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0778.schema.acq-multi-attrs.sql @@ -0,0 +1,105 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('0778', :eg_version); + +CREATE OR REPLACE FUNCTION extract_marc_field_set + (TEXT, BIGINT, TEXT, TEXT) RETURNS SETOF TEXT AS $$ +DECLARE + query TEXT; + output TEXT; +BEGIN + FOR output IN + SELECT x.t FROM ( + SELECT id,t + FROM oils_xpath_table( + 'id', 'marc', $1, $3, 'id = ' || $2) + AS t(id int, t text))x + LOOP + IF $4 IS NOT NULL THEN + SELECT INTO output (SELECT regexp_replace(output, $4, '', 'g')); + END IF; + RETURN NEXT output; + END LOOP; + RETURN; +END; +$$ LANGUAGE PLPGSQL IMMUTABLE; + + +CREATE OR REPLACE FUNCTION + public.extract_acq_marc_field_set ( BIGINT, TEXT, TEXT) + RETURNS SETOF TEXT AS $$ + SELECT extract_marc_field_set('acq.lineitem', $1, $2, $3); +$$ LANGUAGE SQL; + + +CREATE OR REPLACE FUNCTION public.ingest_acq_marc ( ) RETURNS TRIGGER AS $function$ +DECLARE + value TEXT; + atype TEXT; + prov INT; + pos INT; + adef RECORD; + xpath_string TEXT; +BEGIN + FOR adef IN SELECT *,tableoid FROM acq.lineitem_attr_definition LOOP + + SELECT relname::TEXT INTO atype FROM pg_class WHERE oid = adef.tableoid; + + IF (atype NOT IN ('lineitem_usr_attr_definition','lineitem_local_attr_definition')) THEN + IF (atype = 'lineitem_provider_attr_definition') THEN + SELECT provider INTO prov FROM acq.lineitem_provider_attr_definition WHERE id = adef.id; + CONTINUE WHEN NEW.provider IS NULL OR prov <> NEW.provider; + END IF; + + IF (atype = 'lineitem_provider_attr_definition') THEN + SELECT xpath INTO xpath_string FROM acq.lineitem_provider_attr_definition WHERE id = adef.id; + ELSIF (atype = 'lineitem_marc_attr_definition') THEN + SELECT xpath INTO xpath_string FROM acq.lineitem_marc_attr_definition WHERE id = adef.id; + ELSIF (atype = 'lineitem_generated_attr_definition') THEN + SELECT xpath INTO xpath_string FROM acq.lineitem_generated_attr_definition WHERE id = adef.id; + END IF; + + xpath_string := REGEXP_REPLACE(xpath_string,$re$//?text\(\)$$re$,''); + + IF (adef.code = 'title' OR adef.code = 'author') THEN + -- title and author should not be split + -- FIXME: once oils_xpath can grok XPATH 2.0 functions, we can use + -- string-join in the xpath and remove this special case + SELECT extract_acq_marc_field(id, xpath_string, adef.remove) INTO value FROM acq.lineitem WHERE id = NEW.id; + IF (value IS NOT NULL AND value <> '') THEN + INSERT INTO acq.lineitem_attr (lineitem, definition, attr_type, attr_name, attr_value) + VALUES (NEW.id, adef.id, atype, adef.code, value); + END IF; + ELSE + pos := 1; + LOOP + -- each application of the regex may produce multiple values + FOR value IN + SELECT * FROM extract_acq_marc_field_set( + NEW.id, xpath_string || '[' || pos || ']', adef.remove) + LOOP + + IF (value IS NOT NULL AND value <> '') THEN + INSERT INTO acq.lineitem_attr + (lineitem, definition, attr_type, attr_name, attr_value) + VALUES (NEW.id, adef.id, atype, adef.code, value); + ELSE + EXIT; + END IF; + END LOOP; + IF NOT FOUND THEN + EXIT; + END IF; + pos := pos + 1; + END LOOP; + END IF; + + END IF; + + END LOOP; + + RETURN NULL; +END; +$function$ LANGUAGE PLPGSQL; + +COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-ident.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-ident.sql deleted file mode 100644 index c5d467b72c..0000000000 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.acq-order-ident.sql +++ /dev/null @@ -1,373 +0,0 @@ - -BEGIN; - --- Listed here for reference / ease of access. The update --- is not applied here (see the WHERE clause). -UPDATE action_trigger.event_definition SET template = -$$ -[%- USE date -%] -[% - # extract some commonly used variables - - VENDOR_SAN = target.provider.san; - VENDCODE = target.provider.edi_default.vendcode; - VENDACCT = target.provider.edi_default.vendacct; - ORG_UNIT_SAN = target.ordering_agency.mailing_address.san; - - # set the vendor / provider - - VENDOR_BT = 0; # Baker & Taylor - VENDOR_INGRAM = 0; - VENDOR_BRODART = 0; - VENDOR_MW_TAPE = 0; # Midwest Tape - VENDOR_RB = 0; # Recorded Books - VENDOR_ULS = 0; # ULS - - IF VENDOR_SAN == '1556150'; VENDOR_BT = 1; - ELSIF VENDOR_SAN == '1697684'; VENDOR_BRODART = 1; - ELSIF VENDOR_SAN == '1697978'; VENDOR_INGRAM = 1; - ELSIF VENDOR_SAN == '2549913'; VENDOR_MW_TAPE = 1; - ELSIF VENDOR_SAN == '1113984'; VENDOR_RB = 1; - ELSIF VENDOR_SAN == '1699342'; VENDOR_ULS = 1; - END; - - # if true, pass the PO name as a secondary identifier - # RFF+LI:/li_id - INC_PO_NAME = 0; - IF VENDOR_INGRAM; - INC_PO_NAME = 1; - END; - - # GIR configuration -------------------------------------- - - INC_COPIES = 1; # copies on/off switch - INC_FUND = 0; - INC_CALLNUMBER = 0; - INC_ITEM_TYPE = 1; - INC_LOCATION = 0; - INC_COLLECTION_CODE = 1; - INC_OWNING_LIB = 1; - INC_QUANTITY = 1; - INC_COPY_ID = 0; - - IF VENDOR_BT; - INC_CALLNUMBER = 1; - END; - - IF VENDOR_BRODART; - INC_FUND = 1; - END; - - IF VENDOR_MW_TAPE; - INC_FUND = 1; - INC_COLLECTION_CODE = 0; - INC_ITEM_TYPE = 0; - END; - - # END GIR configuration --------------------------------- - --%] -[%- BLOCK big_block -%] -{ - "recipient":"[% VENDOR_SAN %]", - "sender":"[% ORG_UNIT_SAN %]", - "body": [{ - "ORDERS":[ "order", { - - "po_number":[% target.id %], - - [% IF INC_PO_NAME %] - "po_name":"[% target.name | replace('\/', ' ') | replace('"', '\"') %]", - [% END %] - - "date":"[% date.format(date.now, '%Y%m%d') %]", - - "buyer":[ - [% IF VENDOR_BT %] - {"id-qualifier": 91, "id":"[% ORG_UNIT_SAN %] [% VENDCODE %]"} - [% ELSE %] - {"id":"[% ORG_UNIT_SAN %]"}, - {"id-qualifier": 91, "id":"[% VENDACCT %]"} - [% END %] - ], - - "vendor":[ - "[% VENDOR_SAN %]", - {"id-qualifier": 92, "id":"[% target.provider.id %]"} - ], - - "currency":"[% target.provider.currency_type %]", - - "items":[ - [%- FOR li IN target.lineitems %] - { - "line_index":"[% li.id %]", - "identifiers":[ - [%- - idval = ''; - idqual = 'EN'; # default ISBN/UPC/EAN-13 - ident_attr = helpers.get_li_order_ident(li.attributes); - IF ident_attr; - idname = ident_attr.attr_name; - idval = ident_attr.attr_value; - IF idname == 'isbn' AND idval.length != 13; - idqual = 'IB'; - ELSIF idname == 'issn'; - idqual = 'IS'; - END; - ELSE; - idqual = 'IN'; - idval = li.id; - END -%] - {"id-qualifier":"[% idqual %]","id":"[% idval %]"} - ], - "price":[% li.estimated_unit_price || '0.00' %], - "desc":[ - {"BTI":"[% helpers.get_li_attr_jedi('title', '', li.attributes) %]"}, - {"BPU":"[% helpers.get_li_attr_jedi('publisher', '', li.attributes) %]"}, - {"BPD":"[% helpers.get_li_attr_jedi('pubdate', '', li.attributes) %]"}, - [% IF VENDOR_ULS -%] - {"BEN":"[% helpers.get_li_attr_jedi('edition', '', li.attributes) %]"}, - {"BAU":"[% helpers.get_li_attr_jedi('author', '', li.attributes) %]"} - [%- ELSE -%] - {"BPH":"[% helpers.get_li_attr_jedi('pagination','', li.attributes) %]"} - [%- END %] - ], - [%- ftx_vals = []; - FOR note IN li.lineitem_notes; - NEXT UNLESS note.vendor_public == 't'; - ftx_vals.push(note.value); - END; - IF VENDOR_BRODART; # look for copy-level spec code - FOR lid IN li.lineitem_details; - IF lid.note; - spec_note = lid.note.match('spec code ([a-zA-Z0-9_])'); - IF spec_note.0; ftx_vals.push(spec_note.0); END; - END; - END; - END; - IF xtra_ftx; ftx_vals.unshift(xtra_ftx); END; - - # BT & ULS want FTX+LIN for every LI, even if empty - IF ((VENDOR_BT OR VENDOR_ULS) AND ftx_vals.size == 0); - ftx_vals.unshift(''); - END; - -%] - - "free-text":[ - [% FOR note IN ftx_vals -%] "[% note %]"[% UNLESS loop.last %], [% END %][% END %] - ], - - "quantity":[% li.lineitem_details.size %], - - [%- IF INC_COPIES -%] - "copies" : [ - [%- compressed_copies = []; - FOR lid IN li.lineitem_details; - fund = lid.fund.code; - item_type = lid.circ_modifier; - callnumber = lid.cn_label; - owning_lib = lid.owning_lib.shortname; - location = lid.location; - collection_code = lid.collection_code; - - # when we have real copy data, treat it as authoritative for some fields - acp = lid.eg_copy_id; - IF acp; - item_type = acp.circ_modifier; - callnumber = acp.call_number.label; - location = acp.location.name; - END ; - - - # collapse like copies into groups w/ quantity - - found_match = 0; - IF !INC_COPY_ID; # INC_COPY_ID implies 1 copy per GIR - FOR copy IN compressed_copies; - IF (fund == copy.fund OR (!fund AND !copy.fund)) AND - (item_type == copy.item_type OR (!item_type AND !copy.item_type)) AND - (callnumber == copy.callnumber OR (!callnumber AND !copy.callnumber)) AND - (owning_lib == copy.owning_lib OR (!owning_lib AND !copy.owning_lib)) AND - (location == copy.location OR (!location AND !copy.location)) AND - (collection_code == copy.collection_code OR (!collection_code AND !copy.collection_code)); - - copy.quantity = copy.quantity + 1; - found_match = 1; - END; - END; - END; - - IF !found_match; - compressed_copies.push({ - fund => fund, - item_type => item_type, - callnumber => callnumber, - owning_lib => owning_lib, - location => location, - collection_code => collection_code, - copy_id => lid.id, # for INC_COPY_ID - quantity => 1 - }); - END; - END; - FOR copy IN compressed_copies; - - # If we assume owning_lib is required and set, - # it is safe to prepend each following copy field w/ a "," - - # B&T EDI requires expected GIR fields to be - # present regardless of whether a value exists. - # some fields are required to have a value in ACQ, - # though, so they are not forced into place below. - - %]{[%- IF INC_OWNING_LIB AND copy.owning_lib %] "owning_lib":"[% copy.owning_lib %]"[% END -%] - [%- IF INC_FUND AND copy.fund %],"fund":"[% copy.fund %]"[% END -%] - [%- IF INC_CALLNUMBER AND (VENDOR_BT OR copy.callnumber) %],"call_number":"[% copy.callnumber %]"[% END -%] - [%- IF INC_ITEM_TYPE AND (VENDOR_BT OR copy.item_type) %],"item_type":"[% copy.item_type %]"[% END -%] - [%- IF INC_LOCATION AND copy.location %],"copy_location":"[% copy.location %]"[% END -%] - [%- IF INC_COLLECTION_CODE AND (VENDOR_BT OR copy.collection_code) %],"collection_code":"[% copy.collection_code %]"[% END -%] - [%- IF INC_QUANTITY %],"quantity":"[% copy.quantity %]"[% END -%] - [%- IF INC_COPY_ID %],"copy_id":"[% copy.copy_id %]" [% END %]}[% ',' UNLESS loop.last -%] - [%- END -%] [%# FOR compressed_copies -%] - ] - [%- END -%] [%# IF INC_COPIES %] - - }[% UNLESS loop.last %],[% END -%] - - [% END %] [%# END lineitems %] - ], - "line_items":[% target.lineitems.size %] - }] [%# close ORDERS array %] - }] [%# close body array %] -} -[% END %] -[% tempo = PROCESS big_block; helpers.escape_json(tempo) %] -$$ -WHERE ID = 23 AND FALSE; -- remove 'AND FALSE' to apply this update - - --- lineitem worksheet -UPDATE action_trigger.event_definition SET template = -$$ -[%- USE date -%] -[%- - # find a lineitem attribute by name and optional type - BLOCK get_li_attr; - FOR attr IN li.attributes; - IF attr.attr_name == attr_name; - IF !attr_type OR attr_type == attr.attr_type; - attr.attr_value; - LAST; - END; - END; - END; - END --%] - -

Purchase Order [% target.id %]

-
-date [% date.format(date.now, '%Y%m%d') %] -
- - - - - - - - - -
Vendor -
[% target.provider.name %]
-
[% target.provider.addresses.0.street1 %]
-
[% target.provider.addresses.0.street2 %]
-
[% target.provider.addresses.0.city %]
-
[% target.provider.addresses.0.state %]
-
[% target.provider.addresses.0.country %]
-
[% target.provider.addresses.0.post_code %]
- 		Ship to / Bill to -
[% target.ordering_agency.name %]
-
[% target.ordering_agency.billing_address.street1 %]
-
[% target.ordering_agency.billing_address.street2 %]
-
[% target.ordering_agency.billing_address.city %]
-
[% target.ordering_agency.billing_address.state %]
-
[% target.ordering_agency.billing_address.country %]
-
[% target.ordering_agency.billing_address.post_code %]
-
- -

-
- Notes to the Vendor -
    - [% FOR note IN target.notes %] - [% IF note.vendor_public == 't' %] -
  • [% note.value %]
    • - [% END %] - [% END %] -
-
-

- - - - - - - - - - - - - - - - [% subtotal = 0 %] - [% FOR li IN target.lineitems %] - - - [% count = li.lineitem_details.size %] - [% price = li.estimated_unit_price %] - [% litotal = (price * count) %] - [% subtotal = subtotal + litotal %] - [% - ident_attr = helpers.get_li_order_ident(li.attributes); - SET ident_value = ident_attr.attr_value IF ident_attr; - %] - - - - - - - - - [% END %] - - - - - -
PO#ISBN or Item #TitleQuantityUnit PriceLine TotalNotes
[% target.id %][% ident_value %][% PROCESS get_li_attr attr_name = 'title' %][% count %][% price %][% litotal %] -
    - [% FOR note IN li.lineitem_notes %] - [% IF note.vendor_public == 't' %] -
  • [% note.value %]
    • - [% END %] - [% END %] -
-
- Subtotal[% subtotal %]
- -
- -Total Line Item Count: [% target.lineitems.size %] -$$ -WHERE ID = 4; -- PO HTML - -COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql deleted file mode 100644 index a0b09ee80d..0000000000 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.acq-order-ident.sql +++ /dev/null @@ -1,29 +0,0 @@ - -BEGIN; - -ALTER TABLE acq.lineitem_attr - ADD COLUMN order_ident BOOLEAN NOT NULL DEFAULT FALSE; - -INSERT INTO permission.perm_list ( id, code, description ) VALUES ( - 547, -- VERIFY - 'ACQ_ADD_LINEITEM_IDENTIFIER', - oils_i18n_gettext( - 547,-- VERIFY - 'When granted, newly added lineitem identifiers will propagate to linked bib records', - 'ppl', - 'description' - ) -); - -INSERT INTO permission.perm_list ( id, code, description ) VALUES ( - 548, -- VERIFY - 'ACQ_SET_LINEITEM_IDENTIFIER', - oils_i18n_gettext( - 548,-- VERIFY - 'Allows staff to change the lineitem identifier', - 'ppl', - 'description' - ) -); - -COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.acq-multi-attrs.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.acq-multi-attrs.sql deleted file mode 100644 index cbe837ffbd..0000000000 --- a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.acq-multi-attrs.sql +++ /dev/null @@ -1,104 +0,0 @@ - -BEGIN; - -CREATE OR REPLACE FUNCTION extract_marc_field_set - (TEXT, BIGINT, TEXT, TEXT) RETURNS SETOF TEXT AS $$ -DECLARE - query TEXT; - output TEXT; -BEGIN - FOR output IN - SELECT x.t FROM ( - SELECT id,t - FROM oils_xpath_table( - 'id', 'marc', $1, $3, 'id = ' || $2) - AS t(id int, t text))x - LOOP - IF $4 IS NOT NULL THEN - SELECT INTO output (SELECT regexp_replace(output, $4, '', 'g')); - END IF; - RETURN NEXT output; - END LOOP; - RETURN; -END; -$$ LANGUAGE PLPGSQL IMMUTABLE; - - -CREATE OR REPLACE FUNCTION - public.extract_acq_marc_field_set ( BIGINT, TEXT, TEXT) - RETURNS SETOF TEXT AS $$ - SELECT extract_marc_field_set('acq.lineitem', $1, $2, $3); -$$ LANGUAGE SQL; - - -CREATE OR REPLACE FUNCTION public.ingest_acq_marc ( ) RETURNS TRIGGER AS $function$ -DECLARE - value TEXT; - atype TEXT; - prov INT; - pos INT; - adef RECORD; - xpath_string TEXT; -BEGIN - FOR adef IN SELECT *,tableoid FROM acq.lineitem_attr_definition LOOP - - SELECT relname::TEXT INTO atype FROM pg_class WHERE oid = adef.tableoid; - - IF (atype NOT IN ('lineitem_usr_attr_definition','lineitem_local_attr_definition')) THEN - IF (atype = 'lineitem_provider_attr_definition') THEN - SELECT provider INTO prov FROM acq.lineitem_provider_attr_definition WHERE id = adef.id; - CONTINUE WHEN NEW.provider IS NULL OR prov <> NEW.provider; - END IF; - - IF (atype = 'lineitem_provider_attr_definition') THEN - SELECT xpath INTO xpath_string FROM acq.lineitem_provider_attr_definition WHERE id = adef.id; - ELSIF (atype = 'lineitem_marc_attr_definition') THEN - SELECT xpath INTO xpath_string FROM acq.lineitem_marc_attr_definition WHERE id = adef.id; - ELSIF (atype = 'lineitem_generated_attr_definition') THEN - SELECT xpath INTO xpath_string FROM acq.lineitem_generated_attr_definition WHERE id = adef.id; - END IF; - - xpath_string := REGEXP_REPLACE(xpath_string,$re$//?text\(\)$$re$,''); - - IF (adef.code = 'title' OR adef.code = 'author') THEN - -- title and author should not be split - -- FIXME: once oils_xpath can grok XPATH 2.0 functions, we can use - -- string-join in the xpath and remove this special case - SELECT extract_acq_marc_field(id, xpath_string, adef.remove) INTO value FROM acq.lineitem WHERE id = NEW.id; - IF (value IS NOT NULL AND value <> '') THEN - INSERT INTO acq.lineitem_attr (lineitem, definition, attr_type, attr_name, attr_value) - VALUES (NEW.id, adef.id, atype, adef.code, value); - END IF; - ELSE - pos := 1; - LOOP - -- each application of the regex may produce multiple values - FOR value IN - SELECT * FROM extract_acq_marc_field_set( - NEW.id, xpath_string || '[' || pos || ']', adef.remove) - LOOP - - IF (value IS NOT NULL AND value <> '') THEN - INSERT INTO acq.lineitem_attr - (lineitem, definition, attr_type, attr_name, attr_value) - VALUES (NEW.id, adef.id, atype, adef.code, value); - ELSE - EXIT; - END IF; - END LOOP; - IF NOT FOUND THEN - EXIT; - END IF; - pos := pos + 1; - END LOOP; - END IF; - - END IF; - - END LOOP; - - RETURN NULL; -END; -$function$ LANGUAGE PLPGSQL; - -COMMIT;