[open-ils-commits] r15913 - branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-03-18 14:33:40 -0400 (Thu, 18 Mar 2010)
New Revision: 15913

Modified:
   branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Log:
return mapped legacy events from in-db circ, so that precat copies check out properly

Modified: branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-03-18 18:32:47 UTC (rev 15912)
+++ branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-03-18 18:33:40 UTC (rev 15913)
@@ -962,6 +962,7 @@
 }
 
 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',
@@ -1035,11 +1036,16 @@
     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,
             ]
         }