[interchange-cvs] interchange - jon modified 4 files

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2003-09-08 12:25:18 GMT
Modified:  dist/lib/UI/pages/include/Options Simple
Modified:  dist/lib/UI/pages/include/Options/old item_option_simple
Modified:  lib/Vend/Options Old48.pm Simple.pm
Log:
Convert nonstandard != to standard SQL <> (which also avoids a parse
error in the new Vend::SQL_Parser).

Revision  Changes    Path
1.7       +2 -2      interchange/dist/lib/UI/pages/include/Options/Simple


rev 1.7, prev_rev 1.6
Index: Simple
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/Options/Simple,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Simple	4 Sep 2003 16:24:55 -0000	1.6
+++ Simple	8 Sep 2003 12:25:18 -0000	1.7
@@ -127,7 +127,7 @@
 
 <TABLE BORDER=0><TR><TD VALIGN=TOP>
 
-[query list=1 sql="select * from [scratch option_table] where sku='[filter op=sql interpolate=1][cgi sku][/filter]' and o_group is not null and o_group != ''"]
+[query list=1 sql="select * from [scratch option_table] where sku='[filter op=sql interpolate=1][cgi sku][/filter]' and o_group is not null and o_group <> ''"]
 [list]
 
 <div style="border: 1px solid black; margin-bottom: 3px">
@@ -249,7 +249,7 @@
 [query
 	list=1
 	prefix=clone
-	sql="select DISTINCT sku from [scratch option_table] where o_group is not null and o_group != ''"
+	sql="select DISTINCT sku from [scratch option_table] where o_group is not null and o_group <> ''"
 	more=1]
 <SELECT NAME=ui_clone_id>
 <OPTION VALUE=""> --



1.4       +1 -1      interchange/dist/lib/UI/pages/include/Options/old/item_option_simple


rev 1.4, prev_rev 1.3
Index: item_option_simple
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/Options/old/item_option_simple,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- item_option_simple	4 Sep 2003 18:03:37 -0000	1.3
+++ item_option_simple	8 Sep 2003 12:25:18 -0000	1.4
@@ -182,7 +182,7 @@
 [query
 	list=1
 	prefix=clone
-	sql="select DISTINCT sku from [cgi mv_data_table] where o_group != ''"
+	sql="select DISTINCT sku from [cgi mv_data_table] where o_group <> ''"
 	more=1]
 <SELECT NAME=ui_clone_id>
 <OPTION VALUE=""> --



1.3       +3 -3      interchange/lib/Vend/Options/Old48.pm


rev 1.3, prev_rev 1.2
Index: Old48.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Options/Old48.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- Old48.pm	5 Aug 2003 21:46:19 -0000	1.2
+++ Old48.pm	8 Sep 2003 12:25:18 -0000	1.3
@@ -1,6 +1,6 @@
 # Vend::Options::Old48 - Interchange 4.8 compatible product options
 #
-# $Id: Old48.pm,v 1.2 2003/08/05 21:46:19 racke Exp $
+# $Id: Old48.pm,v 1.3 2003/09/08 12:25:18 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.2 $, 10);
+$VERSION = substr(q$Revision: 1.3 $, 10);
 
 =head1 NAME
 
@@ -287,7 +287,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 and $rf[1] <> ''";
 #::logDebug("option_cost query=$q");
 	my $ary = $db->query($q); 
 	return if ! $ary->[0];



1.3       +3 -3      interchange/lib/Vend/Options/Simple.pm


rev 1.3, prev_rev 1.2
Index: Simple.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Options/Simple.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- Simple.pm	5 Aug 2003 21:46:19 -0000	1.2
+++ Simple.pm	8 Sep 2003 12:25:18 -0000	1.3
@@ -1,6 +1,6 @@
 # Vend::Options::Simple - Interchange Simple product options
 #
-# $Id: Simple.pm,v 1.2 2003/08/05 21:46:19 racke Exp $
+# $Id: Simple.pm,v 1.3 2003/09/08 12:25:18 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::Simple;
 
-$VERSION = substr(q$Revision: 1.2 $, 10);
+$VERSION = substr(q$Revision: 1.3 $, 10);
 
 =head1 NAME
 
@@ -100,7 +100,7 @@
 		push @rf, ($map->{$_} || $_);
 	}
 
-	my $q = "SELECT " . join (",", @rf) . " FROM $tname where $fsel = $rsel and $rf[1] != ''";
+	my $q = "SELECT " . join (",", @rf) . " FROM $tname where $fsel = $rsel and $rf[1] <> ''";
 #::logDebug("Simple module price_options query=$q");
 	my $ary = $db->query($q); 
 	return if ! $ary->[0];