[open-ils-commits] r9865 - in
trunk/Open-ILS/src/perlmods/OpenILS/Application: Search
Storage/Publisher
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Jun 19 00:21:47 EDT 2008
Author: miker
Date: 2008-06-19 00:21:45 -0400 (Thu, 19 Jun 2008)
New Revision: 9865
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm
trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
Log:
more switching to opac_visible on status
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm 2008-06-19 03:07:33 UTC (rev 9864)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm 2008-06-19 04:21:45 UTC (rev 9865)
@@ -1699,7 +1699,7 @@
);
# ... and test for location and status visibility
- return [ map { ($U->is_true($_->location->opac_visible) && $U->is_true($_->status->holdable)) ? ($_->id) : () } @$copies ];
+ return [ map { ($U->is_true($_->location->opac_visible) && $U->is_true($_->status->opac_visible)) ? ($_->id) : () } @$copies ];
}
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm 2008-06-19 03:07:33 UTC (rev 9864)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/biblio.pm 2008-06-19 04:21:45 UTC (rev 9865)
@@ -30,7 +30,7 @@
$ancestors = "(select org_unit as id from actor.org_lasso_map where lasso = ?) u CROSS JOIN (SELECT -1 AS depth) t";
}
- my $visible = 'AND a.opac_visible = TRUE AND st.holdable = TRUE AND loc.opac_visible = TRUE AND cp.opac_visible = TRUE';
+ my $visible = 'AND a.opac_visible = TRUE AND st.opac_visible = TRUE AND loc.opac_visible = TRUE AND cp.opac_visible = TRUE';
if ($self->api_name =~ /staff/o) {
$visible = ''
}
@@ -70,7 +70,7 @@
JOIN $st_table st ON (cp.status = st.id)
JOIN $loc_table loc ON (cp.location = loc.id)
WHERE cn.record = ?
- AND st.holdable = TRUE
+ AND st.opac_visible = TRUE
AND loc.opac_visible = TRUE
AND cp.opac_visible = TRUE
AND cn.deleted IS FALSE
@@ -318,7 +318,7 @@
my $cl_table = asset::copy_location->table;
my $cs_table = config::copy_status->table;
- my $copies_visible = 'AND cp.opac_visible IS TRUE AND cs.holdable IS TRUE AND cl.opac_visible IS TRUE';
+ my $copies_visible = 'AND cp.opac_visible IS TRUE AND cs.opac_visible IS TRUE AND cl.opac_visible IS TRUE';
$copies_visible = '' if ($self->api_name =~ /staff/o);
my $sql = <<" SQL";
@@ -400,7 +400,7 @@
AND cl.opac_visible IS TRUE
AND cp.opac_visible IS TRUE
AND cp.deleted IS FALSE
- AND cs.holdable
+ AND cs.opac_visible IS TRUE
GROUP BY 1,2,3;
SQL
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm 2008-06-19 03:07:33 UTC (rev 9864)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm 2008-06-19 04:21:45 UTC (rev 9865)
@@ -38,7 +38,7 @@
"actor.org_unit_descendants($org)" ;
- my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.holdable IS TRUE AND cl.opac_visible IS TRUE';
+ my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.opac_visible IS TRUE AND cl.opac_visible IS TRUE';
$copies_visible = '' if ($self->api_name =~ /staff/o);
my $sm_table = metabib::metarecord_source_map->table;
@@ -279,7 +279,7 @@
$ancestors = "(select org_unit as id from actor.org_lasso_map where lasso = ?) u CROSS JOIN (SELECT -1 AS depth) t";
}
- my $copies_visible = 'AND a.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.holdable IS TRUE AND cl.opac_visible IS TRUE';
+ my $copies_visible = 'AND a.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.opac_visible IS TRUE AND cl.opac_visible IS TRUE';
$copies_visible = '' if ($self->api_name =~ /staff/o);
my (@types, at forms, at blvl);
@@ -356,7 +356,7 @@
AND cn.deleted IS FALSE
AND cp.deleted IS FALSE
AND cp.opac_visible IS TRUE
- AND cs.holdable IS TRUE
+ AND cs.opac_visible IS TRUE
AND cl.opac_visible IS TRUE
$t_filter
$f_filter
@@ -476,7 +476,7 @@
my $has_vols = 'AND cn.owning_lib = d.id';
my $has_copies = 'AND cp.call_number = cn.id';
- my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.holdable IS TRUE AND cl.opac_visible IS TRUE';
+ my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.opac_visible IS TRUE AND cl.opac_visible IS TRUE';
if ($self->api_name =~ /staff/o) {
$copies_visible = '';
@@ -796,7 +796,7 @@
my $has_vols = 'AND cn.owning_lib = d.id';
my $has_copies = 'AND cp.call_number = cn.id';
- my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.holdable IS TRUE AND cl.opac_visible IS TRUE';
+ my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.opac_visible IS TRUE AND cl.opac_visible IS TRUE';
my $visible_count = ', count(DISTINCT cp.id)';
my $visible_count_test = 'HAVING count(DISTINCT cp.id) > 0';
@@ -970,7 +970,7 @@
my $has_vols = 'AND cn.owning_lib = d.id';
my $has_copies = 'AND cp.call_number = cn.id';
- my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.holdable IS TRUE AND cl.opac_visible IS TRUE';
+ my $copies_visible = 'AND d.opac_visible IS TRUE AND cp.opac_visible IS TRUE AND cs.opac_visible IS TRUE AND cl.opac_visible IS TRUE';
if ($self->api_name =~ /staff/o) {
$copies_visible = '';
$has_vols = '' if ($ou_type == 0);
@@ -1267,7 +1267,7 @@
AND cn.owning_lib = d.id
AND cp.call_number = cn.id
AND cp.opac_visible IS TRUE
- AND cs.holdable IS TRUE
+ AND cs.opac_visible IS TRUE
AND cl.opac_visible IS TRUE
AND d.opac_visible IS TRUE
AND br.active IS TRUE
@@ -1304,7 +1304,7 @@
AND cp.circ_lib = d.id
AND cp.call_number = cn.id
AND cp.opac_visible IS TRUE
- AND cs.holdable IS TRUE
+ AND cs.opac_visible IS TRUE
AND cl.opac_visible IS TRUE
AND d.opac_visible IS TRUE
AND br.active IS TRUE
@@ -1760,7 +1760,7 @@
AND cp.circ_lib = d.id
AND cp.call_number = cn.id
AND cp.opac_visible IS TRUE
- AND cs.holdable IS TRUE
+ AND cs.opac_visible IS TRUE
AND cl.opac_visible IS TRUE
AND d.opac_visible IS TRUE
AND br.active IS TRUE
@@ -2235,7 +2235,7 @@
AND cp.location = cl.id
AND cp.call_number = cn.id
AND cp.opac_visible IS TRUE
- AND cs.holdable IS TRUE
+ AND cs.opac_visible IS TRUE
AND cl.opac_visible IS TRUE
AND d.opac_visible IS TRUE
AND cp.deleted IS FALSE
More information about the open-ils-commits
mailing list