[interchange-cvs] interchange - jon modified lib/Vend/Options/Old48.pm

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2004-07-19 22:23:26 GMT
Modified:  lib/Vend/Options Old48.pm
Log:
Don't check for empty price field, which may be numeric and thus cause an
SQL error. (Empty fields don't cause a problem in the following loop
anyway.)

Change a hardcoded check against the "code" column to use the map setting.

Revision  Changes    Path
1.7       +4 -4      interchange/lib/Vend/Options/Old48.pm


rev 1.7, prev_rev 1.6
Index: Old48.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Options/Old48.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Old48.pm	15 Apr 2004 19:26:06 -0000	1.6
+++ Old48.pm	19 Jul 2004 22:23:26 -0000	1.7
@@ -1,6 +1,6 @@
 # Vend::Options::Old48 - Interchange 4.8 compatible product options
 #
-# $Id: Old48.pm,v 1.6 2004/04/15 19:26:06 mheins Exp $
+# $Id: Old48.pm,v 1.7 2004/07/19 22:23:26 jon Exp $
 #
 # Copyright (C) 2002-2003 Mike Heins <mikeh at perusion.net>
 # Copyright (C) 2002-2003 Interchange Development Group <interchange at icdevgroup.org>
@@ -23,7 +23,7 @@
 
 package Vend::Options::Old48;
 
-$VERSION = substr(q$Revision: 1.6 $, 10);
+$VERSION = substr(q$Revision: 1.7 $, 10);
 
 =head1 NAME
 
@@ -246,7 +246,7 @@
 		my $lval = $db->quote($sku, $lcol);
 
 		my $q = "SELECT " . join(",", @rf);
-		$q .= " FROM $tname where $lcol = $lval AND code <> $lval $rsort";
+		$q .= " FROM $tname where $lcol = $lval AND $ccol <> $lval $rsort";
 #::logDebug("tag_options matrix query: $q");
 		my $ary = $db->query($q); 
 #::logDebug("tag_options matrix ary: " . ::uneval($ary));
@@ -311,7 +311,7 @@
 		push @rf, ($map->{$_} || $_);
 	}
 
-	my $q = "SELECT " . join (",", @rf) . " FROM $table where $fsel = $rsel and $rf[1] <> ''";
+	my $q = "SELECT " . join (",", @rf) . " FROM $table WHERE $fsel = $rsel";
 #::logDebug("option_cost query=$q");
 	my $ary = $db->query($q); 
 	return if ! $ary->[0];