[interchange-cvs] interchange - racke modified lib/Vend/Interpolate.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu May 15 08:26:01 2003


User:      racke
Date:      2003-05-15 12:25:20 GMT
Modified:  lib/Vend Interpolate.pm
Log:
resolve_static function removed

Revision  Changes    Path
2.168     +2 -34     interchange/lib/Vend/Interpolate.pm


rev 2.168, prev_rev 2.167
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.167
retrieving revision 2.168
diff -u -r2.167 -r2.168
--- Interpolate.pm	13 May 2003 19:05:18 -0000	2.167
+++ Interpolate.pm	15 May 2003 12:25:19 -0000	2.168
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.167 2003/05/13 19:05:18 mheins Exp $
+# $Id: Interpolate.pm,v 2.168 2003/05/15 12:25:19 racke Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.167 $, 10);
+$VERSION = substr(q$Revision: 2.168 $, 10);
 
 @EXPORT = qw (
 
@@ -2797,36 +2797,6 @@
 	return $Vend::Cfg->{StaticPath} . "/" . shift;
 }
 
-sub resolve_static {
-#::logDebug("entering resolve_static...");
-	return if ! $Vend::Cookie;
-#::logDebug("have cookie...");
-	return if ! $Vend::Cfg->{Static};
-#::logDebug("are static...");
-	my $key = Vend::Util::escape_chars_url($page);
-	if($arg) {
-		my $tmp = $arg;
-		$tmp =~ s:([^\w/]): sprintf '%%%02x', ord($1) :eg;
-		$key .= "/$arg";
-	}
-#::logDebug("checking $key...");
-
-	if(defined $Vend::StaticDBM{$key}) {
-#::logDebug("found DBM $key...");
-		$page = $Vend::StaticDBM{$key} || "$key$Vend::Cfg->{StaticSuffix}";
-	}
-	elsif(defined $Vend::Cfg->{StaticPage}{$key}) {
-#::logDebug("found StaticPage $key...");
-		$page = $Vend::Cfg->{StaticPage}{$key} || "$key$Vend::Cfg->{StaticSuffix}";
-	}
-	else {
-#::logDebug("not found $key...");
-		return;
-	}
-	$urlroutine = \&static_url;
-	return;
-}
-
 sub tag_page {
     my ($page, $arg, $opt) = @_;
 
@@ -2867,8 +2837,6 @@
 	}
 
 	$urlroutine = $opt->{secure} ? \&secure_vendUrl : \&vendUrl;
-
-	resolve_static();
 
 	my $anchor = '';
 	if($opt->{anchor}) {