Changeset 28261 for main/trunk/greenstone2/perllib/cgiactions/docextractaction.pm

Timestamp:

2013-09-12T10:10:44+12:00 (11 years ago)

Author:

davidb

Message:

This action now saves the newly created document in the same archives folder as the original, and update the archivesinf-doc database appropriately

File:

• main/trunk/greenstone2/perllib/cgiactions/docextractaction.pm (modified) (3 diffs)

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

@@ -358 +358 @@
     # look up additional args
     my $docid = $self->{'d'};
-    my $new_docid = $self->{'newd'} || "HASH" . localtime(time);
+
+    my $timestamp = time();
+    my $new_docid = $self->{'newd'} || "HASH$timestamp";
 
     $self->{'keep-parent-metadata'} = $self->parse_flag("keep-parent-metadata");
@@ -373 +375 @@
     my $doc_filename = &util::filename_cat($archive_dir, $doc_file);
 
-    my $newdoc_filename = &util::filename_cat($archive_dir, "test.xml");
-
-#   # This now stores the full pathname
-#   my $doc_filename = $doc_rec->{'doc-file'}->[0]; 
+    my $new_doc_file = $doc_file;
+    $new_doc_file =~ s/doc(-\d+)?.xml$/doc-$timestamp.xml/;
+
+    my $newdoc_filename = &util::filename_cat($archive_dir, $new_doc_file);
 
     my $sec_num_hash = $self->sections_as_hash($json_sections_array);
@@ -390 +392 @@
 
         if ($delete_status == 0) {
+
+        # Existing doc record needs to be reindexed
+        $doc_rec->{'index-status'} = ["I"];
+        &dbutil::set_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid, $doc_rec);
+
+        # Create doc-record entry for the newly extracted document
+
+        my $new_doc_rec = $doc_rec;
+        #### Need to cut this down to just the assoc files the new document references
+
+        &dbutil::set_infodb_entry($infodbtype, $arcinfo_doc_filename, $new_docid, $new_doc_rec);
+
+        #### Also need to update the archivesinf-src database!!!!
+        # For all the assoc and src files, retrieve record, and add in new_docid
 
         my $mess = "document-extract successful: Key[$docid]\n";