[open-ils-commits] r17169 - in trunk/Open-ILS/src/sql/Pg: . upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-08-11 09:29:31 -0400 (Wed, 11 Aug 2010)
New Revision: 17169

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0369.schema.copy-vis-count-fix.sql
Modified:
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql
Log:
missed one fix in previous optimisation effort

Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-08-11 06:44:42 UTC (rev 17168)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-08-11 13:29:31 UTC (rev 17169)
@@ -68,7 +68,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0368'); -- gmc
+INSERT INTO config.upgrade_log (version) VALUES ('0369'); -- miker
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql	2010-08-11 06:44:42 UTC (rev 17168)
+++ trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql	2010-08-11 13:29:31 UTC (rev 17169)
@@ -399,7 +399,7 @@
                 COUNT( av.id ),
                 SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
                 COUNT( av.id ),
-                CASE WHEN src.transcendant THEN 1 ELSE NULL::INT END
+                trans
           FROM  
                 actor.org_unit_descendants(ans.id) d
                 JOIN asset.opac_visible_copies av ON (av.record = record AND av.circ_lib = d.id)

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0369.schema.copy-vis-count-fix.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0369.schema.copy-vis-count-fix.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0369.schema.copy-vis-count-fix.sql	2010-08-11 13:29:31 UTC (rev 17169)
@@ -0,0 +1,37 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0369'); -- miker
+
+CREATE OR REPLACE FUNCTION asset.opac_ou_record_copy_count (org INT, record BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$
+DECLARE
+    ans RECORD;
+    trans INT;
+BEGIN
+    SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = record;
+
+    FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+        RETURN QUERY
+        SELECT  ans.depth,
+                ans.id,
+                COUNT( av.id ),
+                SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ),
+                COUNT( av.id ),
+                trans
+          FROM
+                actor.org_unit_descendants(ans.id) d
+                JOIN asset.opac_visible_copies av ON (av.record = record AND av.circ_lib = d.id)
+                JOIN asset.copy cp ON (cp.id = av.id)
+          GROUP BY 1,2,6;
+
+        IF NOT FOUND THEN
+            RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+        END IF;
+
+    END LOOP;
+
+    RETURN;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+COMMIT;
+