Changeset 27334

Timestamp:

2013-05-14T15:44:52+12:00 (11 years ago)

Author:

kjdon

Message:

2 bugfixes that broke the building process.

Location:

main/trunk/greenstone2/perllib

Files:

• classify.pm (modified) (1 diff)
• inexport.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/classify.pm

@@ -101 +101 @@
     # wise we risk clobbering classifier inheritence implied by order of paths
     # in INC [jmt12]
-    my $inc_paths = join(':',@INC);
-    if ($inc_paths !~ /$colclassdir/)
+    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);

main/trunk/greenstone2/perllib/inexport.pm

@@ -476 +476 @@
     if (&FileUtils::directoryExists($tmpdir)) {
         &gsprintf($out, "{import.removing_tmpdir}\n");
-        &FileUtils::removeFileRecursive($tmpdir);
+        &FileUtils::removeFilesRecursive($tmpdir);
     }
     }