From 5adf51e5d351d0a899d7e97ca858ee7fd6ca056b Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 14 May 2008 20:31:48 +0000
Subject: [PATCH] moving purpose to record instead of queue

git-svn-id: svn://svn.open-ils.org/ILS/trunk@9606 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../perlmods/OpenILS/Application/Vandelay.pm   | 18 +++++++++++-------
 Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm  |  8 ++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
index 9ac47de1a8..f5d0a25a49 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
@@ -51,7 +51,6 @@ sub create_bib_queue {
 	my $name = shift;
 	my $owner = shift;
 	my $type = shift;
-	my $purpose = shift;
 
 	my $e = new_editor(authtoken => $auth, xact => 1);
 
@@ -86,7 +85,6 @@ sub create_auth_queue {
 	my $name = shift;
 	my $owner = shift;
 	my $type = shift;
-	my $purpose = shift;
 
 	my $e = new_editor(authtoken => $auth, xact => 1);
 
@@ -119,6 +117,7 @@ sub add_record_to_bib_queue {
 	my $auth = shift;
 	my $queue = shift;
 	my $marc = shift;
+	my $purpose = shift;
 
 	my $e = new_editor(authtoken => $auth, xact => 1);
 
@@ -129,7 +128,7 @@ sub add_record_to_bib_queue {
 		($e->allowed('CREATE_BIB_IMPORT_QUEUE', undef, $queue) ||
 		 $e->allowed('CREATE_BIB_IMPORT_QUEUE', $queue->owner));
 
-	my $new_id = _add_auth_rec($e, $marc, $queue->id);
+	my $new_id = _add_auth_rec($e, $marc, $queue->id, $purpose);
 
 	$e->die_event unless ($new_id);
 	$e->commit;
@@ -148,10 +147,12 @@ sub _add_bib_rec {
 	my $e = shift;
 	my $marc = shift;
 	my $queue = shift;
+	my $purpose = shift;
 
 	my $rec = new Fieldmapper::vandelay::queued_bib_record();
 	$rec->marc( $marc );
 	$rec->queue( $queue );
+	$rec->purpose( $purpose ) if ($purpose);
 
 	return $e->create_vandelay_queued_bib_record( $rec );
 }
@@ -162,6 +163,7 @@ sub add_record_to_authority_queue {
 	my $auth = shift;
 	my $queue = shift;
 	my $marc = shift;
+	my $purpose = shift;
 
 	my $e = new_editor(authtoken => $auth, xact => 1);
 
@@ -172,7 +174,7 @@ sub add_record_to_authority_queue {
 		($e->allowed('CREATE_AUTHORITY_IMPORT_QUEUE', undef, $queue) ||
 		 $e->allowed('CREATE_AUTHORITY_IMPORT_QUEUE', $queue->owner));
 
-	my $new_id = _add_auth_rec($e, $marc, $queue->id);
+	my $new_id = _add_auth_rec($e, $marc, $queue->id, $purpose);
 
 	$e->die_event unless ($new_id);
 	$e->commit;
@@ -195,6 +197,7 @@ sub _add_auth_rec {
 	my $rec = new Fieldmapper::vandelay::queued_authority_record();
 	$rec->marc( $marc );
 	$rec->queue( $queue );
+	$rec->purpose( $purpose ) if ($purpose);
 
 	return $e->create_vandelay_queued_authority_record( $rec );
 }
@@ -226,7 +229,8 @@ sub process_spool {
     my $cache = new OpenSRF::Utils::Cache();
 
     my $data = $cache->get_cache('vandelay_import_spool_' . $fingerprint);
-    $data = decode_base64($data);
+	my $purpose = $data->{purpose};
+    $data = decode_base64($data->{marc});
 
 	my $fh = new IO::Scalar \$data;
 
@@ -244,9 +248,9 @@ sub process_spool {
 			$xml =~ s/[\x00-\x1f]//go;
 
 			if ($self->{record_type} eq 'bib') {
-				_add_bib_rec( $e, $xml, $queue );
+				_add_bib_rec( $e, $xml, $queue, $purpose );
 			} else {
-				_add_auth_rec( $e, $xml, $queue );
+				_add_auth_rec( $e, $xml, $queue, $purpose );
 			}
 			$count++;
 			
diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm
index 3268878706..9258681ca4 100644
--- a/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm
+++ b/Open-ILS/src/perlmods/OpenILS/WWW/Vandelay.pm
@@ -56,7 +56,8 @@ sub spool_marc {
 
 	return Apache2::Const::FORBIDDEN unless verify_login($auth);
 
-	my $cache = new OpenSRF::Utils::Cache();
+
+	my $purpose = $cgi->param('purpose');
 	my $file = $cgi->param('marc_upload');
 	my $filename = "$file";
 
@@ -65,7 +66,10 @@ sub spool_marc {
 
 	my $data_fingerprint = md5_hex($data);
 
-	$cache->put_cache('vandelay_import_spool_' . $data_fingerprint, $data);
+	OpenSRF::Utils::Cache()->new->put_cache(
+		'vandelay_import_spool_' . $data_fingerprint,
+		{ purpose => $purpose, marc => $data }
+	);
 
 	print "Content-type: text/plain; charset=utf-8\n\n$data_fingerprint";
 
-- 
2.43.2