Changeset 14112 for trunk/gsdl/perllib/classify.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/classify.pm (modified) (2 diffs)

trunk/gsdl/perllib/classify.pm

@@ -49 +49 @@
 
     # find the classifier
-    my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},
-                       "perllib/classify", 
-                       "${classifier}.pm");
-    my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'},
-                        "perllib/classify", 
-                        "${classifier}.pm");
-
-    if (-e $colclassname) { require $colclassname; }
+    my $customclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'},
+                                              "perllib", "classify", "${classifier}.pm");
+    my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "classify", "${classifier}.pm");
+    my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'}, "perllib", "classify", "${classifier}.pm");
+
+    if (-e $customclassname) { require $customclassname; }
+    elsif (-e $colclassname) { require $colclassname; }
     elsif (-e $mainclassname) { require $mainclassname; }
     else { 
@@ -84 +83 @@
 
     # find the classifier
-    my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/classify", 
-                           "${classname}.pm");
-    my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/classify", 
-                        "${classname}.pm");
-
-    if (-e $colclassname) { require $colclassname; }
+        my $customclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'},
+                                                  "perllib", "classify", "${classname}.pm");
+        my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "classify", "${classname}.pm");
+        my $mainclassname = &util::filename_cat($ENV{'GSDLHOME'}, "perllib", "classify", "${classname}.pm");
+
+    if (-e $customclassname) { require $customclassname; }
+    elsif (-e $colclassname) { require $colclassname; }
     elsif (-e $mainclassname) { require $mainclassname; }
     else { &gsprintf(STDERR, "{classify.could_not_find_classifier}\n", $classname) && die "\n";
            # die "ERROR - couldn't find classifier \"$classname\"\n";
-       }
+        }
 
     # create the classify object