Changeset 14270 for gsdl/branches/gsdl-2.74/perllib/classify.pm

Timestamp:

2007-07-25T13:37:52+12:00 (17 years ago)

Author:

oranfry

Message:

merged selected changes to the gsdl trunk since r14217 into the 2.74 branch

File:

• gsdl/branches/gsdl-2.74/perllib/classify.pm (modified) (1 diff)

gsdl/branches/gsdl-2.74/perllib/classify.pm

@@ -49 +49 @@
 
     # find the classifier
-    my $customclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'},
+    my $customclassname;
+    if (defined($ENV{'GSDLCOLLECTION'}))
+    {
+    $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; }
+    if (defined($customclassname) && -e $customclassname) { require $customclassname; }
     elsif (-e $colclassname) { require $colclassname; }
     elsif (-e $mainclassname) { require $mainclassname; }