Changeset 1929

Timestamp:

2001-02-08T14:21:17+13:00 (23 years ago)

Author:

dg5

Message:

Modified: ConvertToPlug and HTMLPlug to handle files in binary mode to avoid

the problem of '\n' under Windows.

Location:

trunk/gsdl/perllib/plugins

Files:

• ConvertToPlug.pm (modified) (1 diff)
• HTMLPlug.pm (modified) (9 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -227 +227 @@
     my $tmp_dirname = File::Basename::dirname($conv_filename);
     my $tmp_tailname = File::Basename::basename($conv_filename);
-
+    
     my $convert_to = $self->{'convert_to'};
     my $ret_val;    

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -158 +158 @@
 
     # trap images
+
     $$textref =~ s/(<img[^>]*?src\s*=\s*\"?)([^\">\s]+)(\"?[^>]*>)/
     $self->replace_images ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
@@ -174 +175 @@
     my ($front, $link, $back, $base_dir, 
     $file, $doc_obj, $section) = @_;
-
+    
     $link =~ s/\n/ /g;
-    
     my ($href, $hash_part, $rl) = $self->format_link ($link, $base_dir, $file);
     return $front . $self->add_file ($href, $rl, $hash_part, $base_dir, $doc_obj, $section) . $back;
@@ -235 +235 @@
     $filename =~ s/^[^:]*:\/\///;
     $filename = &util::filename_cat($base_dir, $filename);
-
+    
     my ($ext) = $filename =~ /(\.[^\.]*)$/;
 
@@ -267 +267 @@
 
     my ($before_hash, $hash_part) = $link =~ /^([^\#]*)(\#?.*)$/;
+
     $hash_part = "" if !defined $hash_part;
     if (!defined $before_hash || $before_hash !~ /[\w\.\/]/) {
@@ -277 +278 @@
     if ($before_hash =~ s/^((?:http|ftp|file):\/\/)//i) {
     my $type = $1;
-           
+
     if ($link =~ /^(http|ftp):/i) {
         # Turn url (using /) into file name (possibly using \ on windows)
@@ -299 +300 @@
     
     } elsif ($link !~ /^(mailto|news|gopher|nntp|telnet|javascript):/i) {
-
-    if ($before_hash =~ s/^\///) {
+    if ($before_hash =~ s/^\/// || $before_hash =~ /\\/) {
+
         # the first directory will be the domain name if w3mir was used
         # to generate archives, otherwise we'll assume all files are
         # from the same site and base_dir is the root
+            # This is not called in Windows
         if ($self->{'w3mir'}) {
         my @dirs = split /[\/\\]/, $file;
@@ -314 +316 @@
         # see if link shares directory with source document
         # => turn into relative link if this is so!
-        my $before_hash_fix = &util::filename_cat("",$before_hash);
-        $before_hash_fix =~ s/^$base_dir(\\|\/)//;
+        my $before_hash_fix = "";
+        
+        # filename_cat appends / or \ to the beginning of the
+        # file pathname but in Windows we don't want to do that
+        if ($ENV{'GSDLOS'} =~ /^windows/i) {
+            $before_hash_fix = $before_hash;
+        }
+        else {
+            $before_hash_fix = &util::filename_cat("",$before_hash);
+        }
+
+        my $base_dir_win_match = $base_dir;
+        $base_dir_win_match =~ s/\\/\\\\/g;
+
+        $before_hash_fix =~ s/^$base_dir_win_match(\\|\/)//;
         $before_hash = $before_hash_fix;
 
         }
-
 
     } else {
@@ -328 +342 @@
     }
 
-
     my $linkfilename = &util::filename_cat ($base_dir, $before_hash); 
 
@@ -335 +348 @@
         $before_hash .= "/" if (-d $linkfilename);
     }
-
+    
     return ("http://" . $before_hash, $hash_part, 1);