From 2f0fc1c948934b6d0682f4e8548c18e25be5a2bc Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 5 Sep 2007 15:29:24 +0000 Subject: [PATCH] backporting: svn merge -r7758:7759 svn://svn.open-ils.org/ILS/trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@7760 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Cat.pm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm index 2fb945fb8c..42220d270f 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm @@ -1454,11 +1454,21 @@ sub find_or_create_volume { my( $self, $conn, $auth, $label, $record_id, $org_id ) = @_; my $e = new_editor(authtoken=>$auth, xact=>1); return $e->die_event unless $e->checkauth; + + my $vol; + + if($record_id == OILS_PRECAT_RECORD) { + + $vol = $e->retrieve_asset_call_number(OILS_PRECAT_CALL_NUMBER) + or return $e->die_event; + + } else { - my $vol = $e->search_asset_call_number( - {label => $label, record => $record_id, owning_lib => $org_id, deleted => 'f'}, - {idlist=>1} - )->[0]; + $vol = $e->search_asset_call_number( + {label => $label, record => $record_id, owning_lib => $org_id, deleted => 'f'}, + {idlist=>1} + )->[0]; + } # If the volume exists, return the ID if( $vol ) { $e->rollback; return $vol; } @@ -1474,12 +1484,6 @@ sub find_or_create_volume { $vol->label($label); $vol->record($record_id); - #$vol->creator($e->requestor->id); - #$vol->create_date('now'); - #$vol->editor($e->requestor->id); - #$vol->edit_date('now'); - #$e->create_asset_call_number($vol) or return $e->die_event; - my $evt = create_volume( 0, $e, $vol ); return $evt if $evt; -- 2.11.0