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

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Fri Oct 5 12:21:01 2001


User:      racke
Date:      2001-10-05 16:19:54 GMT
Modified:  dist/lib/UI/usertag Tag: STABLE_4_8-branch regenerate.tag
Log:
merged changes 2.0 vs 2.1

Revision  Changes    Path
No                   revision



No                   revision



2.0.2.1   +10 -0     interchange/dist/lib/UI/usertag/regenerate.tag


rev 2.0.2.1, prev_rev 2.0
Index: regenerate.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/usertag/regenerate.tag,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -r2.0 -r2.0.2.1
--- regenerate.tag	2001/07/18 02:22:15	2.0
+++ regenerate.tag	2001/10/05 16:19:54	2.0.2.1
@@ -211,6 +211,13 @@
 	undef $Vend::AccumulatingLinks;
 
 	::response("\n\n        Generating....\n");
+	# we need to restore some settings from the original configuration
+	# for static page building first
+	my @confsafe = ('ImageDir', 'ImageDirSecure');
+	my %safehash;
+	for (@confsafe) {$safehash{$_} = $Vend::Cfg->{$_}}
+	$Vend::Cfg->{ImageDir} = $Vend::Cfg->{ImageDirOriginal}; 
+	$Vend::Cfg->{ImageDirSecure} = $Vend::Cfg->{ImageDirSecureOriginal}; 
 
 	my $umask = umask(022);
 	my $statpath = $Vend::Cfg->{StaticPath};
@@ -248,6 +255,9 @@
 				if $verbose;
 		}
 	};
+	# get back to the UI configuration settings
+	for (@confsafe) {$Vend::Cfg->{$_} = $safehash{$_}}
+
 	my $success;
 	if($@) {
 		push (@regen_messages, "during file write: $@\n");