Changeset 14112
- Timestamp:
- 2007-05-30T17:55:36+12:00 (17 years ago)
- Location:
- trunk/gsdl/perllib
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/perllib/basebuilder.pm
r14022 r14112 26 26 package basebuilder; 27 27 28 use strict; 29 no strict 'refs'; # allow filehandles to be variables and viceversa 30 28 31 use classify; 29 32 use cfgread; … … 56 59 $outhandle, $no_text, $failhandle, $gli) = @_; 57 60 58 $outhandle = STDERR unless defined $outhandle;61 $outhandle = *STDERR unless defined $outhandle; 59 62 $no_text = 0 unless defined $no_text; 60 $failhandle = STDERR unless defined $failhandle;63 $failhandle = *STDERR unless defined $failhandle; 61 64 62 65 # create a builder object … … 80 83 $self->{'gli'} = 0 unless defined $self->{'gli'}; 81 84 82 # read in the collection configuration file 83 my $colcfgname = "$ENV{'GSDLCOLLECTDIR'}/etc/collect.cfg"; 84 if (-e $colcfgname) { 85 $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname); 86 $gs_mode = "gs2"; 87 } 88 else { 89 my $colcfgname = "$ENV{'GSDLCOLLECTDIR'}/etc/collectionConfig.xml"; 90 if (!-e $colcfgname) { 91 die "mgbuilder::new - couldn't find collect.cfg for collection $collection\n"; 92 } 93 else { 85 # Read in the collection configuration file. 86 my ($colcfgname); 87 ($colcfgname, $gs_mode) = &colcfg::get_collect_cfg_name($outhandle); 88 if ($gs_mode eq "gs2") { 89 $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname); 90 } elsif ($gs_mode eq "gs3") { 94 91 $self->{'collect_cfg'} = &colcfg::read_collection_cfg_xml ($colcfgname); 95 $gs_mode = "gs3";96 }97 92 } 98 93 … … 192 187 my ($buildprocdir, $buildproctype); 193 188 my $collection = $self->{'collection'}; 194 if (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}buildproc.pm") { 189 if (-e "$ENV{'GSDLCOLLECTDIR'}/custom/${collection}/perllib/custombuildproc.pm") { 190 $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/custom/${collection}/perllib"; 191 $buildproctype = "custombuildproc"; 192 } elsif (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/custombuildproc.pm") { 193 $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/perllib"; 194 $buildproctype = "custombuildproc"; 195 } elsif (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}buildproc.pm") { 195 196 $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/perllib"; 196 197 $buildproctype = "${collection}buildproc"; … … 338 339 my ($handle); 339 340 if ($self->{'debug'}) { 340 $handle = STDOUT;341 $handle = *STDOUT; 341 342 } else { 342 343 if (!-e "$txt2db_exe" || !open (PIPEOUT, "| txt2db$exe \"$fulldbname\"")) { … … 344 345 die "builder::make_infodatabase - couldn't run $txt2db_exe\n"; 345 346 } 346 $handle = basebuilder::PIPEOUT;347 $handle = *PIPEOUT; 347 348 } 348 349 -
trunk/gsdl/perllib/classify.pm
r13933 r14112 49 49 50 50 # find the classifier 51 my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 52 "perllib/classify", 53 "${classifier}.pm"); 54 my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'}, 55 "perllib/classify", 56 "${classifier}.pm"); 57 58 if (-e $colclassname) { require $colclassname; } 51 my $customclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 52 "perllib", "classify", "${classifier}.pm"); 53 my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "classify", "${classifier}.pm"); 54 my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'}, "perllib", "classify", "${classifier}.pm"); 55 56 if (-e $customclassname) { require $customclassname; } 57 elsif (-e $colclassname) { require $colclassname; } 59 58 elsif (-e $mainclassname) { require $mainclassname; } 60 59 else { … … 84 83 85 84 # find the classifier 86 my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/classify", 87 "${classname}.pm"); 88 my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/classify", 89 "${classname}.pm"); 90 91 if (-e $colclassname) { require $colclassname; } 85 my $customclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 86 "perllib", "classify", "${classname}.pm"); 87 my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "classify", "${classname}.pm"); 88 my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'}, "perllib", "classify", "${classname}.pm"); 89 90 if (-e $customclassname) { require $customclassname; } 91 elsif (-e $colclassname) { require $colclassname; } 92 92 elsif (-e $mainclassname) { require $mainclassname; } 93 93 else { &gsprintf(STDERR, "{classify.could_not_find_classifier}\n", $classname) && die "\n"; 94 94 # die "ERROR - couldn't find classifier \"$classname\"\n"; 95 95 } 96 96 97 97 # create the classify object -
trunk/gsdl/perllib/colcfg.pm
r14023 r14112 30 30 use cfgread; 31 31 use cfgread4gs3; 32 use gsprintf 'gsprintf'; 32 33 use strict; 33 34 … … 160 161 } 161 162 163 sub get_collect_cfg_name { 164 my ($out) = @_; 165 166 # First check if there's a 167 # gsdl/collect/COLLECTION/custom/COLLECTION/etc/collect.cfg file. This 168 # customization was added for DLC by Stefan, 30/6/2007. 169 my $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "collect.cfg"); 170 171 if (-e $configfilename) { 172 return ($configfilename, "gs2"); 173 } 174 175 # Now check if there is a collect.cfg file in the usual place, i.e. it is gs2. 176 $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg"); 177 if (-e $configfilename) { 178 return ($configfilename, "gs2"); 179 } 180 181 # If we get to here we check if there is a collectionConfig.xml file, 182 # i.e. it is gs3. 183 $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml"); 184 if (-e $configfilename) { 185 return ($configfilename, "gs3"); 186 } 187 188 # Error. No collection configuration file. 189 (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die); 190 } 191 162 192 1; 163 193 -
trunk/gsdl/perllib/plugin.pm
r13933 r14112 48 48 49 49 # find the plugin 50 my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins", 50 my $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 51 'perllib', 'plugins', "${pluginname}.pm"); 52 my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugins', 51 53 "${pluginname}.pm"); 52 my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, "perllib/plugins",54 my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugins', 53 55 "${pluginname}.pm"); 54 if (-e $colplugname) { require $colplugname; } 56 if (-e $customplugname) { require $customplugname; } 57 elsif (-e $colplugname) { require $colplugname; } 55 58 elsif (-e $mainplugname) { require $mainplugname; } 56 59 else { … … 91 94 92 95 # find the plugin 93 my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins", 96 my $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 97 'perllib', 'plugins', "${pluginname}.pm"); 98 my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugins', 94 99 "${pluginname}.pm"); 95 my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, "perllib/plugins",100 my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugins', 96 101 "${pluginname}.pm"); 97 if (-e $colplugname) { require $colplugname; } 102 if (-e $customplugname) { require $customplugname; } 103 elsif (-e $colplugname) { require $colplugname; } 98 104 elsif (-e $mainplugname) { require $mainplugname; } 99 105 else {
Note:
See TracChangeset
for help on using the changeset viewer.