counting "reshelving" as "available"

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6384 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm
index c38dd33..2f7b5ca 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm
@@ -56,7 +56,7 @@ sub record_copy_count {
                                        $visible
                                        AND cn.deleted IS FALSE
                                        AND cp.deleted IS FALSE
-                                       AND cp.status = 0)
+                                       AND cp.status IN (0,7))
                        ) AS available,
                        sum(
                                (SELECT count(cp.id)
@@ -325,7 +325,7 @@ sub global_record_copy_count {
                                        JOIN $cs_table cs ON (cs.id = cp.status)
                                        JOIN $cl_table cl ON (cl.id = cp.location)
                                  WHERE cn.record = ?
-                                       AND cp.status = 0
+                                       AND cp.status IN (0,7)
                                        $copies_visible
                                  GROUP BY 1
                                                UNION

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
index f362c1f..33c7f3c 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
@@ -313,7 +313,7 @@ sub metarecord_copy_count {
                                        JOIN $cl_table cl ON (cp.location = cl.id)
                                        JOIN $descendants a ON (cp.circ_lib = a.id)
                                  WHERE r.metarecord = ?
-                                       AND cp.status = 0
+                                       AND cp.status IN (0,7)
                                        AND cn.deleted IS FALSE
                                        AND cp.deleted IS FALSE
                                        $copies_visible