From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sun, 6 Aug 2006 15:25:09 +0000 (+0000)
Subject: more constants updates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=87e13e60c03b5641b2caef75ab6123ba440b5151;p=Evergreen.git

more constants updates


git-svn-id: svn://svn.open-ils.org/ILS/trunk@5319 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 0cbdc18303..c554629bb2 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
@@ -509,7 +509,7 @@ sub do_copy_checks {
 	my $copy = $self->copy;
 	return unless $copy;
 
-	my $stat = (ref $copy->status) ? $copy->status->id : $copy->status;
+	my $stat = $U->copy_status($copy->status)->id;
 
 	# We cannot check out a copy if it is in-transit
 	if( $stat == OILS_COPY_STATUS_IN_TRANSIT ) {
@@ -594,10 +594,6 @@ sub run_copy_permit_scripts {
    my %hash = map { ($_->{ilsevent} => $_) } @allevents;
    @allevents = values %hash;
 
-
-	# If the script says the copy is not available, put the status
-	# in as the payload for that event
-	my $stat = ref($copy->status) ? $copy->status->id : $copy->status;
    for (@allevents) {
       $_->{payload} = $copy if 
 			($_->{textcode} eq 'COPY_NOT_AVAILABLE');
@@ -1212,7 +1208,7 @@ sub do_checkin {
 	unless($self->checkin_changed) {
 
 		$self->push_events(OpenILS::Event->new('NO_CHANGE'));
-		my $stat = (ref $self->copy->status) ? $self->copy->status->id : $self->copy->status;
+		my $stat = $U->copy_status($self->copy->status)->id;
 
      	$self->hold($U->fetch_open_hold_by_copy($self->copy->id))
          if( $stat == OILS_COPY_STATUS_ON_HOLDS_SHELF );
@@ -1232,7 +1228,7 @@ sub reshelve_copy {
    my $copy    = $self->copy;
    my $force   = $self->force;
 
-   my $stat = ref($copy->status) ? $copy->status->id : $copy->status;
+   my $stat = $U->copy_status($copy->status)->id;
 
    if($force || (
       $stat != OILS_COPY_STATUS_ON_HOLDS_SHELF and
@@ -1270,7 +1266,7 @@ sub checkin_build_copy_transit {
    $transit->dest( (ref($copy->circ_lib)) ? $copy->circ_lib->id : $copy->circ_lib );
    $transit->target_copy($copy->id);
    $transit->source_send_time('now');
-   $transit->copy_status( (ref $copy->status) ? $copy->status->id : $copy->status );
+   $transit->copy_status( $U->copy_status($copy->status)->id );
 
 	return $self->bail_on_events($self->editor->event)
 		unless $self->editor->create_action_transit_copy($transit);
@@ -1345,7 +1341,6 @@ sub checkin_build_hold_transit {
    my $hold = $self->hold;
    my $trans = Fieldmapper::action::hold_transit_copy->new;
 
-	my $stat = (ref $copy->status) ? $copy->status->id : $copy->status;
    $trans->hold($hold->id);
    $trans->source($self->editor->requestor->ws_ou);
    $trans->dest($hold->pickup_lib);
@@ -1511,7 +1506,7 @@ sub check_checkin_copy_status {
    my $ismissing  = 0;
    my $evt        = undef;
 
-   my $status = ref($copy->status) ? $copy->status->id : $copy->status;
+   my $status = $U->copy_status($copy->status)->id;
 
    return undef
       if(   $status == OILS_COPY_STATUS_AVAILABLE   ||
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
index 55f3d147b1..86d3a1092d 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
@@ -421,9 +421,8 @@ sub cancel_hold {
 
 		my $copy = $e->retrieve_asset_copy($hold->current_copy)
 			or return $e->event;
-		my $stat = $U->copy_status_from_name('on holds shelf');
 
-		if( $copy->status == $stat->id ) {
+		if( $copy->status == OILS_COPY_STATUS_ON_HOLDS_SHELF ) {
 			$logger->info("setting copy to status 'reshelving' on hold cancel");
 			$copy->status(OILS_COPY_STATUS_RESHELVING);
 			$copy->editor($e->requestor->id);