[open-ils-commits] r15253 - trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-12-30 15:37:57 -0500 (Wed, 30 Dec 2009)
New Revision: 15253

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Log:
during checkout.full, bypass the caching (and retrieval of) the permit key, since permit and checkout occur in the same process

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2009-12-30 20:00:11 UTC (rev 15252)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2009-12-30 20:37:57 UTC (rev 15253)
@@ -296,6 +296,7 @@
 
         # requesting a precat checkout implies that any required
         # overrides have been performed.  Go ahead and re-override.
+        $circulator->skip_permit_key(1);
         $circulator->override(1) if $circulator->request_precat;
         $circulator->do_permit();
         $circulator->is_checkout(1);
@@ -523,6 +524,7 @@
     parent_circ
     return_patron
     claims_never_checked_out
+    skip_permit_key
 /;
 
 
@@ -611,6 +613,7 @@
 
 sub mk_permit_key {
     my $self = shift;
+    return '' if $self->skip_permit_key;
     my $key = md5_hex( time() . rand() . "$$" );
     $self->cache_handle->put_cache( "oils_permit_key_$key", 1, 300 );
     return $self->permit_key($key);
@@ -618,6 +621,7 @@
 
 sub check_permit_key {
     my $self = shift;
+    return 1 if $self->skip_permit_key;
     my $key = $self->permit_key;
     return 0 unless $key;
     my $k = "oils_permit_key_$key";