[interchange-cvs] interchange - jon modified 8 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Tue Jul 17 20:16:27 EDT 2007
User: jon
Date: 2007-07-18 00:16:26 GMT
Modified: code/SystemTag tree.coretag
Modified: code/UserTag weight.tag
Modified: dist/lib/UI/pages/admin/reports/order ByAffiliate.html
Modified: BySKU.html Detail.html Monthly.html
Modified: dist/standard/pages/ord country.html
Modified: lib/Vend DbSearch.pm
Log:
Convert nonstandard SQL != to <> especially so it works with Vend::SQL_Parser.
Thanks to Gert van der Spoel <gert at 3edge.com> for pointing out the problem.
Revision Changes Path
1.12 +3 -3 interchange/code/SystemTag/tree.coretag
rev 1.12, prev_rev 1.11
Index: tree.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/tree.coretag,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- tree.coretag 30 Mar 2007 23:40:49 -0000 1.11
+++ tree.coretag 18 Jul 2007 00:16:26 -0000 1.12
@@ -5,13 +5,13 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. See the LICENSE file for details.
#
-# $Id: tree.coretag,v 1.11 2007/03/30 23:40:49 pajamian Exp $
+# $Id: tree.coretag,v 1.12 2007/07/18 00:16:26 jon Exp $
UserTag tree Order table master subordinate start
UserTag tree addAttr
UserTag tree attrAlias sub subordinate
UserTag tree hasEndTag
-UserTag tree Version $Revision: 1.11 $
+UserTag tree Version $Revision: 1.12 $
UserTag tree Routine <<EOR
sub {
my($table, $parent, $sub, $start_item, $opt, $text) = @_;
@@ -102,7 +102,7 @@
my $where = '';
unless($nodb) {
if( my $f = $db->config('HIDE_FIELD')) {
- $where .= " AND $f != 1";
+ $where .= " AND $f <> 1";
}
}
1.9 +3 -3 interchange/code/UserTag/weight.tag
rev 1.9, prev_rev 1.8
Index: weight.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/weight.tag,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- weight.tag 30 Mar 2007 23:40:57 -0000 1.8
+++ weight.tag 18 Jul 2007 00:16:26 -0000 1.9
@@ -5,11 +5,11 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. See the LICENSE file for details.
#
-# $Id: weight.tag,v 1.8 2007/03/30 23:40:57 pajamian Exp $
+# $Id: weight.tag,v 1.9 2007/07/18 00:16:26 jon Exp $
UserTag weight Order attribute
UserTag weight addAttr
-UserTag weight Version $Revision: 1.8 $
+UserTag weight Version $Revision: 1.9 $
UserTag weight Routine <<EOR
sub {
my ($attr, $opt) = @_;
@@ -40,7 +40,7 @@
SELECT o_group, weight FROM $otab
WHERE sku = ?
AND weight is not null
- AND weight != ''
+ AND weight <> ''
};
my $sth = $odb->dbh()->prepare($q)
or last BUILDO;
2.6 +1 -1 interchange/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html
rev 2.6, prev_rev 2.5
Index: ByAffiliate.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -u -r2.5 -r2.6
--- ByAffiliate.html 17 Apr 2005 22:02:55 -0000 2.5
+++ ByAffiliate.html 18 Jul 2007 00:16:26 -0000 2.6
@@ -64,7 +64,7 @@
sql="
select affiliate, campaign, total_cost, order_date
from transactions
- WHERE deleted != '1' [scratch date_limit] [scratch synd_limit]
+ WHERE deleted <> '1' [scratch date_limit] [scratch synd_limit]
order by affiliate, campaign, order_date
"][/query]
[tmp ALL][L]ALL[/L][/tmp]
2.5 +1 -1 interchange/dist/lib/UI/pages/admin/reports/order/BySKU.html
rev 2.5, prev_rev 2.4
Index: BySKU.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/reports/order/BySKU.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -u -r2.4 -r2.5
--- BySKU.html 23 Apr 2005 18:10:10 -0000 2.4
+++ BySKU.html 18 Jul 2007 00:16:26 -0000 2.5
@@ -124,7 +124,7 @@
sql="
select affiliate, campaign, total_cost, order_date, order_number
from transactions
- WHERE deleted != '1' [scratch date_limit] [scratch synd_limit]
+ WHERE deleted <> '1' [scratch date_limit] [scratch synd_limit]
order by affiliate, campaign, order_date
"][/query]
2.8 +1 -1 interchange/dist/lib/UI/pages/admin/reports/order/Detail.html
rev 2.8, prev_rev 2.7
Index: Detail.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/reports/order/Detail.html,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -u -r2.7 -r2.8
--- Detail.html 17 Apr 2005 22:02:55 -0000 2.7
+++ Detail.html 18 Jul 2007 00:16:26 -0000 2.8
@@ -108,7 +108,7 @@
sql="
select order_number, affiliate, campaign, total_cost, payment_method, state, city, status, order_date
from transactions
- WHERE deleted != '1'
+ WHERE deleted <> '1'
[scratch date_limit] [scratch synd_limit]
order by order_number
"][/query]
2.8 +1 -1 interchange/dist/lib/UI/pages/admin/reports/order/Monthly.html
rev 2.8, prev_rev 2.7
Index: Monthly.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/reports/order/Monthly.html,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -u -r2.7 -r2.8
--- Monthly.html 17 Apr 2005 22:02:55 -0000 2.7
+++ Monthly.html 18 Jul 2007 00:16:26 -0000 2.8
@@ -102,7 +102,7 @@
sql="
select affiliate, campaign, total_cost, order_date, order_number
FROM transactions
- WHERE deleted != '1' [scratch date_limit] [scratch synd_limit]
+ WHERE deleted <> '1' [scratch date_limit] [scratch synd_limit]
"][/query]
[tmp ALL][L]ALL[/L][/tmp]
[tmp TOTAL][L]GRAND TOTAL[/L][/tmp]
1.6 +1 -1 interchange/dist/standard/pages/ord/country.html
rev 1.6, prev_rev 1.5
Index: country.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/country.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- country.html 23 Apr 2005 18:10:12 -0000 1.5
+++ country.html 18 Jul 2007 00:16:26 -0000 1.6
@@ -75,7 +75,7 @@
type=select
default=__SHIP_DEFAULT_COUNTRY__
value=`$Values->{country}`
- lookup_query="select code,name from country where shipmodes != '' order by name"
+ lookup_query="select code,name from country where shipmodes <> '' order by name"
]
</td>
</tr>
2.25 +4 -4 interchange/lib/Vend/DbSearch.pm
rev 2.25, prev_rev 2.24
Index: DbSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/DbSearch.pm,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -u -r2.24 -r2.25
--- DbSearch.pm 30 Mar 2007 11:39:44 -0000 2.24
+++ DbSearch.pm 18 Jul 2007 00:16:26 -0000 2.25
@@ -1,6 +1,6 @@
# Vend::DbSearch - Search indexes with Interchange
#
-# $Id: DbSearch.pm,v 2.24 2007/03/30 11:39:44 pajamian Exp $
+# $Id: DbSearch.pm,v 2.25 2007/07/18 00:16:26 jon Exp $
#
# Adapted for use with Interchange from Search::TextSearch
#
@@ -27,7 +27,7 @@
@ISA = qw(Vend::Search);
-$VERSION = substr(q$Revision: 2.24 $, 10);
+$VERSION = substr(q$Revision: 2.25 $, 10);
use Search::Dict;
use strict;
@@ -250,8 +250,8 @@
if(! $s->{mv_no_hide} and my $hf = $dbref->config('HIDE_FIELD')) {
#::logDebug("found hide_field $hf");
- $lqual =~ s/^\s*WHERE\s+/ WHERE $hf != 1 AND /
- or $lqual = " WHERE $hf != 1";
+ $lqual =~ s/^\s*WHERE\s+/ WHERE $hf <> 1 AND /
+ or $lqual = " WHERE $hf <> 1";
#::logDebug("lqual now '$lqual'");
}
$s->hash_fields(\@fn);
More information about the interchange-cvs
mailing list