Changeset 37218

Timestamp:

2023-01-30T15:23:43+13:00 (8 months ago)

Author:

davidb

Message:

set-archives-assocfile can now pass data directly using 'filedata' (rather than a full-blown POST with file-update). This argument will be more conventient for transmitted CSV and JSON data interactively created within the browser

File:

• main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm

@@ -71 +71 @@
 
     "set-archives-assocfile" => {
-        'compulsory-args' => [ "d", "assocname", 'fileupload' ],
-        'optional-args'   => [ "dv" ] ,
+        'compulsory-args' => [ "d", "assocname" ],
+        'optional-args'   => [ "dv", "fileupload", "filedata" ] ,
         'help-string'     => [ "Because this action uploads a file, this action needs to be POSTed. The 'fileupload' parameter/field is the uploaded file content; 'assocname' specifies the filename within the archives's document's area that it will be saved as" ]
     }, 
@@ -1372 +1372 @@
     
     my $output_filename = &util::filename_cat($archive_dir, $output_file);
-    
+
+    my $filedata = $self->{'filedata'};
     my $FIN = $self->{'fileupload'};
-    if (open(FOUT,">$output_filename")) {
-
-    binmode(FOUT, ":raw"); 
-
-    while (1) {
-        my $buffer = "";
-        my $bytes_read = read($FIN, $buffer, 1024);
-
-        if (defined $bytes_read) {
-        if ($bytes_read>0) {
-            print FOUT $buffer;
-        }
-        last if $bytes_read < 1024;
+    
+    if ((!defined $filedata) && (!defined $FIN)) {
+    $gsdl_cgi->generate_ok_message("set-archives-assocfile: either 'fileupload' or 'filedata' must be set");
+    }
+    else {
+
+    my $had_error = 0;
+    my $had_error_mess = undef;
+    
+    if (defined $filedata) {
+        if (open(FOUT,">$output_filename")) {       
+        print FOUT $filedata;
+        close(FOUT);    
         }
         else {
-        my $mess = "set-archives-assocfile: Failed to open uploaded file for reading: $!\n";
-        print STDERR "Error - $mess";
-        $gsdl_cgi->generate_error($mess);
-        last;
+        $had_error = 1;
+        $had_error_mess = "Failed to save filedata to: $output_filename";
+        print STDERR "Error - $had_error_mess:\n$!\n";
         }
     }
-
-    close($FIN);    
-    close(FOUT);    
-
-    my $mess = "set-archives-assocfile successful save uploaded content into 'archives' as: $output_file\n";
-    $gsdl_cgi->generate_ok_message($mess);
-
-    }
-    else {
-    my $mess = "Failed to save file: $output_filename";
-    print STDERR "Error - $mess:\n$!\n";
-    $gsdl_cgi->generate_error($mess);
-    }       
+    else {
+        my $FIN = $self->{'fileupload'};
+        if (open(FOUT,">$output_filename")) {       
+        binmode(FOUT, ":raw"); 
+        
+        while (1) {
+            my $buffer = "";
+            my $bytes_read = read($FIN, $buffer, 1024);
+            
+            if (defined $bytes_read) {
+            if ($bytes_read>0) {
+                print FOUT $buffer;
+            }
+            last if $bytes_read < 1024;
+            }
+            else {
+            $had_error = 1;
+            $had_error_mess = "set-archives-assocfile: Failed to open uploaded file for reading: $!\n";
+            print STDERR "Error - $had_error_mess";
+            last;
+            }
+        }
+        
+        close($FIN);    
+        close(FOUT);    
+        }
+        else {
+        $had_error = 1;
+        $had_error_mess = "Failed to save file uploaded file as: $output_filename";
+        print STDERR "Error - $had_error_mess:\n$!\n";
+        }
+    }
+
+    if (!$had_error) {
+        my $mess = "set-archives-assocfile successful save uploaded content into 'archives' as: $output_file\n";
+        $gsdl_cgi->generate_ok_message($mess);
+    }
+    else {
+        $gsdl_cgi->generate_error($had_error_mess);
+    }
+    }
 }