return mapped legacy events from in-db circ, so that precat copies check out properly

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
index 7da13d6..cf1aa19 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
@@ -970,6 +970,7 @@ sub do_copy_checks {
 }
 
 my $LEGACY_CIRC_EVENT_MAP = {
+    'no_item' => 'ITEM_NOT_CATALOGED',
     'actor.usr.barred' => 'PATRON_BARRED',
     'asset.copy.circulate' =>  'COPY_CIRC_NOT_ALLOWED',
     'asset.copy.status' => 'COPY_NOT_AVAILABLE',
@@ -1044,11 +1045,16 @@ sub run_indb_circ_test {
     my $dbfunc = ($self->is_renewal) ? 
         'action.item_user_renew_test' : 'action.item_user_circ_test';
 
+    if( $self->is_precat && $self->request_precat) {
+        $self->make_precat_copy;
+        return if $self->bail_out;
+    }
+
     my $results = $self->editor->json_query(
         {   from => [
                 $dbfunc,
                 $self->editor->requestor->ws_ou,
-                ($self->is_precat or $self->is_noncat) ? undef : $self->copy->id, 
+                ($self->is_noncat or ($self->is_precat and !$self->override)) ? undef : $self->copy->id, 
                 $self->patron->id,
             ]
         }