Changeset 14112 for trunk/gsdl/perllib/colcfg.pm

Timestamp:

2007-05-30T17:55:36+12:00 (17 years ago)

Author:

sjboddie

Message:

More modifications to support additional collection-level customisations
to be put in gsdl/collect/COLLECTION/custom/COLLECTION. basebuilder.pm,
classify.pm, colcfg.pm, and plugin.pm were modified to allow
collection-specific plugins, classifiers, builders, and buildprocs to
be located in the new locations. These changes should not have any effect
on existing collections.

File:

• trunk/gsdl/perllib/colcfg.pm (modified) (2 diffs)

trunk/gsdl/perllib/colcfg.pm

@@ -30 +30 @@
 use cfgread;
 use cfgread4gs3;
+use gsprintf 'gsprintf';
 use strict;
 
@@ -160 +161 @@
 }
 
+sub get_collect_cfg_name {
+    my ($out) = @_;
+
+    # First check if there's a
+    # gsdl/collect/COLLECTION/custom/COLLECTION/etc/collect.cfg file. This
+    # customization was added for DLC by Stefan, 30/6/2007.
+    my $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, "etc", "collect.cfg");
+
+    if (-e $configfilename) {
+        return ($configfilename, "gs2");
+    }
+
+    # Now check if there is a collect.cfg file in the usual place, i.e. it is gs2.
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
+    if (-e $configfilename) {
+        return ($configfilename, "gs2");
+    }
+
+    # If we get to here we check if there is a collectionConfig.xml file,
+    # i.e. it is gs3.
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");    
+    if (-e $configfilename) {
+        return ($configfilename, "gs3");
+    }
+
+    # Error. No collection configuration file.
+    (&gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die);
+}
+
 1;