Changeset 12964

Timestamp:

2006-10-03T11:41:47+13:00 (18 years ago)

Author:

kjdon

Message:

added a new option: -incremental, which invokes David's archives.inf timestamp stuff. So now you can have -keepold on without using this incremental stuff. eg if import out of differnet directories. buildcol incremental option changed to incremental_dlc, adn commented out. this invokes DLC hierarchy updates which doesn't work at the moment cos we are not compiling up gdbmget/set

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (7 diffs)
• import.pl (modified) (4 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -117 +117 @@
     'reqd' => "no",
     'modegli' => "4" },
+      { 'name' => "incremental",
+    'desc' => "{buildcol.incremental}",
+    'type' => "flag",
+    'hiddengli' => "yes" },
       { 'name' => "keepold",
     'desc' => "{buildcol.keepold}",
@@ -192 +196 @@
     'type' => "flag",
     'reqd' => "no",
-    'hiddengli' => "yes" },
-      { 'name' => "incremental",
-    'desc' => "{buildcol.incremental}",
-    'type' => "flag",
-    'reqd' => "no",
-        'modegli' => "3" } ];
+    'hiddengli' => "yes" }
+
+#      { 'name' => "incremental_dlc",
+#   'desc' => "{buildcol.incremental_dlc}",
+#   'type' => "flag",
+#   'reqd' => "no",
+#        'hiddengli' => "yes" } 
+      ];
 
 my $options = { 'name' => "buildcol.pl",
@@ -238 +244 @@
 #        Thompson, DL Consulting Ltd.
 #
-#  @param  $incremental If true indicates this build should not regenerate all
+#  @param  $incremental_dlc If true indicates this build should not regenerate all
 #                       the index and metadata files, and should instead just
 #                       append the information found in the archives directory
@@ -251 +257 @@
     # command line args
     my ($verbosity, $archivedir, $cachedir, $builddir, $maxdocs, 
-    $debug, $mode, $indexname, $removeold, $keepold, $remove_empty_classifications,
+    $debug, $mode, $indexname, $removeold, $keepold, $incremental, 
+    $remove_empty_classifications,
     $create_images, $collectdir, $build, $type, $textindex,
     $no_strip_html, $no_text, $faillog, $gli, $index, $language,
-    $sections_index_document_metadata, $maxnumeric, $incremental);
+    $sections_index_document_metadata, $maxnumeric, $incremental_dlc);
 
     my $xml = 0;
-
+    $incremental_dlc = 0; # this is hidden for now as it doesn't work for standard greenstone at the moment
     my $hashParsingResult = {};
     # general options available to all plugins
@@ -430 +437 @@
     }
     
-    ($removeold, $keepold) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, "building", $collectcfg);
+    ($removeold, $keepold, $incremental) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, $incremental, "building", $collectcfg);
  
     $gli = 0 unless defined $gli;
@@ -524 +531 @@
     eval("\$builder = new $buildertype(\$collection, " .
      "\$realarchivedir, \$realbuilddir, \$verbosity, " .
-     "\$maxdocs, \$debug, \$keepold, \$remove_empty_classifications, " .
-     "\$out, \$no_text, \$faillog, \$gli, \$incremental)");
+     "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_dlc, " .
+     "\$remove_empty_classifications, " .
+     "\$out, \$no_text, \$faillog, \$gli)");
     die "$@" if $@;
 
@@ -632 +640 @@
 #
 #  @param  $base_dir A string denoting the base path the given dir must be
-#                    abolsute to.
+#                    absolute to.
 #  @param  $dir The directory to be made absolute as a string. Note that the
 #               dir may already be absolute, in which case it will remain

trunk/gsdl/bin/script/import.pl

@@ -124 +124 @@
     'reqd' => "no",
         'hiddengli' => "yes" },
+      { 'name' => "incremental",
+    'desc' => "{import.incremental}",
+    'type' => "flag",
+    'hiddengli' => "yes" },
       { 'name' => "keepold",
     'desc' => "{import.keepold}",
@@ -236 +240 @@
 
 sub main {
-    my ($verbosity, $importdir, $archivedir, $manifest, $keepold, 
+    my ($verbosity, $importdir, $archivedir, $manifest, $incremental, $keepold, 
     $removeold, $saveas, $version,
     $gzip, $groupsize, $OIDtype, $OIDmetadata, $debug, 
@@ -432 +436 @@
     
     # check keepold and removeold
-    ($removeold, $keepold) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, "archives", $collectcfg);
+    ($removeold, $keepold, $incremental) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, $incremental, "archives", $collectcfg);
  
     $gli = 0 unless defined $gli;
@@ -454 +458 @@
 
     # load all the plugins
-    $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts);
+    $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts, $incremental);
     if (scalar(@$pluginfo) == 0) {
     &gsprintf($out, "{import.no_plugins_loaded}\n");