From 785f7f7e250c90d6bb415cbe7b9b5a1cfb4ff19c Mon Sep 17 00:00:00 2001
From: short <>
Date: Tue, 8 Mar 2005 23:01:37 +0000
Subject: [PATCH] -$W->{"head_css"} as CSS is now always external. &url_out:
Overwrite given args over persistent ones, prevent multiplicity.
$W->{"body_attr_sub"} replaced by $W->{"body_attr"}. Inlined CSS moved out
to: /My/Web.css
---
Web.pm | 48 ++++++++++++++----------------------------------
1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/Web.pm b/Web.pm
index 99c0e0b..6b42e82 100644
--- a/Web.pm
+++ b/Web.pm
@@ -87,7 +87,6 @@ use URI::QueryParam;
#our $W;
# $W->{"title"}
# $W->{"head"}
- # $W->{"head_css"}
# $W->{"force_charset"}
# $W->{"heading_done"}
# $W->{"footer_passed"}
@@ -122,7 +121,7 @@ my($class,%args)=@_;
do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer_ids");
do { $W->{$_}=1 if !defined $W->{$_}; } for ("indexme");
do { $W->{$_}="" if !defined $W->{$_}; } for ("head");
- do { $W->{$_}="" if !defined $W->{$_}; } for ("head_css");
+ do { $W->{$_}="" if !defined $W->{$_}; } for ("body_attr");
do { $W->{$_}="en-US" if !defined $W->{$_}; } for ("language");
my $footer_any=0;
@@ -431,11 +430,15 @@ my($url,%args)=@_;
$url=top_dir($url,%args) if $url=~m#^/# || $args{"abs"};
my $uri=URI->new($url);
- for my $key (keys(%{$W->{"args_persistent"}})) {
- my $val=$W->{"args"}{$key};
- next if !defined $val;
- $uri->query_param_append($key=>$val);
- }
+ # Prefer the $uri values over "args_persistent" values.
+ $uri->query_form_hash({
+ map({
+ my $key=$_;
+ my $val=$W->{"args"}{$key};
+ (!defined $val ? () : ($key=>$val));
+ } keys(%{$W->{"args_persistent"}})),
+ %{$uri->query_form_hash()},
+ });
$url="".$uri;
return $url;
@@ -725,35 +728,12 @@ my($class)=@_;
$title=~s#<[^>]*>##g;
Wprint "";
Wprint "$title\n";
-
if ($W->{"have_css"}) {
- Wprint <<'HERE';
-\n";
}
-
Wprint ''."\n";
Wprint $W->{"head"};
for my $type (qw(prev next index contents start up)) {
@@ -762,7 +742,7 @@ HERE
Wprint "{"browser"}->netscape() && (!$W->{"browser"}->major() || $W->{"browser"}->major()<=4);
- do { &{$_}($W) if $_; } for $W->{"body_attr_sub"};
+ Wprint $W->{"body_attr"};
Wprint ">\n";
do { &{$_}() if $_; } for ($W->{"heading"});
--
1.8.3.1