Changeset 16259

Timestamp:

2008-07-01T15:40:42+12:00 (15 years ago)

Author:

mdewsnip

Message:

Removed the "-incremental" option from buildcol.pl (because it didn't do anything different to "-keepold", and changed "-incremental_dlc" back to "-incremental". Lots more incremental improvements on the way.

Location:

gsdl/trunk

Files:

• bin/script/buildcol.pl (modified) (4 diffs)
• perllib/basebuilder.pm (modified) (2 diffs)
• perllib/lucenebuilder.pm (modified) (1 diff)
• perllib/strings.properties (modified) (1 diff)
• perllib/strings_ar.properties (modified) (1 diff)
• perllib/strings_fr.properties (modified) (1 diff)
• perllib/strings_mr.properties (modified) (1 diff)
• perllib/strings_ro.properties (modified) (1 diff)
• perllib/strings_zh.properties (modified) (1 diff)

gsdl/trunk/bin/script/buildcol.pl

@@ -218 +218 @@
     'hiddengli' => "yes" },
       { 'name' => "disable_OAI",
-          'desc' => "{buildcol.disable_OAI}",
-          'type' => "flag",
-          'reqd' => "no",
-          'modegli' => "2",
-      'hiddengli' => "yes" }
-
-#      { 'name' => "incremental_dlc",
-#   'desc' => "{buildcol.incremental_dlc}",
-#   'type' => "flag",
-#   'reqd' => "no",
-#        'hiddengli' => "yes" } 
+        'desc' => "{buildcol.disable_OAI}",
+        'type' => "flag",
+        'reqd' => "no",
+        'modegli' => "2",
+    'hiddengli' => "yes" },
       ];
 
@@ -273 +267 @@
 #        Thompson, DL Consulting Ltd.
 #
-#  @param  $incremental_dlc If true indicates this build should not regenerate all
+#  @param  $incremental 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
@@ -290 +284 @@
     $create_images, $collectdir, $build, $type, $textindex,
     $no_strip_html, $no_text, $faillog, $gli, $index, $language,
-    $sections_index_document_metadata, $maxnumeric, $incremental_dlc,
+    $sections_index_document_metadata, $maxnumeric,
     $disable_OAI);
 
     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
@@ -569 +562 @@
     eval("\$builder = new $buildertype(\$collection, " .
      "\$realarchivedir, \$realbuilddir, \$verbosity, " .
-     "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_dlc, " .
+     "\$maxdocs, \$debug, \$keepold, \$incremental, " .
      "\$remove_empty_classifications, " .
      "\$out, \$no_text, \$faillog, \$gli, \$disable_OAI)");

gsdl/trunk/perllib/basebuilder.pm

@@ -56 +56 @@
 sub new {
     my ($class, $collection, $source_dir, $build_dir, $verbosity, 
-    $maxdocs, $debug, $keepold, $incremental, $incremental_dlc,
+    $maxdocs, $debug, $keepold, $incremental,
     $remove_empty_classifications, 
     $outhandle, $no_text, $failhandle, $gli, $disable_OAI) = @_;
@@ -73 +73 @@
               'keepold'=>$keepold,
               'incremental'=>$incremental,
-              'incremental_dlc' => $incremental_dlc,
               'remove_empty_classifications'=>$remove_empty_classifications,
               'outhandle'=>$outhandle,

gsdl/trunk/perllib/lucenebuilder.pm

@@ -371 +371 @@
     #       already exists. If it doesn't, let the super classes function be
     #       called once to generate it.
-    if (!$self->{'incremental_dlc'} || !-e $infodb_file_path)
+    if (!$self->{'incremental'} || !-e $infodb_file_path)
     {
         # basebuilder::make_infodatabase(@_);

gsdl/trunk/perllib/strings.properties

@@ -88 +88 @@
 
 buildcol.incremental:Only index documents which have not been previously indexed. Implies -keepold. Relies on the lucene indexer.
-
-buildcol.incremental_dlc:Truely incremental update of the GDBM database. Only works for hierarchy classifiers.
 
 buildcol.keepold:Will not destroy the current contents of the building directory.

gsdl/trunk/perllib/strings_ar.properties

@@ -175 +175 @@
 د علي Ù
 ك؎ف lucene .  # Updated 11-Oct-2007 by kkhalafala
-
-buildcol.incremental_dlc:تحديث الإضافة الحقيقية لقاعدة ؚيانات GDBM . تعÙ
-ل فقط Ù
-ع الÙ
-صنفات الهرÙ
-ية.  # Updated 11-Oct-2007 by kkhalafala
 
 buildcol.keepold:لن تحطÙ

gsdl/trunk/perllib/strings_fr.properties

@@ -84 +84 @@
 
 buildcol.incremental:Indexe seuls les documents qui n'ont pas été préalablement indexés. Implique -keepold. Repose sur l' indexeur lucene.  # Updated 4-Dec-2007 by Georges Braoudakis
-
-buildcol.incremental_dlc:Vraiment mise à jour incrémentale  de la base de données GDBM. Fonctionne uniquement pour des classificateurs hiérarchiques .  # Updated 4-Dec-2007 by Georges Braoudakis
 
 buildcol.keepold:Ne détruira pas les contenus actuels du répertoire de construction.

gsdl/trunk/perllib/strings_mr.properties

@@ -87 +87 @@
 
 # -- Missing translation: buildcol.incremental
-
-# -- Missing translation: buildcol.incremental_dlc
 
 buildcol.keepold:à€€à€¯à€Ÿà€° à€¹à¥‹à€€ à€

gsdl/trunk/perllib/strings_ro.properties

@@ -84 +84 @@
 
 buildcol.incremental:Doar documentele index care nu au fost indexate în prealabil. Implică utilizarea -keepold. Se bazează pe indexatorul lucene.  # Updated 5-Nov-2007 by constantinescu
-
-buildcol.incremental_dlc:O actualizare cu adevărat incrementală a bazei de date GDBM. Lucrează doar pentru clasificatorii ierarhici.  # Updated 23-Nov-2007 by constantinescu
 
 buildcol.keepold:Nu va distruge conţinutul curent al directorului de construcţie.  # Updated 24-Nov-2007 by constantinescu

gsdl/trunk/perllib/strings_zh.properties

@@ -110 +110 @@
 buildcol.incremental:ä»
 只以前未被玢匕过的玢匕文档。这意味着-keepold选项。䟝赖于lucene玢匕噚。  # Updated 26-Nov-2007 by Xiaofeng Yu
-
-buildcol.incremental_dlc:真正的GDBM数据库递增匏升级。ä»
-适甚于层级分类噚。  # Updated 26-Nov-2007 by Xiaofeng Yu
 
 buildcol.keepold:䞍æž