Changeset 20571


Ignore:
Timestamp:
2009-09-10T10:33:00+12:00 (15 years ago)
Author:
davidb
Message:

Introduction of variable 'incremental_mode' that is set to 'none', 'onlyadd', or 'all' depending on settings of -removeold -keepold and -incremental. Some minor edits to tidy up the code have also been made in this commit

Location:
gsdl/trunk/bin/script
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/bin/script/buildcol.pl

    r20098 r20571  
    3131    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
    3232    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
     33    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/perl-5.8");
    3334    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/XML/XPath");
    3435    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
    … …  
    274275    # command line args
    275276    my ($verbosity, $archivedir, $cachedir, $builddir, $site, $maxdocs,
    276     $debug, $mode, $indexname, $removeold, $keepold, $incremental,
     277    $debug, $mode, $indexname, $removeold, $keepold,
     278    $incremental, $incremental_mode,
    277279    $remove_empty_classifications,
    278280    $collectdir, $build, $type, $textindex,
    … …  
    445447    }
    446448   
    447     ($removeold, $keepold, $incremental) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, $incremental, "building", $collectcfg);
     449    ($removeold, $keepold, $incremental, $incremental_mode)
     450    = &scriptutil::check_removeold_and_keepold($removeold, $keepold,
     451                           $incremental, "building",
     452                           $collectcfg);
    448453 
    449454    $gli = 0 unless defined $gli;

  • gsdl/trunk/bin/script/export.pl

    r20415 r20571  
    276276    my ($language, $verbosity, $debug,
    277277    $collectdir, $importdir, $exportdir, $site, $manifest,
    278     $incremental, $keepold, $removeold,
     278    $incremental, $incremental_mode, $keepold, $removeold,
    279279    $saveas,
    280280    $OIDtype, $OIDmetadata,
    … …  
    450450
    451451    # check keepold and removeold
    452     ($removeold, $keepold, $incremental) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, $incremental, "export", $collectcfg);
     452    ($removeold, $keepold, $incremental, $incremental_mode)
     453    = &scriptutil::check_removeold_and_keepold($removeold, $keepold,
     454                           $incremental, "export",
     455                           $collectcfg);
    453456
    454457    print STDERR "<export>\n" if $gli;
    … …  
    469472   
    470473    # load all the plugins
    471     $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts);
     474    $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts, $incremental_mode);
    472475       
    473476    if (scalar(@$pluginfo) == 0) {
    … …  
    579582    $processor->close_group_output() if $processor->is_group();
    580583
    581     if (($saveas =~ m/^.*METS$/) || ($saveas eq "MARCXML")) {
    582     # Not all export types need this (e.g. DSpace)
     584#    if (($saveas =~ m/^.*METS$/) || ($saveas eq "MARCXML")) {
     585#   # Not all export types need this,
     586
     587##  $export_info->save_info($expinfo_doc_filename);
     588#    }
     589
     590    my $expinfo_src_filename = &util::filename_cat ($exportdir, "archiveinf-src");   
     591    &util::rename_gdbm_file($expinfo_src_filename); # ensures gdb
     592    $expinfo_src_filename .= ".gdb";
     593
     594
     595    # for backwards compatability with archvies.inf file
     596    if ($expinfo_doc_filename =~ m/(contents)|(\.inf)$/) {
    583597    $export_info->save_info($expinfo_doc_filename);
    584598    }
     599    else {
     600    $export_info->save_revinfo_gdbm($expinfo_src_filename);
     601    }
     602
    585603       
    586604    # write out export stats

  • gsdl/trunk/bin/script/import.pl

    r20098 r20571  
    3636    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
    3737    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
     38    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/perl-5.8");
    3839    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
    3940    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugouts");
    … …  
    278279    my ($language, $verbosity, $debug,
    279280    $collectdir, $importdir, $archivedir, $site, $manifest,
    280     $incremental, $keepold, $removeold,
     281    $incremental, $incremental_mode, $keepold, $removeold,
    281282    $saveas,
    282283    $OIDtype, $OIDmetadata,
    … …  
    480481       
    481482    # check keepold and removeold
    482     ($removeold, $keepold, $incremental) = &scriptutil::check_removeold_and_keepold($removeold, $keepold, $incremental, "archives", $collectcfg);
     483    ($removeold, $keepold, $incremental, $incremental_mode)
     484    = &scriptutil::check_removeold_and_keepold($removeold, $keepold,
     485                           $incremental, "archives",
     486                           $collectcfg);
    483487 
    484488
    … …  
    501505
    502506    # load all the plugins
    503     $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts, $incremental);
     507    $pluginfo = &plugin::load_plugins ($plugins, $verbosity, $out, $faillog, \@global_opts, $incremental_mode);
    504508    if (scalar(@$pluginfo) == 0) {
    505509    &gsprintf($out, "{import.no_plugins_loaded}\n");
    … …  
    585589
    586590
    587     if (!$removeold) {
     591    if ($incremental) {
     592        # equivalent to saying ($keepold && ($incremental_mode eq "all"))
    588593
    589594        &inexport::prime_doc_oid_count($archivedir);
    … …  
    593598        # been deleted
    594599       
    595         &inexport::new_vs_old_import_diff($archive_info,$block_hash,$importdir);
     600        &inexport::new_vs_old_import_diff($archive_info,$block_hash,$importdir,
     601                          $archivedir,$verbosity,$incremental_mode);
    596602       
    597603        my @deleted_files = sort keys %{$block_hash->{'deleted_files'}};
    … …  
    639645
    640646
    641         # not sure if the following will work -- wil the metadata datastructure be correctly initialized
     647        # not sure if the following will work -- will the metadata data-structure be correctly initialized
    642648        # in the right order?
    643649#       foreach my $file (@new_files, @reindex_files) {
    … …  
    688694
    689695    # for backwards compatability with archvies.inf file
    690     if ($arcinfo_doc_filename =~ m/\.inf$/) {
     696    if ($arcinfo_doc_filename =~ m/(contents)|(\.inf)$/) {
    691697    $archive_info->save_info($arcinfo_doc_filename);
    692698    }

  • gsdl/trunk/bin/script/incremental-import.pl

    r19744 r20571  
    120120    }
    121121    else {
    122 ### print STDERR "$archiveinf_doc does not exist.\n";
    123122    print STDERR "*****\n";
    124123    print STDERR "First time import. Switching to full import.pl.\n";

  • gsdl/trunk/bin/script/pluginfo.pl

    r16787 r20571  
    3636    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
    3737    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
     38    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/perl-5.8");
    3839    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
    3940
Note: See TracChangeset for help on using the changeset viewer.