Changeset 37207 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

Timestamp:

2023-01-29T17:24:20+13:00 (15 months ago)

Author:

davidb

Message:

Support added in for optional cgi param 'dv' specifying the file-level document-version history (_fldv_history) folder to use

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (12 diffs)

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

@@ -29 +29 @@
 
 use cgiactions::baseaction;
+use cgiactions::metadataactioncommon;
 
 use dbutil;
@@ -34 +35 @@
 
 use JSON;
+
+# convenient to have shorter version around
+my $FLDV_HISTORY_DIR = $metadataactioncommon::FLDV_HISTORY_DIR;
 
 # This class is conditionally expanded with set-metadata, remove-metadata and insert-metadata subroutines
@@ -69 +73 @@
     # unused and untested
     # when DocEdit=1, need to retrieve a doc's full text (or doc section's full text) from archives
-    "get-archives-text" => {
-    'compulsory-args' => [ "d" ] },
-    #'compulsory-args' => [ "d" ],
-    #'optional-args' => [ "section" ] },
+        "get-archives-text" => {
+            'compulsory-args' => [ "d" ],
+            'optional-args'   => [ "dv" ] },
+            #'compulsory-args' => [ "d" ],
+            #'optional-args' => [ "section" ] },
     
     #GET METHODS
@@ -81 +86 @@
     "get-archives-metadata" => { 
         'compulsory-args' => [ "d", "metaname" ],
-        'optional-args'   => [ "metapos" ] },
+        'optional-args'   => [ "dv", "metapos" ] },
     
     "get-index-metadata" => { 
@@ -152 +157 @@
     my $collect   = $self->{'collect'};
     my $gsdl_cgi  = $self->{'gsdl_cgi'};
-    my $gsdlhome  = $self->{'gsdlhome'};
+    #my $gsdlhome  = $self->{'gsdlhome'};
     my $infodbtype = $self->{'infodbtype'};
     
     # live metadata gets/saves value scoped (prefixed) by the current usename 
     # so (for now) let's not bother to enforce authentication
-
+    
     # Obtain the collect dir
-    my $site = $self->{'site'};
-    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
     ## my $collect_dir = &util::filename_cat($gsdlhome, "collect");
 
@@ -398 +403 @@
         my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid);
         # This now stores the full pathname
-        my $doc_filename = $doc_rec->{'doc-file'}->[0];
-        $doc_filename = &util::filename_cat($archive_dir, $doc_filename);
+        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'}; 
+        if (defined $dv && ($dv ne "")) {
+        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
+        
+        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
+        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
+        }
+        
+        my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
 
         if($first_rec) {
@@ -688 +703 @@
     my $collect   = $self->{'collect'};
     my $gsdl_cgi  = $self->{'gsdl_cgi'};
-    my $gsdlhome  = $self->{'gsdlhome'};
+    #my $gsdlhome  = $self->{'gsdlhome'};
 
     # Obtain the collect dir
@@ -736 +751 @@
     my $collect   = $self->{'collect'};
     my $gsdl_cgi  = $self->{'gsdl_cgi'};
-    my $gsdlhome  = $self->{'gsdlhome'};
+    #my $gsdlhome  = $self->{'gsdlhome'};
 
     # Obtain the collect dir
@@ -873 +888 @@
     my $collect   = $self->{'collect'};
     my $gsdl_cgi  = $self->{'gsdl_cgi'};
-#   my $gsdlhome  = $self->{'gsdlhome'};
     my $infodbtype = $self->{'infodbtype'};
 
@@ -894 +908 @@
 
     # This now stores the full pathname
-    my $doc_filename = $doc_rec->{'doc-file'}->[0]; 
-
-    $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $docid_secnum));
+    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'}; 
+    if (defined $dv && ($dv ne "")) {
+        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
+        
+        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
+        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
+    }
+
+    my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
+        
+    $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, $docid_secnum));
 
 }
@@ -908 +933 @@
     my $collect   = $self->{'collect'};
     my $gsdl_cgi  = $self->{'gsdl_cgi'};
-#   my $gsdlhome  = $self->{'gsdlhome'};
     my $infodbtype = $self->{'infodbtype'};
 
@@ -925 +949 @@
 
     # This now stores the full pathname
-    my $doc_filename = $doc_rec->{'doc-file'}->[0];
-    
+    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'}; 
+    if (defined $dv && ($dv ne "")) {
+        # Need to insert '_fldv_history/nminus-<n>' into doc_filename
+        
+        my ($doc_tailname, $doc_dirname) = File::Basename::fileparse($doc_file);
+        $doc_file = &util::filename_cat($doc_dirname,$FLDV_HISTORY_DIR,$dv,$doc_tailname);
+    }
+    
+    my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
+        
     my $metaname = undef;
     my $metapos = -1;
     
-    $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $docid_secnum));
+    $gsdl_cgi->generate_ok_message($self->get_metadata_from_archive_xml($gsdl_cgi, $doc_filename, $metaname, $metapos, $docid_secnum));
 
 }