[open-ils-commits] [GIT] Evergreen ILS branch master updated. f32605e5ad6cf8ece852af911e41260af5a3b59a
Evergreen Git
git at git.evergreen-ils.org
Fri Sep 16 11:35:34 EDT 2011
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, master has been updated
via f32605e5ad6cf8ece852af911e41260af5a3b59a (commit)
via 6e3f83e2209d9008abb6c83f72491f0df7da1506 (commit)
via 48ff6a7a2cbea1247845329347623781c2844242 (commit)
from c603e94ac69a90176d9eabce525fa84a31c7e5ae (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 f32605e5ad6cf8ece852af911e41260af5a3b59a
Author: Mike Rylander <mrylander at gmail.com>
Date: Fri Sep 16 11:29:19 2011 -0400
Stamping db upgrade script for Fixed Field Cont/Conf typo/thinko
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 02f699e..fe25d5a 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0623', :eg_version); -- Joseph Lewis / phasefx / tsbere
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0624', :eg_version); -- miker / tsbere
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.fix_marc_conf_cont.sql b/Open-ILS/src/sql/Pg/upgrade/0624.data.fix_marc_conf_cont.sql
similarity index 80%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.fix_marc_conf_cont.sql
rename to Open-ILS/src/sql/Pg/upgrade/0624.data.fix_marc_conf_cont.sql
index 6a4f2f1..d2e1afa 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.fix_marc_conf_cont.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0624.data.fix_marc_conf_cont.sql
@@ -1,3 +1,12 @@
+-- Evergreen DB patch 0624.data.fix_marc_conf_cont.sql
+--
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0624', :eg_version);
+
-- Cont was typod as Conf. Update the old entries.
UPDATE config.marc21_ff_pos_map SET fixed_field = 'Cont' WHERE fixed_field = 'Conf' AND length > 1;
-- Conf thus didn't exist. Add it.
@@ -5,3 +14,6 @@ INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, leng
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'SER', 11, 1, ' ');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'BKS', 29, 1, ' ');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'SER', 29, 1, ' ');
+
+
+COMMIT;
commit 6e3f83e2209d9008abb6c83f72491f0df7da1506
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Fri Sep 16 10:45:38 2011 -0400
In-DB suffered from Cont/Conf issues as well
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.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 5527735..0dd096c 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -5296,10 +5296,14 @@ INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, leng
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('BLvl', 'ldr', 'VIS', 7, 1, 'm');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Biog', '006', 'BKS', 17, 1, ' ');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Biog', '008', 'BKS', 34, 1, ' ');
-INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'BKS', 7, 4, ' ');
-INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'SER', 8, 3, ' ');
-INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'BKS', 24, 4, ' ');
-INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'SER', 25, 3, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'BKS', 11, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'SER', 11, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'BKS', 29, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'SER', 29, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Cont', '006', 'BKS', 7, 4, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Cont', '006', 'SER', 8, 3, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Cont', '008', 'BKS', 24, 4, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Cont', '008', 'SER', 25, 3, ' ');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Ctrl', 'ldr', 'BKS', 8, 1, ' ');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Ctrl', 'ldr', 'COM', 8, 1, ' ');
INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Ctrl', 'ldr', 'MAP', 8, 1, ' ');
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.fix_marc_conf_cont.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.fix_marc_conf_cont.sql
new file mode 100644
index 0000000..6a4f2f1
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.fix_marc_conf_cont.sql
@@ -0,0 +1,7 @@
+-- Cont was typod as Conf. Update the old entries.
+UPDATE config.marc21_ff_pos_map SET fixed_field = 'Cont' WHERE fixed_field = 'Conf' AND length > 1;
+-- Conf thus didn't exist. Add it.
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'BKS', 11, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '006', 'SER', 11, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'BKS', 29, 1, ' ');
+INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Conf', '008', 'SER', 29, 1, ' ');
commit 48ff6a7a2cbea1247845329347623781c2844242
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Fri Sep 16 10:24:01 2011 -0400
Fix Fixed Fields Editor Conf and Cont
Conf was defined with Cont's fields
Cont was missing
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/web/js/dojo/MARC/FixedFields.js b/Open-ILS/web/js/dojo/MARC/FixedFields.js
index 7e25080..4653ca8 100644
--- a/Open-ILS/web/js/dojo/MARC/FixedFields.js
+++ b/Open-ILS/web/js/dojo/MARC/FixedFields.js
@@ -253,6 +253,16 @@ if(!dojo._hasResource["MARC.FixedFields"]) {
},
Conf : {
_8 : {
+ BKS : {start : 29, len : 1, def : '0' },
+ SER : {start : 29, len : 1, def : '0' }
+ },
+ _6 : {
+ BKS : {start : 11, len : 1, def : '0' },
+ SER : {start : 11, len : 1, def : '0' }
+ }
+ },
+ Cont : {
+ _8 : {
BKS : {start : 24, len : 4, def : ' ' },
SER : {start : 25, len : 3, def : ' ' }
},
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 12 ++++++++----
.../Pg/upgrade/0624.data.fix_marc_conf_cont.sql | 19 +++++++++++++++++++
Open-ILS/web/js/dojo/MARC/FixedFields.js | 10 ++++++++++
4 files changed, 38 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0624.data.fix_marc_conf_cont.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list