[open-ils-commits] [GIT] Evergreen ILS branch rel_2_6 updated. 6d4a4b1f3dbc977b7bfe30aa18fa0d7c7af0a607
Evergreen Git
git at git.evergreen-ils.org
Mon Mar 2 09:02:42 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_6 has been updated
via 6d4a4b1f3dbc977b7bfe30aa18fa0d7c7af0a607 (commit)
via 8d363f3abcb0ed70095b019e1798fc52f40e574d (commit)
via 408a6c05951465cb976943597b35196fe81fae93 (commit)
via b5ad7edb1efe254495e39cf028202b9cc279ad79 (commit)
from 411ccdf421424415a6f82bcbe064ae0a884bac3c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6d4a4b1f3dbc977b7bfe30aa18fa0d7c7af0a607
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Mar 2 14:05:52 2015 +0000
LP#1155313: pin upgrade script to 0914
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 97288b3..5e1a892 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 ('0913', :eg_version); -- remington/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0914', :eg_version); -- dpearl/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql b/Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql
similarity index 90%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql
rename to Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql
index 7b79fc4..2002771 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql
@@ -1,5 +1,7 @@
BEGIN;
+SELECT evergreen.upgrade_deps_block_check('0914', :eg_version);
+
CREATE OR REPLACE FUNCTION evergreen.lpad_number_substrings( TEXT, TEXT, INT ) RETURNS TEXT AS $$
my $string = shift; # Source string
my $pad = shift; # string to fill. Typically '0'. This should be a single character.
commit 8d363f3abcb0ed70095b019e1798fc52f40e574d
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Mar 2 14:02:23 2015 +0000
LP#1155313: fix copy-and-paste-o in test case
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg b/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg
index e7f2729..3aafe13 100644
--- a/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg
+++ b/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg
@@ -33,7 +33,7 @@ SELECT is(evergreen.lpad_number_substrings(
'DISC 12.12.13','0',5), 'DISC 00012.00012.00013','Prefix, 3 numbers');
SELECT is(evergreen.lpad_number_substrings(
- 'Vol 5a-15','0',5), 'DISC 00005a-00015','Mixed format');
+ 'Vol 5a-15','0',5), 'Vol 00005a-00015','Mixed format');
-- Finish the tests and clean up.
commit 408a6c05951465cb976943597b35196fe81fae93
Author: Dan Pearl <dpearl at cwmars.org>
Date: Mon Jan 5 13:28:13 2015 -0500
LP#1155313: upgrade script and pgTAP tests for monograph_part label normalization fix
Signed-off-by: Daniel Pearl <dpearl at cwmars.org>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg b/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg
new file mode 100644
index 0000000..e7f2729
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg
@@ -0,0 +1,41 @@
+
+-- Turn off echo and keep things quiet.
+\set ECHO
+\set QUIET 1
+
+-- Format the output for nice TAP.
+\pset format unaligned
+\pset tuples_only true
+\pset pager
+
+-- Revert all changes on failure.
+\set ON_ERROR_ROLLBACK 1
+\set ON_ERROR_STOP true
+\set QUIET 1
+
+-- Load the TAP functions.
+BEGIN;
+
+-- Plan the tests.
+SELECT plan(5);
+
+-- Run the tests.
+SELECT is(evergreen.lpad_number_substrings(
+ 'Appendix','0',5), 'Appendix','Non-numeric string');
+
+SELECT is(evergreen.lpad_number_substrings(
+ 'DISC 11','0',5), 'DISC 00011','Prefix, 1 number');
+
+SELECT is(evergreen.lpad_number_substrings(
+ 'DISC 14.1','0',5), 'DISC 00014.00001','Prefix, 2 numbers');
+
+SELECT is(evergreen.lpad_number_substrings(
+ 'DISC 12.12.13','0',5), 'DISC 00012.00012.00013','Prefix, 3 numbers');
+
+SELECT is(evergreen.lpad_number_substrings(
+ 'Vol 5a-15','0',5), 'DISC 00005a-00015','Mixed format');
+
+
+-- Finish the tests and clean up.
+SELECT * FROM finish();
+ROLLBACK;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql
new file mode 100644
index 0000000..7b79fc4
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql
@@ -0,0 +1,19 @@
+BEGIN;
+
+CREATE OR REPLACE FUNCTION evergreen.lpad_number_substrings( TEXT, TEXT, INT ) RETURNS TEXT AS $$
+ my $string = shift; # Source string
+ my $pad = shift; # string to fill. Typically '0'. This should be a single character.
+ my $len = shift; # length of resultant padded field
+ my $find = $len - 1;
+
+ while ($string =~ /(^|\D)(\d{1,$find})($|\D)/) {
+ my $padded = $2;
+ $padded = $pad x ($len - length($padded)) . $padded;
+ $string = $` . $1 . $padded . $3 . $';
+ }
+
+ return $string;
+$$ LANGUAGE PLPERLU;
+
+COMMIT;
+
commit b5ad7edb1efe254495e39cf028202b9cc279ad79
Author: Dan Pearl <dpearl at cwmars.org>
Date: Fri Mar 15 15:04:37 2013 -0400
LP#1155313: Repair generation of label_sortkey for monograph_part entries
The evergreen.lpad_number_substrings function attempts to codify numeric
fields within labels. It does this by finding the strings, padding them
to a given size, and replacing them in the source string. For instance:
3 => 0000000003
15.4 => 00000000150000000004
The algorithm was fooled by repeated characters, like in 15.1:
15.1 => 00000000000000000150000000001 INCORRECT
This change will result in the correct value.
Signed-off-by: Dan Pearl <dpearl at cwmars.org>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.functions.config.sql b/Open-ILS/src/sql/Pg/002.functions.config.sql
index 3dab7d9..077e9e8 100644
--- a/Open-ILS/src/sql/Pg/002.functions.config.sql
+++ b/Open-ILS/src/sql/Pg/002.functions.config.sql
@@ -538,15 +538,15 @@ CREATE OR REPLACE FUNCTION oils_text_as_bytea (TEXT) RETURNS BYTEA AS $_$
$_$ LANGUAGE SQL IMMUTABLE;
CREATE OR REPLACE FUNCTION evergreen.lpad_number_substrings( TEXT, TEXT, INT ) RETURNS TEXT AS $$
- my $string = shift;
- my $pad = shift;
- my $len = shift;
+ my $string = shift; # Source string
+ my $pad = shift; # string to fill. Typically '0'. This should be a single character.
+ my $len = shift; # length of resultant padded field
my $find = $len - 1;
- while ($string =~ /(?:^|\D)(\d{1,$find})(?:$|\D)/) {
- my $padded = $1;
+ while ($string =~ /(^|\D)(\d{1,$find})($|\D)/) {
+ my $padded = $2;
$padded = $pad x ($len - length($padded)) . $padded;
- $string =~ s/$1/$padded/sg;
+ $string = $` . $1 . $padded . $3 . $';
}
return $string;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.functions.config.sql | 12 +++---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg | 41 ++++++++++++++++++++
...schema.redo_vandelay_merge_profile_sequence.sql | 21 ++++++++++
4 files changed, 69 insertions(+), 7 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/t/lpad_number_substrings.pg
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list