Changeset 10277

Timestamp:

2005-07-25T14:00:12+12:00 (19 years ago)

Author:

chi

Message:

tidy up the filename in add_file().

File:

• trunk/gsdl/perllib/plugins/HTMLPlug.pm (modified) (5 diffs)

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -118 +118 @@
     my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
     push(@$pluginlist, $class);
-
+    
     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+   
 
     my $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
-
+    
     if ($self->{'w3mir'}) {
     $self->{'file_is_url'} = 1;
     }
-    
     $self->{'aux_files'} = {};
     $self->{'dir_num'} = 0;
@@ -158 +158 @@
     
     my ($language, $encoding) = $self->textcat_get_language_encoding ($filename);
-    
+
     # read in file ($text will be in utf8)
     my $text = "";
@@ -212 +212 @@
       $file =~ s@(\\)+@/@g; 
     }
-
+    
     # reset per-doc stuff...
     $self->{'aux_files'} = {};
@@ -484 +484 @@
     # is an escape code following. (Macro parsing loses them...)
     $$textref =~ s/\\/\\\\/go;
+    
     $doc_obj->add_utf8_text($cursection, $$textref);
 }
@@ -572 +573 @@
 
     my $filename = $href;
-    $filename =~ s/^[^:]*:\/\///;
+    if ($base_dir eq "") {
+    # remove http:/ thereby leaving one slash at the start
+    $filename =~ s/^[^:]*:\///;
+    }
+    else {
+    # remove http://
+    $filename =~ s/^[^:]*:\/\///;
+    }
+
     $filename = &util::filename_cat($base_dir, $filename);