[interchange-cvs] interchange - jon modified 6 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Aug 3 15:33:39 EDT 2005
User: jon
Date: 2005-08-03 19:33:39 GMT
Modified: lib/Vend DbSearch.pm Glimpse.pm RefSearch.pm Swish.pm
Modified: TextSearch.pm UserControl.pm
Log:
Remove some duplicate glob assignments for subroutines in other modules.
To do this easily, I did "expand -t4" and "LC_ALL=C sort -u".
Revision Changes Path
2.21 +16 -19 interchange/lib/Vend/DbSearch.pm
rev 2.21, prev_rev 2.20
Index: DbSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/DbSearch.pm,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -u -r2.20 -r2.21
--- DbSearch.pm 30 Apr 2005 15:09:58 -0000 2.20
+++ DbSearch.pm 3 Aug 2005 19:33:39 -0000 2.21
@@ -1,6 +1,6 @@
# Vend::DbSearch - Search indexes with Interchange
#
-# $Id: DbSearch.pm,v 2.20 2005/04/30 15:09:58 mheins Exp $
+# $Id: DbSearch.pm,v 2.21 2005/08/03 19:33:39 jon Exp $
#
# Adapted for use with Interchange from Search::TextSearch
#
@@ -27,7 +27,7 @@
@ISA = qw(Vend::Search);
-$VERSION = substr(q$Revision: 2.20 $, 10);
+$VERSION = substr(q$Revision: 2.21 $, 10);
use Search::Dict;
use strict;
@@ -387,29 +387,26 @@
}
# Unfortunate hack need for Safe searches
-*escape = \&Vend::Search::escape;
-*spec_check = \&Vend::Search::spec_check;
-*get_scalar = \&Vend::Search::get_scalar;
-*more_matches = \&Vend::Search::more_matches;
+*create_search_and = \&Vend::Search::create_search_and;
+*create_search_or = \&Vend::Search::create_search_or;
+*dump_options = \&Vend::Search::dump_options;
+*escape = \&Vend::Search::escape;
+*get_limit = \&Vend::Search::get_limit;
*get_return = \&Vend::Search::get_return;
+*get_scalar = \&Vend::Search::get_scalar;
+*hash_fields = \&Vend::Search::hash_fields;
*map_ops = \&Vend::Search::map_ops;
-*get_limit = \&Vend::Search::get_limit;
-*saved_params = \&Vend::Search::saved_params;
+*more_matches = \&Vend::Search::more_matches;
*range_check = \&Vend::Search::range_check;
-*create_search_and = \&Vend::Search::create_search_and;
-*create_search_or = \&Vend::Search::create_search_or;
+*restore_specs = \&Vend::Search::restore_specs;
*save_context = \&Vend::Search::save_context;
-*dump_options = \&Vend::Search::dump_options;
*save_more = \&Vend::Search::save_more;
+*save_specs = \&Vend::Search::save_specs;
+*saved_params = \&Vend::Search::saved_params;
+*search_error = \&Vend::Search::search_error;
*sort_search_return = \&Vend::Search::sort_search_return;
-*get_scalar = \&Vend::Search::get_scalar;
-*hash_fields = \&Vend::Search::hash_fields;
-*save_specs = \&Vend::Search::save_specs;
-*restore_specs = \&Vend::Search::restore_specs;
-*splice_specs = \&Vend::Search::splice_specs;
-*search_error = \&Vend::Search::search_error;
-*save_more = \&Vend::Search::save_more;
-*sort_search_return = \&Vend::Search::sort_search_return;
+*spec_check = \&Vend::Search::spec_check;
+*splice_specs = \&Vend::Search::splice_specs;
1;
__END__
2.13 +16 -19 interchange/lib/Vend/Glimpse.pm
rev 2.13, prev_rev 2.12
Index: Glimpse.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Glimpse.pm,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -u -r2.12 -r2.13
--- Glimpse.pm 21 Aug 2004 22:47:23 -0000 2.12
+++ Glimpse.pm 3 Aug 2005 19:33:39 -0000 2.13
@@ -1,6 +1,6 @@
# Vend::Glimpse - Search indexes with Glimpse
#
-# $Id: Glimpse.pm,v 2.12 2004/08/21 22:47:23 jon Exp $
+# $Id: Glimpse.pm,v 2.13 2005/08/03 19:33:39 jon Exp $
#
# Adapted for use with Interchange from Search::Glimpse
#
@@ -26,7 +26,7 @@
require Vend::Search;
@ISA = qw(Vend::Search);
-$VERSION = substr(q$Revision: 2.12 $, 10);
+$VERSION = substr(q$Revision: 2.13 $, 10);
use strict;
use Vend::File;
use Vend::Util;
@@ -393,29 +393,26 @@
}
# Unfortunate hack need for Safe searches
-*escape = \&Vend::Search::escape;
-*spec_check = \&Vend::Search::spec_check;
-*get_scalar = \&Vend::Search::get_scalar;
-*more_matches = \&Vend::Search::more_matches;
+*create_search_and = \&Vend::Search::create_search_and;
+*create_search_or = \&Vend::Search::create_search_or;
+*dump_options = \&Vend::Search::dump_options;
+*escape = \&Vend::Search::escape;
+*get_limit = \&Vend::Search::get_limit;
*get_return = \&Vend::Search::get_return;
+*get_scalar = \&Vend::Search::get_scalar;
+*hash_fields = \&Vend::Search::hash_fields;
*map_ops = \&Vend::Search::map_ops;
-*get_limit = \&Vend::Search::get_limit;
-*saved_params = \&Vend::Search::saved_params;
+*more_matches = \&Vend::Search::more_matches;
*range_check = \&Vend::Search::range_check;
-*create_search_and = \&Vend::Search::create_search_and;
-*create_search_or = \&Vend::Search::create_search_or;
+*restore_specs = \&Vend::Search::restore_specs;
*save_context = \&Vend::Search::save_context;
-*dump_options = \&Vend::Search::dump_options;
*save_more = \&Vend::Search::save_more;
+*save_specs = \&Vend::Search::save_specs;
+*saved_params = \&Vend::Search::saved_params;
+*search_error = \&Vend::Search::search_error;
*sort_search_return = \&Vend::Search::sort_search_return;
-*get_scalar = \&Vend::Search::get_scalar;
-*hash_fields = \&Vend::Search::hash_fields;
-*save_specs = \&Vend::Search::save_specs;
-*restore_specs = \&Vend::Search::restore_specs;
-*splice_specs = \&Vend::Search::splice_specs;
-*search_error = \&Vend::Search::search_error;
-*save_more = \&Vend::Search::save_more;
-*sort_search_return = \&Vend::Search::sort_search_return;
+*spec_check = \&Vend::Search::spec_check;
+*splice_specs = \&Vend::Search::splice_specs;
1;
__END__
2.9 +16 -19 interchange/lib/Vend/RefSearch.pm
rev 2.9, prev_rev 2.8
Index: RefSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/RefSearch.pm,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -u -r2.8 -r2.9
--- RefSearch.pm 30 Apr 2005 15:09:58 -0000 2.8
+++ RefSearch.pm 3 Aug 2005 19:33:39 -0000 2.9
@@ -1,6 +1,6 @@
# Vend::DbSearch - Search indexes with Interchange
#
-# $Id: RefSearch.pm,v 2.8 2005/04/30 15:09:58 mheins Exp $
+# $Id: RefSearch.pm,v 2.9 2005/08/03 19:33:39 jon Exp $
#
# Adapted for use with Interchange from Search::TextSearch
#
@@ -27,7 +27,7 @@
@ISA = qw(Vend::Search);
-$VERSION = substr(q$Revision: 2.8 $, 10);
+$VERSION = substr(q$Revision: 2.9 $, 10);
use strict;
no warnings qw(uninitialized numeric);
@@ -339,29 +339,26 @@
}
# Unfortunate hack need for Safe searches
-*escape = \&Vend::Search::escape;
-*spec_check = \&Vend::Search::spec_check;
-*get_scalar = \&Vend::Search::get_scalar;
-*more_matches = \&Vend::Search::more_matches;
+*create_search_and = \&Vend::Search::create_search_and;
+*create_search_or = \&Vend::Search::create_search_or;
+*dump_options = \&Vend::Search::dump_options;
+*escape = \&Vend::Search::escape;
+*get_limit = \&Vend::Search::get_limit;
*get_return = \&Vend::Search::get_return;
+*get_scalar = \&Vend::Search::get_scalar;
+*hash_fields = \&Vend::Search::hash_fields;
*map_ops = \&Vend::Search::map_ops;
-*get_limit = \&Vend::Search::get_limit;
-*saved_params = \&Vend::Search::saved_params;
+*more_matches = \&Vend::Search::more_matches;
*range_check = \&Vend::Search::range_check;
-*create_search_and = \&Vend::Search::create_search_and;
-*create_search_or = \&Vend::Search::create_search_or;
+*restore_specs = \&Vend::Search::restore_specs;
*save_context = \&Vend::Search::save_context;
-*dump_options = \&Vend::Search::dump_options;
*save_more = \&Vend::Search::save_more;
+*save_specs = \&Vend::Search::save_specs;
+*saved_params = \&Vend::Search::saved_params;
+*search_error = \&Vend::Search::search_error;
*sort_search_return = \&Vend::Search::sort_search_return;
-*get_scalar = \&Vend::Search::get_scalar;
-*hash_fields = \&Vend::Search::hash_fields;
-*save_specs = \&Vend::Search::save_specs;
-*restore_specs = \&Vend::Search::restore_specs;
-*splice_specs = \&Vend::Search::splice_specs;
-*search_error = \&Vend::Search::search_error;
-*save_more = \&Vend::Search::save_more;
-*sort_search_return = \&Vend::Search::sort_search_return;
+*spec_check = \&Vend::Search::spec_check;
+*splice_specs = \&Vend::Search::splice_specs;
1;
__END__
1.4 +16 -19 interchange/lib/Vend/Swish.pm
rev 1.4, prev_rev 1.3
Index: Swish.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Swish.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- Swish.pm 26 Jun 2003 10:22:23 -0000 1.3
+++ Swish.pm 3 Aug 2005 19:33:39 -0000 1.4
@@ -1,6 +1,6 @@
# Vend::Swish - Search indexes with Swish-e
#
-# $Id: Swish.pm,v 1.3 2003/06/26 10:22:23 ton Exp $
+# $Id: Swish.pm,v 1.4 2005/08/03 19:33:39 jon Exp $
#
# Adapted from Vend::Glimpse
#
@@ -25,7 +25,7 @@
require Vend::Search;
@ISA = qw(Vend::Search);
-$VERSION = substr(q$Revision: 1.3 $, 10);
+$VERSION = substr(q$Revision: 1.4 $, 10);
use strict;
sub array {
@@ -319,29 +319,26 @@
}
# Unfortunate hack need for Safe searches
-*escape = \&Vend::Search::escape;
-*spec_check = \&Vend::Search::spec_check;
-*get_scalar = \&Vend::Search::get_scalar;
-*more_matches = \&Vend::Search::more_matches;
+*create_search_and = \&Vend::Search::create_search_and;
+*create_search_or = \&Vend::Search::create_search_or;
+*dump_options = \&Vend::Search::dump_options;
+*escape = \&Vend::Search::escape;
+*get_limit = \&Vend::Search::get_limit;
*get_return = \&Vend::Search::get_return;
+*get_scalar = \&Vend::Search::get_scalar;
+*hash_fields = \&Vend::Search::hash_fields;
*map_ops = \&Vend::Search::map_ops;
-*get_limit = \&Vend::Search::get_limit;
-*saved_params = \&Vend::Search::saved_params;
+*more_matches = \&Vend::Search::more_matches;
*range_check = \&Vend::Search::range_check;
-*create_search_and = \&Vend::Search::create_search_and;
-*create_search_or = \&Vend::Search::create_search_or;
+*restore_specs = \&Vend::Search::restore_specs;
*save_context = \&Vend::Search::save_context;
-*dump_options = \&Vend::Search::dump_options;
*save_more = \&Vend::Search::save_more;
+*save_specs = \&Vend::Search::save_specs;
+*saved_params = \&Vend::Search::saved_params;
+*search_error = \&Vend::Search::search_error;
*sort_search_return = \&Vend::Search::sort_search_return;
-*get_scalar = \&Vend::Search::get_scalar;
-*hash_fields = \&Vend::Search::hash_fields;
-*save_specs = \&Vend::Search::save_specs;
-*restore_specs = \&Vend::Search::restore_specs;
-*splice_specs = \&Vend::Search::splice_specs;
-*search_error = \&Vend::Search::search_error;
-*save_more = \&Vend::Search::save_more;
-*sort_search_return = \&Vend::Search::sort_search_return;
+*spec_check = \&Vend::Search::spec_check;
+*splice_specs = \&Vend::Search::splice_specs;
1;
__END__
2.14 +16 -19 interchange/lib/Vend/TextSearch.pm
rev 2.14, prev_rev 2.13
Index: TextSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/TextSearch.pm,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -u -r2.13 -r2.14
--- TextSearch.pm 30 Apr 2005 15:09:58 -0000 2.13
+++ TextSearch.pm 3 Aug 2005 19:33:39 -0000 2.14
@@ -1,6 +1,6 @@
# Vend::TextSearch - Search indexes with Perl
#
-# $Id: TextSearch.pm,v 2.13 2005/04/30 15:09:58 mheins Exp $
+# $Id: TextSearch.pm,v 2.14 2005/08/03 19:33:39 jon Exp $
#
# Adapted for use with Interchange from Search::TextSearch
#
@@ -29,7 +29,7 @@
use vars qw(@ISA);
@ISA = qw(Vend::Search);
-$VERSION = substr(q$Revision: 2.13 $, 10);
+$VERSION = substr(q$Revision: 2.14 $, 10);
use Search::Dict;
use strict;
@@ -408,29 +408,26 @@
}
# Unfortunate hack need for Safe searches
-*escape = \&Vend::Search::escape;
-*spec_check = \&Vend::Search::spec_check;
-*get_scalar = \&Vend::Search::get_scalar;
-*more_matches = \&Vend::Search::more_matches;
+*create_search_and = \&Vend::Search::create_search_and;
+*create_search_or = \&Vend::Search::create_search_or;
+*dump_options = \&Vend::Search::dump_options;
+*escape = \&Vend::Search::escape;
+*get_limit = \&Vend::Search::get_limit;
*get_return = \&Vend::Search::get_return;
+*get_scalar = \&Vend::Search::get_scalar;
+*hash_fields = \&Vend::Search::hash_fields;
*map_ops = \&Vend::Search::map_ops;
-*get_limit = \&Vend::Search::get_limit;
-*saved_params = \&Vend::Search::saved_params;
+*more_matches = \&Vend::Search::more_matches;
*range_check = \&Vend::Search::range_check;
-*create_search_and = \&Vend::Search::create_search_and;
-*create_search_or = \&Vend::Search::create_search_or;
+*restore_specs = \&Vend::Search::restore_specs;
*save_context = \&Vend::Search::save_context;
-*dump_options = \&Vend::Search::dump_options;
*save_more = \&Vend::Search::save_more;
+*save_specs = \&Vend::Search::save_specs;
+*saved_params = \&Vend::Search::saved_params;
+*search_error = \&Vend::Search::search_error;
*sort_search_return = \&Vend::Search::sort_search_return;
-*get_scalar = \&Vend::Search::get_scalar;
-*hash_fields = \&Vend::Search::hash_fields;
-*save_specs = \&Vend::Search::save_specs;
-*restore_specs = \&Vend::Search::restore_specs;
-*splice_specs = \&Vend::Search::splice_specs;
-*search_error = \&Vend::Search::search_error;
-*save_more = \&Vend::Search::save_more;
-*sort_search_return = \&Vend::Search::sort_search_return;
+*spec_check = \&Vend::Search::spec_check;
+*splice_specs = \&Vend::Search::splice_specs;
1;
__END__
2.4 +3 -3 interchange/lib/Vend/UserControl.pm
rev 2.4, prev_rev 2.3
Index: UserControl.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/UserControl.pm,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -u -r2.3 -r2.4
--- UserControl.pm 27 Jun 2004 19:00:44 -0000 2.3
+++ UserControl.pm 3 Aug 2005 19:33:39 -0000 2.4
@@ -1,6 +1,6 @@
# Vend::UserControl - Enhanced Interchange user database functions
#
-# $Id: UserControl.pm,v 2.3 2004/06/27 19:00:44 mheins Exp $
+# $Id: UserControl.pm,v 2.4 2005/08/03 19:33:39 jon Exp $
#
# Copyright (C) 2003 Interchange Development Group
# Copyright (C) 2003 Mike Heins, <mikey at heins.net>
@@ -17,7 +17,7 @@
package Vend::UserControl;
-$VERSION = substr(q$Revision: 2.3 $, 10);
+$VERSION = substr(q$Revision: 2.4 $, 10);
require Vend::UserDB;
use Vend::Data;
@@ -615,8 +615,8 @@
return $adb->query($q);
}
-*delete_shipping = \&delete_address;
*delete_billing = \&delete_address;
+*delete_shipping = \&delete_address;
*get_billing_names = \&get_names;
*get_shipping_names = \&get_names;
More information about the interchange-cvs
mailing list