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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2005-04-27 20:18:45 GMT
Modified:  lib/Vend Interpolate.pm
Log:
* More unitialzed variable warnings dealt with.

Revision  Changes    Path
2.240     +5 -4      interchange/lib/Vend/Interpolate.pm


rev 2.240, prev_rev 2.239
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.239
retrieving revision 2.240
diff -u -r2.239 -r2.240
--- Interpolate.pm	12 Apr 2005 19:08:01 -0000	2.239
+++ Interpolate.pm	27 Apr 2005 20:18:45 -0000	2.240
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.239 2005/04/12 19:08:01 jon Exp $
+# $Id: Interpolate.pm,v 2.240 2005/04/27 20:18:45 mheins Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.239 $, 10);
+$VERSION = substr(q$Revision: 2.240 $, 10);
 
 @EXPORT = qw (
 
@@ -918,7 +918,7 @@
 	$base =~ s/^!// and $reverse = 1;
 	my ($op, $status);
 	my $noop;
-	$noop = 1 unless defined $operator;
+	$noop = 1, $operator = '' unless defined $operator;
 
 	my $sub;
 	my $newcomp;
@@ -3783,7 +3783,7 @@
 	my $pos;
 
   	$$buf =~ s{\[else\]}{[else]}igo;
-    $first = index($$buf, $open, $pos);
+    $first = index($$buf, $open);
 #::logDebug("first=$first");
 	return undef if $first < 0;
 	my $int     = $first;
@@ -4228,6 +4228,7 @@
 		}
 		$item->{mv_cache_price} = undef;
 		$code = $item->{$code_field} || $item->{code};
+		$code = '' unless defined $code;
 
 #::logDebug("Doing $code (variant $item->{code}) substitution, count $count++");