greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16259

Show
Ignore:
Timestamp:
2008-07-01 15:40:42 (5 months 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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gsdl/trunk/bin/script/buildcol.pl

    r14942 r16259  
    218218        'hiddengli' => "yes" }, 
    219219      { 'name' => "disable_OAI", 
    220           'desc' => "{buildcol.disable_OAI}", 
    221           'type' => "flag", 
    222           'reqd' => "no", 
    223           'modegli' => "2", 
    224           'hiddengli' => "yes" } 
    225  
    226 #      { 'name' => "incremental_dlc", 
    227 #       'desc' => "{buildcol.incremental_dlc}", 
    228 #       'type' => "flag", 
    229 #       'reqd' => "no", 
    230 #        'hiddengli' => "yes" }  
     220        'desc' => "{buildcol.disable_OAI}", 
     221        'type' => "flag", 
     222        'reqd' => "no", 
     223        'modegli' => "2", 
     224        'hiddengli' => "yes" }, 
    231225      ]; 
    232226 
     
    273267#        Thompson, DL Consulting Ltd. 
    274268# 
    275 #  @param  $incremental_dlc If true indicates this build should not regenerate all 
     269#  @param  $incremental If true indicates this build should not regenerate all 
    276270#                       the index and metadata files, and should instead just 
    277271#                       append the information found in the archives directory 
     
    290284        $create_images, $collectdir, $build, $type, $textindex, 
    291285        $no_strip_html, $no_text, $faillog, $gli, $index, $language, 
    292         $sections_index_document_metadata, $maxnumeric, $incremental_dlc, 
     286        $sections_index_document_metadata, $maxnumeric, 
    293287        $disable_OAI); 
    294288 
    295289    my $xml = 0; 
    296     $incremental_dlc = 0; # this is hidden for now as it doesn't work for standard greenstone at the moment 
    297290    my $hashParsingResult = {}; 
    298291    # general options available to all plugins 
     
    569562    eval("\$builder = new $buildertype(\$collection, " . 
    570563         "\$realarchivedir, \$realbuilddir, \$verbosity, " . 
    571          "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_dlc, " . 
     564         "\$maxdocs, \$debug, \$keepold, \$incremental, " . 
    572565         "\$remove_empty_classifications, " . 
    573566         "\$out, \$no_text, \$faillog, \$gli, \$disable_OAI)"); 
  • gsdl/trunk/perllib/basebuilder.pm

    r16222 r16259  
    5656sub new { 
    5757    my ($class, $collection, $source_dir, $build_dir, $verbosity,  
    58         $maxdocs, $debug, $keepold, $incremental, $incremental_dlc, 
     58        $maxdocs, $debug, $keepold, $incremental, 
    5959        $remove_empty_classifications,  
    6060        $outhandle, $no_text, $failhandle, $gli, $disable_OAI) = @_; 
     
    7373                      'keepold'=>$keepold, 
    7474                      'incremental'=>$incremental, 
    75                       'incremental_dlc' => $incremental_dlc, 
    7675                      'remove_empty_classifications'=>$remove_empty_classifications, 
    7776                      'outhandle'=>$outhandle, 
  • gsdl/trunk/perllib/lucenebuilder.pm

    r15725 r16259  
    371371    #       already exists. If it doesn't, let the super classes function be 
    372372    #       called once to generate it. 
    373     if (!$self->{'incremental_dlc'} || !-e $infodb_file_path) 
     373    if (!$self->{'incremental'} || !-e $infodb_file_path) 
    374374    { 
    375375        # basebuilder::make_infodatabase(@_); 
  • gsdl/trunk/perllib/strings.properties

    r16136 r16259  
    8888 
    8989buildcol.incremental:Only index documents which have not been previously indexed. Implies -keepold. Relies on the lucene indexer. 
    90  
    91 buildcol.incremental_dlc:Truely incremental update of the GDBM database. Only works for hierarchy classifiers. 
    9290 
    9391buildcol.keepold:Will not destroy the current contents of the building directory. 
  • gsdl/trunk/perllib/strings_ar.properties

    r16017 r16259  
    175175د علي ٠
    176176ك؎ف lucene .  # Updated 11-Oct-2007 by kkhalafala 
    177  
    178 buildcol.incremental_dlc:تحديث الإضافة الحقيقية لقاعدة ؚيانات GDBM . تع٠
    179 Ù„ فقط Ù 
    180 Ø¹ ال٠
    181 ØµÙ†ÙØ§Øª الهر٠
    182 ÙŠØ©.  # Updated 11-Oct-2007 by kkhalafala 
    183177 
    184178buildcol.keepold:لن تحط٠
  • gsdl/trunk/perllib/strings_fr.properties

    r16017 r16259  
    8484 
    8585buildcol.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 
    86  
    87 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 
    8886 
    8987buildcol.keepold:Ne détruira pas les contenus actuels du répertoire de construction. 
  • gsdl/trunk/perllib/strings_mr.properties

    r16017 r16259  
    8787 
    8888# -- Missing translation: buildcol.incremental 
    89  
    90 # -- Missing translation: buildcol.incremental_dlc 
    9189 
    9290buildcol.keepold:à€€à€¯à€Ÿà€° à€¹à¥‹à€€ à€ 
  • gsdl/trunk/perllib/strings_ro.properties

    r16017 r16259  
    8484 
    8585buildcol.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 
    86  
    87 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 
    8886 
    8987buildcol.keepold:Nu va distruge conÅ£inutul curent al directorului de construcÅ£ie.  # Updated 24-Nov-2007 by constantinescu 
  • gsdl/trunk/perllib/strings_zh.properties

    r16017 r16259  
    110110buildcol.incremental:ä» 
    111111只以前未被玢匕过的玢匕文档。这意味着-keepold选项。䟝赖于lucene玢匕噚。  # Updated 26-Nov-2007 by Xiaofeng Yu 
    112  
    113 buildcol.incremental_dlc:真正的GDBM数据库递增匏升级。仠
    114 é€‚甚于层级分类噚。  # Updated 26-Nov-2007 by Xiaofeng Yu 
    115112 
    116113buildcol.keepold:䞍æž