Changeset 24343 for main/trunk/greenstone2/bin/script/buildcol.pl

Timestamp:

2011-07-29T13:08:43+12:00 (13 years ago)

Author:

davidb

Message:

Support for building non-text indexes that are orthogonol to the usual text-based index

File:

• main/trunk/greenstone2/bin/script/buildcol.pl (modified) (3 diffs)

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

@@ -546 +546 @@
     $builderdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
     $buildertype = "${collection}builder";
-    } else {
+    } else {    
+
     $builderdir = "$ENV{'GSDLHOME'}/perllib";
     if ($buildtype eq "lucene") {
@@ -558 +559 @@
     }
     }
+    # check for extension specific builders 
+    # (that will then be run after main builder.pm
+
+    my @builderdir_list = ($builderdir);
+    my @buildertype_list = ($buildertype);
+    
+    if (defined $ENV{'GSDLEXTS'}) {
     
-    require "$builderdir/$buildertype.pm";
-
-    eval("\$builder = new $buildertype(\$collection, " .
-     "\$realarchivedir, \$realbuilddir, \$verbosity, " .
-     "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_mode, " .
-     "\$remove_empty_classifications, " .
-     "\$out, \$no_text, \$faillog, \$gli)");
-    die "$@" if $@;
-
-    $builder->init();
-    $builder->set_maxnumeric($maxnumeric);
-    
-    if (($buildertype eq "mgppbuilder") && $no_strip_html) {
-    $builder->set_strip_html(0);
-    }
-    if ($sections_index_document_metadata ne "never") {
-    $builder->set_sections_index_document_metadata($sections_index_document_metadata);
+    my $ext_prefix = &util::filename_cat($ENV{'GSDLHOME'}, "ext");
+    
+    my @extensions = split(/:/,$ENV{'GSDLEXTS'});
+    foreach my $e (@extensions) {
+        my $pm = "$e-builder.pm";
+        $pm =~ s/-(.)/\u$1/g;
+
+        my $extbuilderdir  = &util::filename_cat($ext_prefix,$e,"perllib");
+        my $full_pm = &util::filename_cat($extbuilderdir,$pm);
+                            
+        if (-e $full_pm) {
+        my ($extbuildertype) = ($pm =~ m/^(.*)\.pm$/);
+        push(@builderdir_list,$extbuilderdir);
+        push(@buildertype_list,$extbuildertype);
+        }
+    }
+    }
+
+    if (defined $ENV{'GSDL3EXTS'}) {
+    
+    my $ext_prefix = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "ext");
+    
+    my @extensions = split(/:/,$ENV{'GSDL3EXTS'});
+
+    foreach my $e (@extensions) {
+        my $pm = "$e-builder.pm";
+        $pm =~ s/-(.)/\u$1/g;
+
+        my $extbuilderdir  = &util::filename_cat($ext_prefix,$e,"perllib");
+        my $full_pm = &util::filename_cat($extbuilderdir,$pm);
+                            
+        if (-e $full_pm) {
+        my ($extbuildertype) = ($pm =~ m/^(.*)\.pm$/);
+        push(@builderdir_list,$extbuilderdir);
+        push(@buildertype_list,$extbuildertype);
+        }
+    }
+    }
+
+    # Set up array of the main builder.pm, followed by any ones
+    # from the extension folders
+    
+    my $num_builders = scalar(@buildertype_list);
+    my @builders = ();
+
+
+    for (my $i=0; $i<$num_builders; $i++) {
+    my $this_builder;
+    my $this_buildertype = $buildertype_list[$i];
+    my $this_builderdir  = $builderdir_list[$i];
+
+    require "$this_builderdir/$this_buildertype.pm";
+
+    eval("\$this_builder = new $this_buildertype(\$collection, " .
+         "\$realarchivedir, \$realbuilddir, \$verbosity, " .
+         "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_mode, " .
+         "\$remove_empty_classifications, " .
+         "\$out, \$no_text, \$faillog, \$gli)");
+    die "$@" if $@;
+
+    push(@builders,$this_builder);
+    }
+    
+    # Init phase for builders
+    for (my $i=0; $i<$num_builders; $i++) {
+    my $this_buildertype = $buildertype_list[$i];
+    my $this_builderdir  = $builderdir_list[$i];
+    my $this_builder     = $builders[$i];
+
+    $this_builder->init();
+    $this_builder->set_maxnumeric($maxnumeric);
+    
+    if (($this_buildertype eq "mgppbuilder") && $no_strip_html) {
+        $this_builder->set_strip_html(0);
+    }
+    if ($sections_index_document_metadata ne "never") {
+        $this_builder->set_sections_index_document_metadata($sections_index_document_metadata);
+    }
     }
         
+    # Run the requested passes
+
     if ($mode =~ /^all$/i) {
-    $builder->compress_text($textindex);
-    $builder->build_indexes($indexname);
-    $builder->make_infodatabase();
-    $builder->collect_specific();
+
+    # 'map' modifies the elements of the original array, so calling
+    # methods -- as done below -- will cause (by default) @builders
+    # to be changed to whatever these functions return (which is *not*
+    # what we want -- we want to leave the values unchanged) 
+    # => Use 'local' (dynamic scoping) to give each 'map' call its
+    #    own local copy This could also be done with: 
+    #      (my $new =$_)->method(); $new 
+    #    but is a bit more cumbersome to write
+
+    map { local $_=$_; $_->compress_text($textindex); } @builders;
+    map { local $_=$_; $_->build_indexes($indexname); } @builders;
+    map { local $_=$_; $_->make_infodatabase(); }  @builders;
+    map { local $_=$_; $_->collect_specific(); } @builders;
     } elsif ($mode =~ /^compress_text$/i) {
-    $builder->compress_text($textindex);
+    map { local $_=$_; $_->compress_text($textindex); } @builders;
     } elsif ($mode =~ /^build_index$/i) {
-    $builder->build_indexes($indexname);    
+    map { local $_=$_; $_->build_indexes($indexname); } @builders;
     } elsif ($mode =~ /^infodb$/i) {
-    $builder->make_infodatabase();
+    map { local $_=$_; $_->make_infodatabase(); } @builders;
     } else {
     (&gsprintf(STDERR, "{buildcol.unknown_mode}\n", $mode) && die);
     }
 
-    $builder->make_auxiliary_files() if !$debug;
-    $builder->deinit();
+    if (!$debug) {
+    map {local $_=$_; $_->make_auxiliary_files(); } @builders;
+    }
+    map {local $_=$_; $_->deinit(); } @builders;
     
     if (($realbuilddir ne $builddir) && !$debug) {
@@ -608 +691 @@
     print STDERR "</Build>\n" if $gli;
 }
-## main() ##
-
-
+
+
+