Changeset 1010

Timestamp:

2000-03-03T16:38:09+13:00 (24 years ago)

Author:

sjboddie

Message:

renamed old html module ghtml -- it clashed with builtin html module
on windows

Location:

trunk/gsdl/perllib

Files:

• basedoc.pm (modified) (2 diffs)
• ghtml.pm (added)
• html.pm (deleted)
• plugins/GMLPlug.pm (modified) (1 diff)
• plugins/HBPlug.pm (modified) (2 diffs)
• plugins/HTMLPlug.pm (modified) (2 diffs)
• webpageutil.pm (modified) (3 diffs)

trunk/gsdl/perllib/basedoc.pm

@@ -35 +35 @@
 use unicode;
 use util;
-use html;
+use ghtml;
 ##use hashdoc;
 
@@ -723 +723 @@
     my $self = shift (@_);
     my ($real_filename, $assoc_filename, $mime_type, $section) = @_;
-    $mime_type = &html::guess_mime_type ($real_filename) unless defined $mime_type;
+    $mime_type = &ghtml::guess_mime_type ($real_filename) unless defined $mime_type;
 
     # remove all associated files with the same name

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -29 +29 @@
 package GMLPlug;
 
-use html;
 use BasPlug;
 use util;

trunk/gsdl/perllib/plugins/HBPlug.pm

@@ -29 +29 @@
 
 use plugin;
-use html;
+use ghtml;
 use BasPlug;
 use util;
@@ -104 +104 @@
     # convert any alphanumeric character entities to their extended
     # ascii equivalent for indexing purposes
-    &html::convertcharentities ($line);
+    &ghtml::convertcharentities ($line);
 
     $$text .= $line;

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -39 +39 @@
 
 use BasPlug;
-use html;
+use ghtml;
 use util;
 use parsargv;
@@ -231 +231 @@
     if (($rl == 0) || ($filename =~ /$self->{'process_exp'}/) || 
     ($href =~ /\/$/) || ($href =~ /^(mailto|news|gopher|nntp|telnet|javascript):/i)) {
-    &html::urlsafe ($href);
+    &ghtml::urlsafe ($href);
     return $front . "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part . $back;
     

trunk/gsdl/perllib/webpageutil.pm

@@ -1 +1 @@
 package webpageutil;
 
-require html;
+use ghtml;
 
 sub error_location
@@ -7 +7 @@
     my ($args,$text) = @_;
 
-    &html::urlsafe($text);
+    &ghtml::urlsafe($text);
     my $mess_url = "$args->{'httpbuild'}&bca=mess&head=_headerror_";
     print "Location: $mess_url&mess=$text\n\n";
@@ -16 +16 @@
     my ($args,$text,$tmpname,$bc1finished) = @_;
 
-    &html::urlsafe($text);    
+    &ghtml::urlsafe($text);    
     my $mess_url = "$args->{'httpbuild'}&bca=buildstatus";
     $mess_url .= "&bc1tmpfilename=$tmpname&bc1finished=$bc1finished";