[interchange-cvs] interchange - racke modified 2 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu May 15 10:25:01 2003


User:      racke
Date:      2003-05-15 14:24:05 GMT
Modified:  lib/Vend Config.pm Dispatch.pm
Log:
references to StaticPage removed from code

Revision  Changes    Path
2.117     +3 -5      interchange/lib/Vend/Config.pm


rev 2.117, prev_rev 2.116
Index: Config.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.116
retrieving revision 2.117
diff -u -r2.116 -r2.117
--- Config.pm	14 May 2003 22:29:29 -0000	2.116
+++ Config.pm	15 May 2003 14:24:05 -0000	2.117
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.116 2003/05/14 22:29:29 mheins Exp $
+# $Id: Config.pm,v 2.117 2003/05/15 14:24:05 racke Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 # Copyright (C) 2003 ICDEVGROUP <interchange@icdevgroup.org>
@@ -48,7 +48,7 @@
 use Vend::File;
 use Vend::Data;
 
-$VERSION = substr(q$Revision: 2.116 $, 10);
+$VERSION = substr(q$Revision: 2.117 $, 10);
 
 my %CDname;
 my %CPname;
@@ -2106,8 +2106,6 @@
 	my(@setting) = split /[\s,]+/, $settings;
 	my $c;
 
-	my $val = $item eq "StaticPage" ? '' : 1;
-
 	if(defined $C) {
 		$c = $C->{$item} || {};
 	}
@@ -2117,7 +2115,7 @@
 	}
 
 	for (@setting) {
-		$c->{$_} = $val;
+		$c->{$_} = 1;
 	}
 	return $c;
 }



1.19      +2 -4      interchange/lib/Vend/Dispatch.pm


rev 1.19, prev_rev 1.18
Index: Dispatch.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Dispatch.pm	10 May 2003 19:59:45 -0000	1.18
+++ Dispatch.pm	15 May 2003 14:24:05 -0000	1.19
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# $Id: Dispatch.pm,v 1.18 2003/05/10 19:59:45 mheins Exp $
+# $Id: Dispatch.pm,v 1.19 2003/05/15 14:24:05 racke Exp $
 #
 # Copyright (C) 2002 ICDEVGROUP <interchange@icdevgroup.org>
 # Copyright (C) 2002 Mike Heins <mike@perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.18 $, 10);
+$VERSION = substr(q$Revision: 1.19 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -959,8 +959,6 @@
 			$Vend::Cfg->{Locale} = $Vend::Cfg->{Locale_repository}{$loc}
 					if defined $Vend::Cfg->{Locale_repository}{$loc};
 		}
-		$Vend::Cfg->{StaticPage} = {}
-			unless $Vend::Cfg->{Static};
 	}
 	$::Variable = $Vend::Cfg->{Variable};
 	$::Pragma   = { %{ $Vend::Cfg->{Pragma} } };