Changeset 27703 for main/trunk

Timestamp:

2013-06-25T16:36:58+12:00 (11 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the final diffcol issue with Small-HTML on windows where links in the body of the text had backslashes on Windows. They needed to be linux style slashes. The code change and logic was slightly more complicated as the links were used to test whether referenced files existed on the file system and were therefore relative (to the GS collection) or external links.

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

@@ -796 +796 @@
     my $img_file =  $self->add_file ($href, $rl, $hash_part, $base_dir, $doc_obj, $section);
 
-#    print STDERR "**** link = $link\n**** href = $href\n**** img_file = $img_file, rl = $rl\n";
+#    print STDERR "**** link = $link\n**** href = $href\n**** img_file = $img_file, rl = $rl\n\n";
 
     my $anchor_name = $img_file;
@@ -980 +980 @@
     $filename =~ s/^[^:]*:\/\///;
     }
-
+    
+    if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
+        $filename =~ s@\/@\\@g;
+    }
+    
     $filename = &FileUtils::filenameConcatenate($base_dir, $filename);
 
@@ -1129 +1133 @@
     if ($before_hash =~ s@^((?:http|https|ftp|file|mms)://)@@i) {
         my $type = $1;
-
+        my $before_hash_file = $before_hash;
+        
     if ($link =~ m/^(http|ftp):/i) {
+        
         # Turn url (using /) into file name (possibly using \ on windows)
-        my @http_dir_split = split('/', $before_hash);
-        $before_hash = &FileUtils::filenameConcatenate(@http_dir_split);
-    }
-
-    $before_hash = $self->eval_dir_dots($before_hash);
-    
-    my $linkfilename = &FileUtils::filenameConcatenate($base_dir, $before_hash);
+        my @http_dir_split = split('/', $before_hash_file);
+        $before_hash_file = &FileUtils::filenameConcatenate(@http_dir_split);       
+    }
+    
+    # want to maintain two version of "before_hash": one representing the URL, the other using filesystem specific directory separator
+    $before_hash_file = $self->eval_dir_dots($before_hash_file);
+    my $before_hash_url = $before_hash_file;
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+        $before_hash_url =~ s@\\@\/@g;
+    }
+    
+    my $linkfilename = &FileUtils::filenameConcatenate($base_dir, $before_hash_file);
     
     my $rl = 0;
@@ -1144 +1155 @@
 
     # make sure there's a slash on the end if it's a directory
-    if ($before_hash !~ m/\/$/) {
-        $before_hash .= "/" if (-d $linkfilename);
-    }
-    return ($type . $before_hash, $hash_part, $rl);
+    if ($before_hash_url !~ m/\/$/) {
+        $before_hash_url .= "/" if (-d $linkfilename);
+    }
+    return ($type . $before_hash_url, $hash_part, $rl);
     
     } elsif ($link !~ m/^(mailto|news|gopher|nntp|telnet|javascript):/i && $link !~ m/^\//) {
@@ -1191 +1202 @@
         my $dirname = &File::Basename::dirname($file);
         $before_hash = &FileUtils::filenameConcatenate($dirname, $before_hash);
-        $before_hash = $self->eval_dir_dots($before_hash);              
+        $before_hash = $self->eval_dir_dots($before_hash);   
+        $before_hash =~ s@\\@/@g; # for windows         
     }