Changeset 23138 for main/trunk/greenstone2/cgi-bin/talkback-transfer.pl

Timestamp:

2010-10-14T23:58:30+13:00 (14 years ago)

Author:

davidb

Message:

Elimination of rand_string

File:

• main/trunk/greenstone2/cgi-bin/talkback-transfer.pl (modified) (4 diffs)

main/trunk/greenstone2/cgi-bin/talkback-transfer.pl

@@ -1 @@
-#/usr/bin/perl -w
+#!/usr/bin/perl -w
 
 use strict;
@@ -18 +18 @@
 
 
+sub get_infodb_type
+{
+    my ($collect_home,$collect) = @_;
+
+    print STDERR "*** Need to implement extracting infodb_type from collect.cfg\n";
+    return "gdbm";
+}
+
+
+sub oid_to_docxml_filename
+{
+    my ($collect_home,$collect,$docid) = @_;
+
+    my $infodb_type = get_infodb_type($collect_home,$collect);
+
+    # Obtain the collect and archive dir    
+    my $archive_dir = &util::filename_cat($collect_home,$collect,"archives");
+
+    # Obtain the doc.xml path for the specified docID
+    my $arcinfo_doc_filename 
+    = &dbutil::get_infodb_file_path($infodb_type, "archiveinf-doc", 
+                    $archive_dir);
+    my $doc_rec_string 
+    = &dbutil::read_infodb_entry($infodb_type, $arcinfo_doc_filename, 
+                     $docid);
+    my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);    
+    my $doc_xml_file = $doc_rec->{'doc-file'}->[0];
+    
+    # The $doc_xml_file is relative to the archives, so now let's get the 
+    # full path
+    my $archives_dir = &util::filename_cat($collect_home,$collect,"archives");    
+    my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file);
+
+    return $doc_xml_filename;
+}
+
 sub main
 {
@@ -24 +60 @@
     $gsdl_cgi->setup_gsdl();
 
+    my $gsdl_home = $gsdl_cgi->get_gsdl_home();
+    my $collect_home = &util::filename_cat($gsdl_home,"collect");
+
+    require dbutil;
     require talkback;
 
-    my $rand_string;
-    if (defined $gsdl_cgi->param('rand_string')) { 
-    $rand_string = $gsdl_cgi->param('rand_string');
-    }
-    else {
-    $rand_string = "b310f690273cdc025e5a9b49fca8eee8";
+    my $oid     = $gsdl_cgi->{'oid'};
+    my $collect = $gsdl_cgi->{'collect'};
+
+    # sanity check
+    if (!defined $oid || !defined $collect) {
+    print STDOUT "Content-type:text/plain\n\n";
+    print STDOUT "ERROR: Malformed CGI argments.  Neeed to specify 'oid' and 'collect'\n";
+    exit 0;
     }
 
-    my $uploadedfile;
-    if (defined $gsdl_cgi->param('uploadedfile')) { 
-    $uploadedfile = $gsdl_cgi->param('uploadedfile');
-    }
-    else {
-    $uploadedfile = "C:\\cygwin\\tmp\\test-medium.pdf";
-    }
+    my $uniq_prefix = "$collect-$oid";
 
-    my $talktoUploadURL;
-    if (defined $gsdl_cgi->param('talkbackUpload')) { 
-    $talktoUploadURL = $gsdl_cgi->param('talktoUpload');
-    }
-    else {
-    $talktoUploadURL = "http://www.nzdl.org/gsdl-new/cgi-bin/talkback-progressbar.pl";
-    }
+    my $docxml_filename = oid_to_docxml_filename($collect_home,$collect,$oid);
+
+    my $talktoUploadURL = $gsdl_cgi->param('talktoUpload');
 
     my $browser = LWP::UserAgent->new(agent => 'Perl File Upload');
@@ -56 +88 @@
        [ 'yes_upload'   => '1',
          'process'      => '1',
-         'rand_string'  => $rand_string,
-         'uploadedfile' => [$uploadedfile, "test-medium.pdf"] 
+         'uploadedfile' => [$docxml_filename, "$uniq_prefix-doc.xml"] 
          ],
        'Content_Type' => 'form-data'