Changeset 24463

Timestamp:

2011-08-24T16:17:19+12:00 (13 years ago)

Author:

davidb

Message:

More careful/restricted inclusion of builder classes from extension folder

File:

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

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

@@ -369 +369 @@
 
     # Read in the collection configuration file.
-    my ($collectcfg, $buildtype); 
+    my ($collectcfg, $buildtype, $orthogonalbuildtypes); 
     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
     $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
@@ -394 +394 @@
     $buildtype = "mg"; #mg is the default
     }
+
+    if (defined $collectcfg->{'orthogonalbuildtypes'}) {
+    $orthogonalbuildtypes = $collectcfg->{'orthogonalbuildtypes'};
+    }
+
     if (defined $collectcfg->{'archivedir'} && $archivedir eq "") {
     $archivedir = $collectcfg->{'archivedir'};
@@ -564 +569 @@
     my @buildertype_list = ($buildertype);
     
-    if (defined $ENV{'GSDLEXTS'}) {
-    
-    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);
-        }
+    if (defined $orthogonalbuildtypes) {
+    foreach my $obt (@$orthogonalbuildtypes) {
+
+        push(@builderdir_list,undef); # rely on @INC to find it
+        push(@buildertype_list,$obt."Builder");
     }
     }