Changeset 23138 for main/trunk/greenstone2/cgi-bin/talkback-progressbar.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-progressbar.pl (modified) (2 diffs)

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

@@ -116 +116 @@
     if ($gsdl_cgi->param('process')) { 
 
-    my $rand_string  = $gsdl_cgi->param('rand_string');
     my $uploadedfile = $gsdl_cgi->param('uploadedfile');
-    my $full_filename = &util::filename_cat($gsdl_tmp_dir,
-                        "$rand_string-$uploadedfile");
+    my $full_filename = &util::filename_cat($gsdl_tmp_dir,$uploadedfile);
 
     my $done_html = &talkback::generate_done_html($full_filename);
@@ -136 +134 @@
     my $upload_html_form;
 
-    if (defined $gsdl_cgi->param('rand_string')) { 
-        my $rand_string = $gsdl_cgi->param('rand_string');
-
-        # Light-weight (hidden) form with progress bar
-
-        $upload_html_form 
-        = &talkback::generate_upload_form_progressbar($rand_string);
-    }
-    else {
-        print STDERR "Warning: Neither 'processing' nor 'rand_string' was set\n";
-        $upload_html_form 
-        = &talkback::generate_malformed_args_html();
-        
-    }
+    my $oid     = $gsdl_cgi->param('oid');
+    my $collect = $gsdl_cgi->param('collect');
+
+    my $uniq_file = "$collect-$oid-doc.xml";
+    # Light-weight (hidden) form with progress bar
+
+    $upload_html_form 
+        = &talkback::generate_upload_form_progressbar($uniq_file);
     
         print $perlAjax->build_html($gsdl_cgi, $upload_html_form);