[interchange-cvs] interchange - heins modified 4 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Sun Jul 6 01:46:00 EDT 2003


User:      heins
Date:      2003-07-06 04:46:02 GMT
Modified:  .        Makefile.PL
Modified:  dist/foundation catalog.cfg
Modified:  lib/Vend Scan.pm
Modified:  lib/Vend/Table Shadow.pm
Log:
* Remove other SQL::Statement dependencies and requirements.

Revision  Changes    Path
2.41      +0 -4      interchange/Makefile.PL


rev 2.41, prev_rev 2.40
Index: Makefile.PL
===================================================================
RCS file: /var/cvs/interchange/Makefile.PL,v
retrieving revision 2.40
retrieving revision 2.41
diff -u -r2.40 -r2.41
--- Makefile.PL	24 Jun 2003 21:09:13 -0000	2.40
+++ Makefile.PL	6 Jul 2003 04:46:02 -0000	2.41
@@ -634,10 +634,6 @@
 				};
 			push(@mods_to_get, 'Digest::MD5') if $@;
 			eval {
-					require SQL::Statement;
-				};
-			push(@mods_to_get, 'SQL::Statement') if $@;
-			eval {
 					require Safe::Hole;
 				};
 			push(@mods_to_get, 'Safe::Hole') if $@;



2.21      +0 -1      interchange/dist/foundation/catalog.cfg


rev 2.21, prev_rev 2.20
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/catalog.cfg,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -r2.20 -r2.21
--- catalog.cfg	6 May 2003 23:06:34 -0000	2.20
+++ catalog.cfg	6 Jul 2003 04:46:02 -0000	2.21
@@ -27,7 +27,6 @@
 
 Require module Digest::MD5    "Need %s %s for better cache keys."
 Require module Safe::Hole
-Require module SQL::Statement
 Require module LWP::Simple
 
 Require UserTag   email email_raw var loc table_editor button component



2.21      +2 -9      interchange/lib/Vend/Scan.pm


rev 2.21, prev_rev 2.20
Index: Scan.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -r2.20 -r2.21
--- Scan.pm	6 Jul 2003 04:38:28 -0000	2.20
+++ Scan.pm	6 Jul 2003 04:46:02 -0000	2.21
@@ -1,6 +1,6 @@
 # Vend::Scan - Prepare searches for Interchange
 #
-# $Id: Scan.pm,v 2.20 2003/07/06 04:38:28 mheins Exp $
+# $Id: Scan.pm,v 2.21 2003/07/06 04:46:02 mheins Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -30,7 +30,7 @@
 			perform_search
 			);
 
-$VERSION = substr(q$Revision: 2.20 $, 10);
+$VERSION = substr(q$Revision: 2.21 $, 10);
 
 use strict;
 use Vend::Util;
@@ -549,10 +549,6 @@
 
 }
 
-BEGIN {
-	eval { require SQL::Statement; };
-}
-
 my %scalar = (qw/ st 1 ra 1 co 1 os 1 sr 1 ml 1/);
 
 sub push_spec {
@@ -588,9 +584,6 @@
 			unless "\L$table" eq 'glimpse';
 # END GLIMPSE
 	}
-
-#	die "SQL is not enabled for Interchange. Get the SQL::Statement module.\n"
-#		unless defined &SQL::Statement::new;
 
 	# Strip possible leading stuff
 	$text =~ s/^\s*sq\s*=//;



1.39      +4 -8      interchange/lib/Vend/Table/Shadow.pm


rev 1.39, prev_rev 1.38
Index: Shadow.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/Shadow.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Shadow.pm	22 May 2003 19:21:41 -0000	1.38
+++ Shadow.pm	6 Jul 2003 04:46:02 -0000	1.39
@@ -1,6 +1,6 @@
 # Vend::Table::Shadow - Access a virtual "Shadow" table
 #
-# $Id: Shadow.pm,v 1.38 2003/05/22 19:21:41 racke Exp $
+# $Id: Shadow.pm,v 1.39 2003/07/06 04:46:02 mheins Exp $
 #
 # Copyright (C) 2002-2003 Stefan Hornburg (Racke) <racke at linuxia.de>
 #
@@ -20,7 +20,7 @@
 # MA  02111-1307  USA.
 
 package Vend::Table::Shadow;
-$VERSION = substr(q$Revision: 1.38 $, 10);
+$VERSION = substr(q$Revision: 1.39 $, 10);
 
 # CREDITS
 #
@@ -422,14 +422,10 @@
 	my ($s, $query) = @_;
 	my (%sqlinfo);
 	
-	die "SQL is not enabled for Interchange. Get the SQL::Statement module.\n"
-		unless defined &SQL::Statement::new;
-
-	my ($parser, $stmt);
+	my ($stmt);
 	
-	$parser = SQL::Parser->new('Ansi');
 	eval {
-		$stmt = SQL::Statement->new($query, $parser);
+		$stmt = Vend::SQL_Parser->new($query, $parser);
 	};
 	
 	if ($@) {







More information about the interchange-cvs mailing list