From e9ebfd0cf453f4b42c48971817f2a316451012e2 Mon Sep 17 00:00:00 2001 From: erickson Date: Sat, 30 Aug 2008 16:02:29 +0000 Subject: [PATCH] make sure to grab the correct queue type for perm checking git-svn-id: svn://svn.open-ils.org/ILS/trunk@10489 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../perlmods/OpenILS/Application/Vandelay.pm | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm index d0f1474063..f00628b46c 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm @@ -206,9 +206,16 @@ sub process_spool { my $e = new_editor(authtoken => $auth, xact => 1); return $e->die_event unless $e->checkauth; - my $queue = $e->retrieve_vandelay_queue($queue_id) or return $e->die_event; - my $type = ($self->api_name =~ /auth/) ? 'auth' : 'bib'; + my $queue; + my $type = $self->{record_type}; + + if($type eq 'bib') { + $queue = $e->retrieve_vandelay_bib_queue($queue_id) or return $e->die_event; + } else { + $queue = $e->retrieve_vandelay_authority_queue($queue_id) or return $e->die_event; + } + my $evt = check_queue_perms($e, $type, $queue); return $evt if $evt; @@ -241,7 +248,7 @@ sub process_spool { $xml = entityize($xml); $xml =~ s/[\x00-\x1f]//go; - if ($self->{record_type} eq 'bib') { + if ($type eq 'bib') { _add_bib_rec( $e, $xml, $queue_id, $purpose ) or return $e->die_event; } else { _add_auth_rec( $e, $xml, $queue_id, $purpose ) or return $e->die_event; @@ -296,8 +303,13 @@ sub retrieve_queue { my $e = new_editor(authtoken => $auth); return $e->event unless $e->checkauth; - my $queue = $e->retrieve_vandelay_bib_queue($queue_id) or return $e->event; my $type = $self->{record_type}; + my $queue; + if($type eq 'bib') { + $queue = $e->retrieve_vandelay_bib_queue($queue_id) or return $e->die_event; + } else { + $queue = $e->retrieve_vandelay_authority_queue($queue_id) or return $e->die_event; + } my $evt = check_queue_perms($e, $type, $queue); return $evt if $evt; @@ -348,4 +360,3 @@ sub check_queue_perms { 1; - -- 2.43.2