Changeset 27482 for main

Timestamp:

2013-05-27T12:50:19+12:00 (11 years ago)

Author:

jmt12

Message:

Replace slash replacement regexs with a call the FileUtils::sanitizePath() which does a much better job of preserving file protocols

Location:

main/trunk/greenstone2/perllib

Files:

• buildcolutils.pm (modified) (2 diffs)
• inexport.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -273 +273 @@
   }
   # End Mod
-  $self->{'archivedir'} =~ s/[\\\/]+/\//g;
-  $self->{'archivedir'} =~ s/\/$//;
+  $self->{'archivedir'} = &FileUtils::sanitizePath($self->{'archivedir'});
+  #$self->{'archivedir'} =~ s/[\\\/]+/\//g;
+  #$self->{'archivedir'} =~ s/\/$//;
 
   # - resolve (and possibly set to default) builddir
@@ -290 +291 @@
   }
   # - why don't we make builddir absolute similar to archivedir?
-  $self->{'builddir'} =~ s/[\\\/]+/\//g;
-  $self->{'builddir'} =~ s/\/$//;
+  $self->{'builddir'} = &FileUtils::sanitizePath($self->{'builddir'});
+  #$self->{'builddir'} =~ s/[\\\/]+/\//g;
+  #$self->{'builddir'} =~ s/\/$//;
 
   if (defined $collectcfg->{'cachedir'} && $self->{'cachedir'} eq "")

main/trunk/greenstone2/perllib/inexport.pm

@@ -274 +274 @@
     }
 
-    # @todo &FileUtils::sanitizePath($archivedir) [jmt12]
-    $archivedir =~ s/[\\\/]+/\//g;
-    $archivedir =~ s/\/$//;
+    $archivedir = &FileUtils::sanitizePath($archivedir)
+    #$archivedir =~ s/[\\\/]+/\//g;
+    #$archivedir =~ s/\/$//;
     $self->{'archivedir'} = $archivedir;
 
@@ -441 +441 @@
     }
 
-    $self->{'manifest'} =~ s/[\\\/]+/\//g;
-    $self->{'manifest'} =~ s/\/$//;
+        $self->{'manifest'} = &FileUtils::sanitizePath($self->{'manifest'});
+    #$self->{'manifest'} =~ s/[\\\/]+/\//g;
+    #$self->{'manifest'} =~ s/\/$//;
 
     $manifest_lookup->parse($manifest_filename);