Changeset 37730

Timestamp:

2023-04-27T15:53:20+12:00 (5 weeks ago)

Author:

davidb

Message:

Updated code to allow two import.pl's in a row (without a buildcol.pl) operate sensibly

Location:

main/trunk/greenstone2/perllib

Files:

• DocHistoryFileUtils.pm (modified) (2 diffs)
• scriptutil.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/DocHistoryFileUtils.pm

@@ -504 +504 @@
             }
             elsif ($index_status eq "I") {
-            print STDERR "  Newly generated version of document from 'import/' of existing document from 'archives/' (Index-Status=I)\n";
-            print STDERR "  => keepold: store snapshot of previous version in $FLDV_HISTORY_DIR as 'nminus-1'\n";
-            prepend_document_version($keepold_doc_dirname,$doc_dirname);
+
+            if (!&FileUtils::directoryExists($doc_dirname)) {
+                # This can happen if import.pl has been run twice in a row , without buildcol.pl
+                #
+                # Specifics: In the case that the second import.pl run is incremental, then previous "I" entries
+                # from the first import.pl have not been processed by buildcol.pl and turned into "B" entries.
+                # However, if existing "I" entries have not been modified between the first and second import.pl
+                # then there is is no 'doc_dirname' that has been created in the newly formed archives.  Further,
+                # the archives_keepold version isn't an example of a document that needs a "fldv" bump.
+
+                # long description to say, that basically we want to treat the situation like a "B", that
+                # it's been index
+
+                print STDERR "  Unchanged version of document in 'archives/' however (Index-Status=I not B)\n";
+                print STDERR "  This can occur if two consecutive import.pl's have been run, without a buildcol.pl inbetween\n";
+                print STDERR "  => Recusirvely copying the archives_keepold/ doc across verbatim to archives/\n";
+                print STDERR "     (effectively treating as a 'B')\n";
+                
+                doc_copy_archivedir_keepold_to_archivedir($keepold_doc_dirname,$doc_dirname);               
+            }
+            else {
+                print STDERR "  Newly generated version of document from 'import/' of existing document from 'archives/' (Index-Status=I)\n";
+                print STDERR "  => keepold: store snapshot of previous version in $FLDV_HISTORY_DIR as 'nminus-1'\n";
+                
+                prepend_document_version($keepold_doc_dirname,$doc_dirname);
+            }
             }
             elsif ($index_status eq "B") {
@@ -541 +564 @@
             }
             elsif ($index_status eq "I") {
-            print STDERR "  Newly generated version of document from 'import/' of existing document from 'archives/' (Index-Status=I)\n";
-            print STDERR "  => keepold: store snapshot of previous version in $FLDV_HISTORY_DIR as 'nminus-1'\n";
-            replace_document_version($keepold_doc_dirname,$doc_dirname);
+
+            if (!&FileUtils::directoryExists($doc_dirname)) {
+                # This can happen if import.pl has been run twice in a row , without buildcol.pl
+                #
+                # For explanation see above 'I' entry for -keepold
+                #
+                # Basically we want to treat the situation like a "B", that it's been index
+
+                print STDERR "  Unchanged version of document in 'archives/' however (Index-Status=I not B)\n";
+                print STDERR "  This can occur if two consecutive import.pl's have been run, without a buildcol.pl inbetween\n";
+                print STDERR "  => Recusirvely copying the archives_keepold/ doc across verbatim to archives/\n";
+                print STDERR "     (effectively treating as a 'B')\n";
+                
+                doc_copy_archivedir_keepold_to_archivedir($keepold_doc_dirname,$doc_dirname);
+            }
+            else {
+                print STDERR "  Newly generated version of document from 'import/' of existing document from 'archives/' (Index-Status=I)\n";
+                print STDERR "  => keepold: store snapshot of previous version in $FLDV_HISTORY_DIR as 'nminus-1'\n";
+                replace_document_version($keepold_doc_dirname,$doc_dirname);
+            }
             }
             elsif ($index_status eq "B") {

main/trunk/greenstone2/perllib/scriptutil.pm

@@ -171 +171 @@
     # incremental implies keepold
     if ($incremental) {
-    $keepold = 1;
+    if (!$replaceold) {
+        $keepold = 1;
+    }
     }
     return ($removeold, $keepold, $replaceold, $incremental, $incremental_mode);