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

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-09-15 13:32:10 -0400 (Tue, 15 Sep 2009)
New Revision: 14027

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Log:
capturing ISBN value for pre-cat copies.  setting checkin_workstation value at circ checkin time

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2009-09-15 17:22:12 UTC (rev 14026)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2009-09-15 17:32:10 UTC (rev 14027)
@@ -370,6 +370,7 @@
     checkout_time
     dummy_title
     dummy_author
+    dummy_isbn
     circ_lib
     barcode
     duration_level
@@ -1100,6 +1101,7 @@
 
         $CR->checkin_time('now');   
         $CR->checkin_lib($self->editor->requestor->ws_ou);
+        $CR->checkin_workstation($self->editor->requestor->wsid);
         $CR->checkin_staff($self->editor->requestor->id);
 
         $evt = $self->editor->event 
@@ -1588,13 +1590,13 @@
     my $copy = $self->copy;
 
    if($copy) {
-      $logger->debug("circulator: Pre-cat copy already exists in checkout: ID=" . $copy->id);
+        $logger->debug("circulator: Pre-cat copy already exists in checkout: ID=" . $copy->id);
 
-      $copy->editor($self->editor->requestor->id);
-      $copy->edit_date('now');
-      $copy->dummy_title($self->dummy_title);
-      $copy->dummy_author($self->dummy_author);
-
+        $copy->editor($self->editor->requestor->id);
+        $copy->edit_date('now');
+        $copy->dummy_title($self->dummy_title || '');
+        $copy->dummy_isbn($self->dummy_isbn || '');
+        $copy->dummy_author($self->dummy_author || '');
         $self->update_copy();
         return;
    }
@@ -1613,6 +1615,7 @@
 
    $copy->dummy_title($self->dummy_title || "");
    $copy->dummy_author($self->dummy_author || "");
+   $copy->dummy_isbn($self->dummy_isbn || "");
 
     unless( $self->copy($self->editor->create_asset_copy($copy)) ) {
         $self->bail_out(1);
@@ -2223,6 +2226,7 @@
 
     $circ->checkin_staff($self->editor->requestor->id);
     $circ->checkin_lib($self->editor->requestor->ws_ou);
+    $circ->checkin_workstation($self->editor->requestor->wsid);
 
     my $circ_lib = (ref $self->copy->circ_lib) ?  
         $self->copy->circ_lib->id : $self->copy->circ_lib;