Changeset 37215 for main

Timestamp:

2023-01-30T14:10:43+13:00 (15 months ago)

Author:

davidb

Message:

Introduction of new set-archives-assocfile action (data needs to be POSTed); some tidy up on get-arhives-assocfile

Location:

main/trunk/greenstone2/perllib/cgiactions

Files:

• metadataaction.pm (modified) (8 diffs)
• modmetadataaction.pm (modified) (2 diffs)

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

@@ -59 +59 @@
 
     if(!defined $ENV{'GSDL3HOME'} || (defined $ENV{'GS3_AUTHENTICATED'} && $ENV{'GS3_AUTHENTICATED'} eq "true")) {
-    require modmetadataaction;
+        require modmetadataaction;
     }
     else {
-    $modmeta_action_table = {};
+        $modmeta_action_table = {};
     }
 }
@@ -88 +88 @@
         'optional-args'   => [ "dv", "metapos" ] },
 
-    "get-archives-assocfiles" => { 
+    "get-archives-assocfile" => { 
         'compulsory-args' => [ "d", "assocname" ],
         'optional-args'   => [ "dv" ] },
@@ -123 +123 @@
     my $class = shift (@_);
     my ($gsdl_cgi,$iis6_mode) = @_;
-
+    
     # Treat metavalue specially.  To transmit this through a GET request
     # the Javascript side has url-encoded it, so here we need to decode
@@ -149 +149 @@
 
     my $self = new baseaction($action_table,$gsdl_cgi,$iis6_mode);
-
+    
     return bless $self, $class;
 }
@@ -973 +973 @@
 }
 
-sub get_archives_assocfiles
+sub get_archives_assocfile
 {
     my $self = shift @_;
@@ -1001 +1001 @@
     my $dv = $self->{'dv'}; 
     if (defined $dv && ($dv ne "")) {
-        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
+        # Need to insert '_fldv_history/nminus-<n>' into doc_file
         
         my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
@@ -1013 +1013 @@
     # get the job done, but is not very efficient
     # => candidate for refactoring
-    
-    my $json_result_str .= "[";
     
 
@@ -1042 +1040 @@
 
         if (defined $dv && ($dv ne "")) {
-        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
+        # Need to insert '_fldv_history/nminus-<n>' into found_file
 
         $found_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$found_file);

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

@@ -69 +69 @@
     # Should there not be a "set-archives-text" also ???!!!!??
     ###### !!!!!
+
+    "set-archives-assocfile" => {
+        'compulsory-args' => [ "d", "assocname", 'fileupload' ],
+        'optional-args'   => [ "dv" ] ,
+        '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" ]
+    }, 
         
     "set-import-metadata" => { 
@@ -1323 +1329 @@
 }
 
+
+
+# the version of set_archives_meta that doesn't do authentication
+sub _set_archives_assocfile
+{
+    my $self = shift @_;
+
+    my $collect   = $self->{'collect'};
+    my $gsdl_cgi  = $self->{'gsdl_cgi'};
+    my $infodbtype = $self->{'infodbtype'};
+
+    # Obtain the collect and archive dir   
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site); 
+    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
+
+    # look up additional args
+    my $docid  = $self->{'d'};
+
+    my $assocname = $self->{'assocname'};
+
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archive_dir);
+    my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid);
+    
+    my $doc_file = $doc_rec->{'doc-file'}->[0];
+    
+    # check if request if for file-level doc-version history 'nminus-<n>' version
+    my $dv = $self->{'dv'}; 
+    
+    my ($unused_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
+
+    my $output_file = $assocname;
+    
+    if (defined $dv && ($dv ne "")) {
+    # Need to insert '_fldv_history/nminus-<n>' into output_file
+    
+    $output_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$output_file);
+    }
+    else {
+    $output_file = &util::filename_cat($doc_dirname,$output_file);
+    }
+    
+    my $output_filename = &util::filename_cat($archive_dir, $output_file);
+    
+    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 {
+        my $mess = "set-archives-assocfile: Failed to open uploaded file for reading: $!\n";
+        print STDERR "Error - $mess";
+        $gsdl_cgi->generate_error($mess);
+        last;
+        }
+    }
+
+    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);
+    }       
+}
+
+
+sub set_archives_assocfile
+{
+    my $self = shift @_;
+
+    my $username  = $self->{'username'};
+    my $collect   = $self->{'collect'};
+    my $gsdl_cgi  = $self->{'gsdl_cgi'};
+
+    if ($baseaction::authentication_enabled) {
+    # Ensure the user is allowed to edit this collection
+    $self->authenticate_user($username, $collect);
+    }
+
+
+    # Make sure the collection isn't locked by someone else
+    $self->lock_collection($username, $collect);
+
+    $self->_set_archives_assocfile(@_);
+
+    # Release the lock once it is done
+    $self->unlock_collection($username, $collect);
+}
+
+
 sub _remove_archives_metadata
 {