[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. b9e582ca294de9e933c15a4398c306f57fbe17a2
Evergreen Git
git at git.evergreen-ils.org
Fri Jul 1 12:00:05 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, rel_2_1 has been updated
via b9e582ca294de9e933c15a4398c306f57fbe17a2 (commit)
via 16e6d2959b6a39d3ffac1ae0b427061bff126b9b (commit)
via 8dfd28028ae734e641cf201a7e1ed775fba25203 (commit)
from c0f5d509c82fae387c47b11de4c581a8ad65e6e7 (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 b9e582ca294de9e933c15a4398c306f57fbe17a2
Merge: 16e6d29 c0f5d50
Author: Mike Rylander <mrylander at gmail.com>
Date: Fri Jul 1 11:58:07 2011 -0400
Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into rel_2_1
commit 16e6d2959b6a39d3ffac1ae0b427061bff126b9b
Author: Jason Etheridge <jason at esilibrary.com>
Date: Tue Jun 14 14:50:33 2011 -0400
when using params.data keys as print macros, render bare numbers correctly, and treat nulls as empty strings
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js
index 4f9cbdd..ce0442d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -294,9 +294,13 @@ util.print.prototype = {
if (typeof params.data != 'undefined') {
for (var i in params.data) {
var re = new RegExp('%'+i+'%',"g");
- if (typeof params.data[i] == 'string') {
+ if (typeof params.data[i] == 'string' || typeof params.data[i] == 'number') {
try{b = s; s=s.replace(re, params.data[i]);}
catch(E){s = b; this.error.standard_unexpected_error_alert('print.js, template_sub(): 3 string = <' + s + '>',E);}
+ } else {
+ /* likely a null, print as an empty string */
+ try{b = s; s=s.replace(re, '');}
+ catch(E){s = b; this.error.standard_unexpected_error_alert('print.js, template_sub(): 3 string = <' + s + '>',E);}
}
}
}
commit 8dfd28028ae734e641cf201a7e1ed775fba25203
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Jun 28 15:18:55 2011 -0400
Correct copy-paste-o spotted by Dan Scott
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 da7fdf8..e4cd101 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log (
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0568'); -- miker for tsbere
+INSERT INTO config.upgrade_log (version) VALUES ('0569'); -- miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/990.schema.unapi.sql b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
index 3e85f5a..ad9fffe 100644
--- a/Open-ILS/src/sql/Pg/990.schema.unapi.sql
+++ b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
@@ -862,7 +862,7 @@ $F$ LANGUAGE SQL;
CREATE OR REPLACE FUNCTION unapi.auri ( obj_id BIGINT, format TEXT, ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
SELECT XMLELEMENT(
- name volume,
+ name uri,
XMLATTRIBUTES(
CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
'tag:open-ils.org:U2 at auri/' || uri.id AS id,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0569.schema.unapi-auri-fix.sql b/Open-ILS/src/sql/Pg/upgrade/0569.schema.unapi-auri-fix.sql
new file mode 100644
index 0000000..0ffbc40
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0569.schema.unapi-auri-fix.sql
@@ -0,0 +1,28 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0569'); --miker
+
+CREATE OR REPLACE FUNCTION unapi.auri ( obj_id BIGINT, format TEXT, ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit INT DEFAULT NULL, soffset INT DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+ SELECT XMLELEMENT(
+ name uri,
+ XMLATTRIBUTES(
+ CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+ 'tag:open-ils.org:U2 at auri/' || uri.id AS id,
+ use_restriction,
+ href,
+ label
+ ),
+ XMLELEMENT( name copies,
+ CASE
+ WHEN ('acn' = ANY ($4)) THEN
+ (SELECT XMLAGG(acn) FROM (SELECT unapi.acn( call_number, 'xml', 'copy', evergreen.array_remove_item_by_value($4,'auri'), $5, $6, $7, $8, FALSE) FROM asset.uri_call_number_map WHERE uri = uri.id)x)
+ ELSE NULL
+ END
+ )
+ ) AS x
+ FROM asset.uri uri
+ WHERE uri.id = $1
+ GROUP BY uri.id, use_restriction, href, label;
+$F$ LANGUAGE SQL;
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/990.schema.unapi.sql | 2 +-
.../sql/Pg/upgrade/0569.schema.unapi-auri-fix.sql | 28 ++++++++++++++++++++
3 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0569.schema.unapi-auri-fix.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list