[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 5e373d30ab716a94de7521409e12c1fdabcee5a9
Evergreen Git
git at git.evergreen-ils.org
Wed Dec 18 13:37:12 EST 2013
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 5e373d30ab716a94de7521409e12c1fdabcee5a9 (commit)
via f337381d70245adfef0037f1033fc8bde0eab6c1 (commit)
from 3f2a30ddc19817ac4174e9188e173b11548db518 (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 5e373d30ab716a94de7521409e12c1fdabcee5a9
Author: Ben Shum <bshum at biblio.org>
Date: Wed Dec 18 13:36:39 2013 -0500
Stamping 0850 - translate icon labels
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 32fef43..feb63e9 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 ('0849', :eg_version); -- callender/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0850', :eg_version); -- tsbere/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql b/Open-ILS/src/sql/Pg/upgrade/0850.cvm_translated.sql
similarity index 95%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql
rename to Open-ILS/src/sql/Pg/upgrade/0850.cvm_translated.sql
index 9f8c6b5..3ec96f4 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0850.cvm_translated.sql
@@ -1,3 +1,7 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0850', :eg_version);
+
CREATE OR REPLACE FUNCTION unapi.mra ( obj_id BIGINT, format TEXT, ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit HSTORE DEFAULT NULL, soffset HSTORE DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
SELECT XMLELEMENT(
name attributes,
@@ -27,3 +31,5 @@ CREATE OR REPLACE FUNCTION unapi.mra ( obj_id BIGINT, format TEXT, ename TEXT,
FROM metabib.record_attr mra
WHERE mra.id = $1;
$F$ LANGUAGE SQL STABLE;
+
+COMMIT;
commit f337381d70245adfef0037f1033fc8bde0eab6c1
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Tue Dec 10 13:54:40 2013 -0500
Translate the icon labels in TPAC
Instead of just using English.
Also, in the event we have a search_label, use it.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/sql/Pg/990.schema.unapi.sql b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
index 78a9a2c..c7bc8bb 100644
--- a/Open-ILS/src/sql/Pg/990.schema.unapi.sql
+++ b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
@@ -1127,6 +1127,7 @@ CREATE OR REPLACE FUNCTION unapi.mra ( obj_id BIGINT, format TEXT, ename TEXT,
XMLATTRIBUTES(
key AS name,
cvm.value AS "coded-value",
+ cvm.id AS "cvmid",
rad.filter,
rad.sorter
),
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql
new file mode 100644
index 0000000..9f8c6b5
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.cvm_translated.sql
@@ -0,0 +1,29 @@
+CREATE OR REPLACE FUNCTION unapi.mra ( obj_id BIGINT, format TEXT, ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit HSTORE DEFAULT NULL, soffset HSTORE DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
+ SELECT XMLELEMENT(
+ name attributes,
+ XMLATTRIBUTES(
+ CASE WHEN $9 THEN 'http://open-ils.org/spec/indexing/v1' ELSE NULL END AS xmlns,
+ 'tag:open-ils.org:U2 at mra/' || mra.id AS id,
+ 'tag:open-ils.org:U2 at bre/' || mra.id AS record
+ ),
+ (SELECT XMLAGG(foo.y)
+ FROM (SELECT XMLELEMENT(
+ name field,
+ XMLATTRIBUTES(
+ key AS name,
+ cvm.value AS "coded-value",
+ cvm.id AS "cvmid",
+ rad.filter,
+ rad.sorter
+ ),
+ x.value
+ )
+ FROM EACH(mra.attrs) AS x
+ JOIN config.record_attr_definition rad ON (x.key = rad.name)
+ LEFT JOIN config.coded_value_map cvm ON (cvm.ctype = x.key AND code = x.value)
+ )foo(y)
+ )
+ )
+ FROM metabib.record_attr mra
+ WHERE mra.id = $1;
+$F$ LANGUAGE SQL STABLE;
diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index cdd8eff..41ac634 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -79,6 +79,21 @@
END;
END;
+ # Get CCVM labels
+ BLOCK get_ccvm_label;
+ IF !ctx.ccvm_cache.$id;
+ fetch_ccvm = ctx.search_ccvm('id', id);
+ IF fetch_ccvm;
+ ctx.ccvm_cache.$id = fetch_ccvm.0;
+ END;
+ END;
+ IF search_label and ctx.ccvm_cache.$id.search_label;
+ ctx.ccvm_cache.$id.search_label;
+ ELSE;
+ ctx.ccvm_cache.$id.value;
+ END;
+ END;
+
# Extract MARC fields from XML
# get_marc_attrs( { marc_xml => doc } )
BLOCK get_marc_attrs;
@@ -429,7 +444,10 @@
'//*[local-name()="attributes"]/*[local-name()="field"][@name="' _ icon_style _ '"]');
IF node AND node.textContent;
type = node.textContent;
- args.format_label = node.getAttribute('coded-value')
+ args.format_label = PROCESS get_ccvm_label id=node.getAttribute('cvmid') search_label=1;
+ IF !args.format_label;
+ args.format_label = node.getAttribute('coded-value');
+ END;
args.schema.itemtype = schema_typemap.$type || 'CreativeWork';
args.format_icon = ctx.media_prefix _ '/images/format_icons/' _ icon_style _ '/' _ type _ '.png';
LAST;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/990.schema.unapi.sql | 1 +
.../src/sql/Pg/upgrade/0850.cvm_translated.sql | 35 ++++++++++++++++++++
Open-ILS/src/templates/opac/parts/misc_util.tt2 | 20 +++++++++++-
4 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0850.cvm_translated.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list