[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3a74b4c86d8aebb2e2f3456aaebf1b5bfa2eb7a1

[Evergreen Git]

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  3a74b4c86d8aebb2e2f3456aaebf1b5bfa2eb7a1 (commit)
       via  36b0a67a4520151082e72056893d92ad3bf797f1 (commit)
      from  a97368bfd79efb8e99f4e8383e1ee49dd0e97f37 (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 3a74b4c86d8aebb2e2f3456aaebf1b5bfa2eb7a1
Merge: 36b0a67 a97368b
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Jun 13 10:38:38 2011 -0400

    Merge branch 'master' of git.evergreen-ils.org:Evergreen


commit 36b0a67a4520151082e72056893d92ad3bf797f1
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Jun 13 10:38:29 2011 -0400

    Bring in-db unAPI opac visibility info up to date with (and a little beyond) ea3b8857d08b8a9050e763f8084c841e8df9a473
    
    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 0d07d5b..c76fcf1 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 ('0556', :eg_version); -- dbs
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0558', :eg_version); -- miker
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0557.schema.in-db_unapi_copy_related_visibility-1.sql b/Open-ILS/src/sql/Pg/upgrade/0557.schema.in-db_unapi_copy_related_visibility-1.sql
new file mode 100644
index 0000000..9295d6e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0557.schema.in-db_unapi_copy_related_visibility-1.sql
@@ -0,0 +1,28 @@
+-- Evergreen DB patch 0557.schmea.in-db_unapi_copy_related_visibility-1.sql
+--
+-- Bring in-db unAPI opac visibility info up to date with (and a little beyond) ea3b8857d08b8a9050e763f8084c841e8df9a473
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0557', :eg_version);
+
+CREATE OR REPLACE FUNCTION unapi.acl ( 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 location,
+                XMLATTRIBUTES(
+                    CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    id AS ident
+                    holdable,
+                    opac_visible,
+                    label_prefix AS prefix,
+                    label_suffix AS suffix
+                ),
+                name
+            )
+      FROM  asset.copy_location
+      WHERE id = $1;
+$F$ LANGUAGE SQL;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/0558.schema.in-db_unapi_copy_related_visibility-2.sql b/Open-ILS/src/sql/Pg/upgrade/0558.schema.in-db_unapi_copy_related_visibility-2.sql
new file mode 100644
index 0000000..d7ddf91
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0558.schema.in-db_unapi_copy_related_visibility-2.sql
@@ -0,0 +1,26 @@
+-- Evergreen DB patch 0558.schema.in-db_unapi_copy_related_visibility-2.sql
+--
+-- Bring in-db unAPI opac visibility info up to date with (and a little beyond) ea3b8857d08b8a9050e763f8084c841e8df9a473
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0557', :eg_version);
+
+CREATE OR REPLACE FUNCTION unapi.ccs ( 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 status,
+                XMLATTRIBUTES(
+                    CASE WHEN $9 THEN 'http://open-ils.org/spec/holdings/v1' ELSE NULL END AS xmlns,
+                    id AS ident
+                    holdable,
+                    opac_visible
+                ),
+                name
+            )
+      FROM  config.copy_status
+      WHERE id = $1;
+$F$ LANGUAGE SQL;
+
+COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 ...chema.in-db_unapi_copy_related_visibility-1.sql |   28 ++++++++++++++++++++
 ...chema.in-db_unapi_copy_related_visibility-2.sql |   26 ++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0557.schema.in-db_unapi_copy_related_visibility-1.sql
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0558.schema.in-db_unapi_copy_related_visibility-2.sql


hooks/post-receive
-- 
Evergreen ILS