[interchange-cvs] interchange - heins modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Mon Jul 15 10:09:00 2002
User: heins
Date: 2002-07-15 14:08:14 GMT
Modified: lib/Vend Scan.pm
Modified: lib/Vend/Table LDAP.pm
Log:
* Remove commented-out code never used.
Revision Changes Path
2.14 +3 -22 interchange/lib/Vend/Scan.pm
rev 2.14, prev_rev 2.13
Index: Scan.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -r2.13 -r2.14
--- Scan.pm 15 Jul 2002 13:30:24 -0000 2.13
+++ Scan.pm 15 Jul 2002 14:08:14 -0000 2.14
@@ -1,6 +1,6 @@
# Vend::Scan - Prepare searches for Interchange
#
-# $Id: Scan.pm,v 2.13 2002/07/15 13:30:24 mheins Exp $
+# $Id: Scan.pm,v 2.14 2002/07/15 14:08:14 mheins Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -29,7 +29,7 @@
perform_search
);
=20
-$VERSION =3D substr(q$Revision: 2.13 $, 10);
+$VERSION =3D substr(q$Revision: 2.14 $, 10);
=20
use strict;
use Vend::Util;
@@ -616,15 +616,6 @@
=20
my $update =3D $stmt->command();
undef $update if $update eq 'SELECT';
-# CODECHECK: {
-# last CODECHECK if ! $update;
-# my $i =3D 0;
-# for($stmt->columns()) {
-# ($stmt->{MV_VALUE_RELOCATE} =3D $i, last)
-# if $_ eq $codename || $_ eq '0';
-# $i++;
-# }
-# }
=20
for($stmt->tables()) {
my $t =3D $_->name();
@@ -653,21 +644,11 @@
=20
for($stmt->columns()) {
my $name =3D $_->name();
- #($stmt->{MV_VALUE_RELOCATE} =3D 0, last) if $name eq '*';
push_spec('rf', $name, $ary, $hash);
last if $name eq '*';
#::logDebug("column name=3D" . $_->name() . " table=3D" . $_->table());
}
-# if(! $update) {
-# # do nothing
-# }
-# elsif ($stmt->{mv_value_relocate}) {
-# splice(@{$hash->{rf}}, $stmt->{mv_value_relocate}, 1);
-# }
-# elsif ($update eq 'insert') {
-# $stmt->{mv_value_relocate} =3D 0 if ! $stmt->columns();
-# }
-#
+
my @order;
=20
@order =3D $stmt->order();
2.5 +2 -15 interchange/lib/Vend/Table/LDAP.pm
rev 2.5, prev_rev 2.4
Index: LDAP.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/lib/Vend/Table/LDAP.pm,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- LDAP.pm 9 Jul 2002 17:42:12 -0000 2.4
+++ LDAP.pm 15 Jul 2002 14:08:14 -0000 2.5
@@ -1,6 +1,6 @@
# Vend::Table::LDAP - Interchange LDAP pseudo-table access
#
-# $Id: LDAP.pm,v 2.4 2002/07/09 17:42:12 mheins Exp $
+# $Id: LDAP.pm,v 2.5 2002/07/15 14:08:14 mheins Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -24,7 +24,7 @@
=20
package Vend::Table::LDAP;
@ISA =3D qw/Vend::Table::Common/;
-$VERSION =3D substr(q$Revision: 2.4 $, 10);
+$VERSION =3D substr(q$Revision: 2.5 $, 10);
use strict;
=20
use vars qw(
@@ -593,22 +593,9 @@
=20
if($update) {
#::logDebug("Updating, update=3D$update");
-# $relocate =3D $stmt->{MV_VALUE_RELOCATE}
-# if defined $stmt->{MV_VALUE_RELOCATE};
$opt->{row_count} =3D 1;
die "Reached update query without object"
if ! $s;
-# if($relocate) {
-# my $code =3D splice(@vals, $stmt->{MV_VALUE_RELOCATE}, 1);
-# unshift(@vals, $code) if $update ne 'UPDATE';
-##::logDebug("relocating values col=3D$relocate: columns=3D'@na' vals=3D'@=
vals'");=20
-# }
-# elsif (!defined $relocate) {
-# die "Must have code field to insert"
-# if $update eq 'INSERT';
-# unshift(@na, $codename);
-##::logDebug("NOT defined relocating values col=3D$relocate: columns=3D'@n=
a' vals=3D'@vals'");=20
-# }
my $sub =3D $update eq 'DELETE'
? sub { delete_record($s, @_) }
: $s->row_settor(@na);