[interchange-cvs] interchange - racke modified dist/lib/UI/usertag/regenerate

[interchange-core@interchange.redhat.com]

User:      racke
Date:      2001-10-10 22:40:50 GMT
Modified:  dist/lib/UI/usertag Tag: LINUXIA regenerate
Log:
backport from development code

Revision  Changes    Path
No                   revision



No                   revision



1.3.4.1   +19 -6     interchange/dist/lib/UI/usertag/Attic/regenerate


rev 1.3.4.1, prev_rev 1.3
Index: regenerate
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/usertag/Attic/regenerate,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- regenerate	2000/09/23 17:48:40	1.3
+++ regenerate	2001/10/10 22:40:50	1.3.4.1
@@ -30,14 +30,15 @@
 	
 	$Vend::Session = {
 		'ohost'		=> 'REGENERA',
-		'browser'	=> "Interchange $::VERSION regenrator",
-		'scratch'	=> { %{$Vend::Cfg->{ScratchDefault}},
-							mv_no_session_id => 1,
-							mv_no_count => 1,
-							},
+		'browser'	=> "Interchange $::VERSION regenerator",
 		'values'	=> { %{$Vend::Cfg->{ValuesDefault}} },
 		'carts'		=> {main => []},
 	};
+
+	my ($key, $value);
+	while (($key, $value) = each (%{$Vend::Cfg->{StaticSessionDefault}})) {
+        $Vend::Session->{$key} = $value;
+	}
 	$CGI::values = ();
 	($Vend::Session->{arg} = $Vend::Argument = $CGI::values{mv_arg} = $regen_arg)
 		if $regen_arg;
@@ -74,9 +75,18 @@
 	return unless defined $page;
 
 	my $pageref;
+    my $scratch = $::Scratch;
+	$::Scratch = { %{$Vend::Cfg->{ScratchDefault}},
+					mv_no_session_id => 1,
+					mv_no_count => 1,
+				 };
+
 	eval {
 		($pageref) = ::cache_html($page, 1);
 	};
+
+	$::Scratch = $scratch;
+
 #::logDebug(<<EOF);
 #finished regen_build:
 #	out=$regen_out
@@ -107,7 +117,7 @@
 	if($CGI::values{ui_never_build}) {
 		my @tmp = split /\0/, $CGI::values{ui_never_build};
 #::logDebug("never build of: @tmp");
-		@force_build{@tmp} = (@tmp);
+		@never_build{@tmp} = (@tmp);
 	}
 	my $save_session = $Vend::Session;
 	my $save_status  = $Vend::StatusLine;
@@ -146,6 +156,9 @@
 	untie %Vend::StaticDBM;
 	$Vend::Cfg->{Static} = 1;
 	my @links = ( [ $initial, '' ] );;
+	for my $force (keys %force_build) {
+		push (@links, [ $force, '' ]);
+	}
 	my %found;
 	%Vend::Links = ();
 	%Vend::LinkFound = ();