Changeset 27375 for main

Timestamp:

2013-05-21T14:44:13+12:00 (11 years ago)

Author:

jmt12

Message:

Replaced a conditional add to INC with the call to the new function in util.pm

File:

• main/trunk/greenstone2/perllib/classify.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/classify.pm

@@ -97 +97 @@
     my $classify_number  = 1;
 
-    my $colclassdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"perllib/classify");
     # - ensure colclassdir doesn't already exist in INC before adding, other-
     # wise we risk clobbering classifier inheritence implied by order of paths
     # in INC [jmt12]
-    my $inc_paths = join(':',@INC); 
-    
-    $colclassdir = &FileUtils::filenameConcatenate($colclassdir); # no mix of / and \ slashes, only OS-specific slash
-    $colclassdir = &util::filename_to_regex($colclassdir); # to regex protect windows filepaths 
-    # Normalise slashes in INC filepaths: ensure it has slashes going the same way as $colclassdir
-    # and further doesn't have a mix of / and \ slashes.
-    $inc_paths = &FileUtils::filenameConcatenate($inc_paths); 
-    print STDERR "**** INC: $colclassdir | $inc_paths\n";
-    if ($inc_paths !~ m@$colclassdir@)
-    {
-      unshift (@INC, $colclassdir);
-    }
+    my $colclassdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"perllib/classify");
+    &util::augmentINC($colclassdir);
 
     foreach my $classifyoption (@$classify_list) {