Changeset 24459 for main

Timestamp:

2011-08-24T15:50:52+12:00 (13 years ago)

Author:

davidb

Message:

Code changes to support indexers that are provided through the extension mechanism

File:

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

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

@@ -548 +548 @@
     } else {    
 
-    $builderdir = "$ENV{'GSDLHOME'}/perllib";
-    if ($buildtype eq "lucene") {
-        $buildertype = "lucenebuilder";
-    }
-    elsif ($buildtype eq "mgpp") {
+    $builderdir = undef;
+    if ($buildtype ne "") {
+        # caters for extension-based build types, such as 'solr'
+        $buildertype = $buildtype."builder";
+    }
+    else {
+        # Default to mgpp
         $buildertype = "mgppbuilder";
-    }
-    else {
-        $buildertype = "mgbuilder";
     }
     }
@@ -618 +617 @@
     my $this_builderdir  = $builderdir_list[$i];
 
-    require "$this_builderdir/$this_buildertype.pm";
+    if ((defined $this_builderdir) && ($this_builderdir ne "")) {
+        require "$this_builderdir/$this_buildertype.pm";
+    }
+    else {
+        require "$this_buildertype.pm";
+    }
 
     eval("\$this_builder = new $this_buildertype(\$collection, " .
@@ -659 +663 @@
     #      (my $new =$_)->method(); $new 
     #    but is a bit more cumbersome to write
-
+    
     map { local $_=$_; $_->compress_text($textindex); } @builders;
     map { local $_=$_; $_->build_indexes($indexname); } @builders;