Changeset 24495 for main/trunk


Ignore:
Timestamp:
2011-08-26T17:31:50+12:00 (13 years ago)
Author:
davidb
Message:

Introduction of $site variable passed into the XXbuilder.pm perl code for indexing (needed to support Solr in Greenstone3)

Location:
main/trunk/greenstone2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/bin/script/buildcol.pl

    r24463 r24495  
    583583    my @builders = ();
    584584
    585 
    586585    for (my $i=0; $i<$num_builders; $i++) {
    587586    my $this_builder;
    … …  
    596595    }
    597596
    598     eval("\$this_builder = new $this_buildertype(\$collection, " .
     597    eval("\$this_builder = new $this_buildertype(\$site, \$collection, " .
    599598         "\$realarchivedir, \$realbuilddir, \$verbosity, " .
    600599         "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_mode, " .

  • main/trunk/greenstone2/perllib/basebuilder.pm

    r24460 r24495  
    5555
    5656sub new {
    57     my ($class, $collection, $source_dir, $build_dir, $verbosity,
     57    my ($class, $site, $collection, $source_dir, $build_dir, $verbosity,
    5858    $maxdocs, $debug, $keepold, $incremental, $incremental_mode,
    5959    $remove_empty_classifications,
    … …  
    6565
    6666    # create a builder object
    67     my $self = bless {'collection'=>$collection,
     67    my $self = bless {'site'=>$site, # will be undef for Greenstone 2
     68              'collection'=>$collection,
    6869              'source_dir'=>$source_dir,
    6970              'build_dir'=>$build_dir,
Note: See TracChangeset for help on using the changeset viewer.