From 539efba0c8cff13df75eef34e6563da35278fa5a Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 17 Mar 2006 19:22:24 +0000
Subject: [PATCH]  checking for deleted on call_number searches

git-svn-id: svn://svn.open-ils.org/ILS/trunk@3395 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../perlmods/OpenILS/Application/AppUtils.pm  |  4 +++-
 .../src/perlmods/OpenILS/Application/Cat.pm   | 22 ++++++++++++-------
 .../src/perlmods/OpenILS/Application/Circ.pm  |  4 +++-
 .../OpenILS/Application/Search/Biblio.pm      |  4 +++-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
index f937a6fa5c..7881cbc3cf 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
@@ -930,7 +930,9 @@ sub fetch_call_numbers_by_title {
 	my( $self, $titleid ) = @_;
 	$logger->info("Fetching call numbers by title $titleid");
 	return $self->storagereq(
-		'open-ils.storage.direct.asset.call_number.search.record.atomic', $titleid);
+		'open-ils.storage.direct.asset.call_number.search_where.atomic', 
+		{ record => $titleid, deleted => 'f' });
+		#'open-ils.storage.direct.asset.call_number.search.record.atomic', $titleid);
 }
 
 sub fetch_copies_by_call_number {
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
index a5775a5eff..704f88169f 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
@@ -204,8 +204,10 @@ sub _tcn_exists {
 	if(!$tcn) {return 0;}
 
 	my $req = $session->request(      
-		"open-ils.storage.direct.biblio.record_entry.search.tcn_value.atomic",
-		$tcn );
+		"open-ils.storage.direct.biblio.record_entry.search_where.atomic",
+		{ tcn_value => $tcn, deleted => 'f' } );
+		#"open-ils.storage.direct.biblio.record_entry.search.tcn_value.atomic",
+
 	my $recs = $req->gather(1);
 
 	if($recs and $recs->[0]) {
@@ -555,8 +557,9 @@ sub orgs_for_title {
 
 	my $vols = $apputils->simple_scalar_request(
 		"open-ils.storage",
-		"open-ils.storage.direct.asset.call_number.search.record.atomic",
-		$record_id );
+		"open-ils.storage.direct.asset.call_number.search_where.atomic",
+		{ record => $record_id, deleted => 'f' });
+		#"open-ils.storage.direct.asset.call_number.search.record.atomic",
 
 	my $orgs = { map {$_->owning_lib => 1 } @$vols };
 	return [ keys %$orgs ];
@@ -623,11 +626,14 @@ sub retrieve_copies {
 sub _build_volume_list {
 	my $search_hash = shift;
 
+	$search_hash->{deleted} = 'f';
+
 	my	$session = OpenSRF::AppSession->create( "open-ils.storage" );
 	
 
 	my $request = $session->request( 
 			"open-ils.storage.direct.asset.call_number.search.atomic", $search_hash );
+			#"open-ils.storage.direct.asset.call_number.search.atomic", $search_hash );
 
 	my $vols = $request->gather(1);
 	my @volumes;
@@ -685,10 +691,10 @@ sub volume_tree_fleshed_update {
 
 		if( $volume->isdeleted) {
 			my $status = _delete_volume($session, $volume, $user_obj);
-			if(!$status) {
-				throw OpenSRF::EX::ERROR
-					("Volume delete failed for volume " . $volume->id);
-			}
+			#if(!$status) {
+				#throw OpenSRF::EX::ERROR
+					#("Volume delete failed for volume " . $volume->id);
+			#}
 			if(UNIVERSAL::isa($status, "Fieldmapper::perm_ex")) { return $status; }
 
 		} elsif( $volume->isnew ) {
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
index 251c993e7d..6ccb37f11e 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
@@ -446,7 +446,9 @@ sub note_batch {
 
 	my @copies;
 	my $cns = $U->storagereq(
-		'open-ils.storage.id_list.asset.call_number.search.record.atomic', $titleid );
+		'open-ils.storage.id_list.asset.call_number.search_where.atomic', 
+		{ record => $titleid, deleted => 'f' } );
+		#'open-ils.storage.id_list.asset.call_number.search.record.atomic', $titleid );
 
 	for my $c (@$cns) {
 		my $copyids = $U->storagereq(
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
index cc13df78f7..12a4340ccf 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
@@ -177,7 +177,9 @@ sub biblio_search_tcn {
 
 	my $session = OpenSRF::AppSession->create( "open-ils.storage" );
 	my $request = $session->request( 
-			"open-ils.storage.direct.biblio.record_entry.search.tcn_value.atomic", $tcn );
+			"open-ils.storage.direct.biblio.record_entry.search_where.atomic", 
+			{ tcn_value => $tcn, deleted => 'f' } );
+			#"open-ils.storage.direct.biblio.record_entry.search.tcn_value.atomic", $tcn );
 	my $record_entry = $request->gather(1);
 
 	my @ids;
-- 
2.43.2