[Date Index][Thread Index]
[Date Prev][Date Next][Thread Prev][Thread Next]
My previous patch...
- From: Thomas Akin <nospam@thanx>
- Date: Thu, 28 Oct 1999 17:10:58 -0400
Denis,
In the previous patch that I sent you I have a debug
print statement still left in des/imgdot.src that
caused "base=images/whatever" to show up in your web
pages... This patch has that statement removed...
Sorry,
Thomas
--
---------------------------------------------------------------
Thomas Akin Kennesaw State University
Networking Instructor Continuing Education
CNX, CSA, ICS 1000 Chastain Road
takin@kennesaw.edu Kennesaw, GA 30144-5591
---------------------------------------------------------------
--------------------- cut here --------------------------------
Index: wml-1.7.4/wml_include/des/gfont.src
*** wml-1.7.4/wml_include/des/gfont.src Tue Sep 21 09:37:55 1999
--- wml-1.7.4.1/wml_include/des/gfont.src Wed Oct 27 17:55:08 1999
***************
*** 29,40 ****
<set-var notag=*>
<set-var %attributes>
<defvar base
<or <get-var GFONT_BASE>
! <match <get-var WML_SRC_FILENAME>
! "\\.[a-zA-Z0-9]+$" action=delete>>>
<:
{
# import attributes to ePerl
my $base = "<get-var base>";
my $color = "<get-var color>";
my $bgcolor = "<get-var bgcolor>";
--- 29,43 ----
<set-var notag=*>
<set-var %attributes>
+ <defvar srcfile <match <get-var WML_SRC_FILENAME>
+ "\\.[a-zA-Z0-9]+$" action=delete>>
<defvar base
<or <get-var GFONT_BASE>
! <or <get-var IMGBASE>
! <get-var srcfile>>>>
<:
{
# import attributes to ePerl
my $base = "<get-var base>";
+ my $srcfile = "<get-var srcfile>";
my $color = "<get-var color>";
my $bgcolor = "<get-var bgcolor>";
***************
*** 53,57 ****
# create the output filename
if ($base ne '') {
! $base .= '/' if (-d $base);
}
if ($file eq '') {
--- 56,60 ----
# create the output filename
if ($base ne '') {
! $base .= "/$srcfile" if (-d $base);
}
if ($file eq '') {
Index: wml-1.7.4/wml_include/des/imgbg.src
*** wml-1.7.4/wml_include/des/imgbg.src Mon Sep 20 09:12:33 1999
--- wml-1.7.4.1/wml_include/des/imgbg.src Wed Oct 27 17:56:30 1999
***************
*** 88,98 ****
<preserve content>
<set-var %attributes>
<defvar base
<or <get-var BGIMG_BASE>
! <match <get-var WML_SRC_FILENAME>
! "\\.[a-zA-Z0-9]+$" action=delete>>>
<:
# import attributes to ePerl
$base = qq|<get-var base>|;
$direction = qq|<get-var direction>|;
$content = qq|<get-var content>|;
--- 88,101 ----
<preserve content>
<set-var %attributes>
+ <defvar srcfile <match <get-var WML_SRC_FILENAME>
+ "\\.[a-zA-Z0-9]+$" action=delete>>
<defvar base
<or <get-var BGIMG_BASE>
! <or <get-var IMGBASE>
! <get-var srcfile>>>>
<:
# import attributes to ePerl
$base = qq|<get-var base>|;
+ $srcfile = qq|<get-var srcfile>|;
$direction = qq|<get-var direction>|;
$content = qq|<get-var content>|;
***************
*** 100,104 ****
# determine parameter values
if ($base ne '') {
! $base .= '/' if (-d $base);
}
$direction = 'h' if ($direction eq '');
--- 103,107 ----
# determine parameter values
if ($base ne '') {
! $base .= "/$srcfile" if (-d $base);
}
$direction = 'h' if ($direction eq '');
Index: wml-1.7.4/wml_include/des/imgdot.src
*** wml-1.7.4/wml_include/des/imgdot.src Mon Sep 20 09:12:33 1999
--- wml-1.7.4.1/wml_include/des/imgdot.src Wed Oct 27 17:36:48 1999
***************
*** 44,54 ****
<set-var noscale=*>
<set-var %attributes>
<defvar base
<or <get-var IMGDOT_BASE>
! <match <get-var WML_SRC_FILENAME>
! "\\.[a-zA-Z0-9]+$" action=delete>>>
<:
# import attributes to ePerl
$base = qq|<get-var base>|;
$width = qq|<get-var width>|;
$height = qq|<get-var height>|;
--- 44,57 ----
<set-var noscale=*>
<set-var %attributes>
+ <defvar srcfile <match <get-var WML_SRC_FILENAME>
+ "\\.[a-zA-Z0-9]+$" action=delete>>
<defvar base
<or <get-var IMGDOT_BASE>
! <or <get-var IMGBASE>
! <get-var srcfile>>>>
<:
# import attributes to ePerl
$base = qq|<get-var base>|;
+ $srcfile = qq|<get-var srcfile>|;
$width = qq|<get-var width>|;
$height = qq|<get-var height>|;
***************
*** 76,81 ****
# create the actual GIF image file
if ($base ne '') {
! $base .= '/' if (-d $base);
}
$file = &imgdot($base, $x, $y, $c, $r, $g, $b, $transp);
--- 79,85 ----
# create the actual GIF image file
if ($base ne '') {
! $base .= "/$srcfile" if (-d $base);
}
$file = &imgdot($base, $x, $y, $c, $r, $g, $b, $transp);
Index: wml-1.7.4/wml_include/std/logo.src
*** wml-1.7.4/wml_include/std/logo.src Tue Sep 28 05:27:43 1999
--- wml-1.7.4.1/wml_include/std/logo.src Wed Oct 27 17:58:03 1999
***************
*** 16,26 ****
<set-var %attributes>
<defvar name wml>
<defvar base
<or <get-var LOGO_BASE>
! <match <get-var WML_SRC_FILENAME>
! "\\.[a-zA-Z0-9]+$" action=delete>>>
<:
my $name = "<get-var name>";
my $base = "<get-var base>";
my $file = "<get-var file>";
my $target = "<get-var target>";
--- 16,29 ----
<set-var %attributes>
<defvar name wml>
+ <defvar srcfile <match <get-var WML_SRC_FILENAME>
+ "\\.[a-zA-Z0-9]+$" action=delete>>
<defvar base
<or <get-var LOGO_BASE>
! <or <get-var IMGBASE>
! <get-var srcfile>>>>
<:
my $name = "<get-var name>";
my $base = "<get-var base>";
+ my $srcfile= "<get-var srcfile>";
my $file = "<get-var file>";
my $target = "<get-var target>";
***************
*** 38,42 ****
if ($file eq '') {
if ($base ne '') {
! $base .= '/' if (-d $base);
}
$file = sprintf("%s.logo-%s.gif", $base, $name);
--- 41,45 ----
if ($file eq '') {
if ($base ne '') {
! $base .= "/$srcfile" if (-d $base);
}
$file = sprintf("%s.logo-%s.gif", $base, $name);
______________________________________________________________________
Website META Language (WML) www.engelschall.com/sw/wml/
Official Support Mailing List sw-wml@engelschall.com
Automated List Manager majordomo@engelschall.com