result object is no longer pushed into 'environment'
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 24 Jan 2006 23:33:14 +0000 (23:33 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 24 Jan 2006 23:33:14 +0000 (23:33 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@2819 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/javascript/backend/circ/circ_lib.js
Open-ILS/src/javascript/backend/circ/circ_permit.js
Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm

index 544ec56..fbb5039 100644 (file)
@@ -4,6 +4,7 @@ var __SCRATCH = {};
 function scratchKey()          { return '_' + __scratchKey++; };
 function scratchPad(key)       { return '__SCRATCH.'+ key; }
 function getScratch(key)       { return __SCRATCH[ key ]; }
+function scratchClear()                { for( var o in __SCRATCH ) __SCRATCH[o] = null; }
 
 
 
index 1563b4e..344ded5 100644 (file)
@@ -8,7 +8,6 @@ load_lib('circ_lib.js');
 /* collect some useful variables */
 var copy                       = environment.copy;
 var patron             = environment.patron;
-var result             = environment.result;
 var standing   = patron.standing.value.toLowerCase();
 var profile            = patron.profile.name.toLowerCase();
 var status             = copy.status.name.toLowerCase();
index 5c7e313..f209b3a 100644 (file)
@@ -193,8 +193,8 @@ sub _build_circ_script_runner {
        $runner->insert( 'environment.copy',            $ctx->{copy}, 1);
 
        # circ script result
-       $runner->insert( 'environment.result', {} );
-       $runner->insert( 'environment.result.event', 'SUCCESS' );
+       $runner->insert( 'result', {} );
+       $runner->insert( 'result.event', 'SUCCESS' );
 
        $runner->insert('environment.isRenewal', 1) if $ctx->{isrenew};
 
@@ -275,7 +275,7 @@ sub permit_circ {
        $runner->load($scripts{circ_permit});
        $runner->run or throw OpenSRF::EX::ERROR ("Circ Permit Script Died: $@");
 
-       my $evtname = $runner->retrieve('environment.result.event');
+       my $evtname = $runner->retrieve('result.event');
        $logger->activity("Permit Circ for user $patronid and barcode $barcode returned event: $evtname");
        return OpenILS::Event->new($evtname);
 }