[interchange-cvs] interchange - heins modified 20 files

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Sun Feb 3 20:32:01 2002


User:      heins
Date:      2002-02-04 01:31:18 GMT
Modified:  .        Makefile.PL
Modified:  code/UI_Tag component_editor.coretag file_navigator.coretag
Modified:           image_collate.coretag read_ui_page.coretag
Modified:  code/UserTag fcounter.tag
Modified:  dist/lib/UI Primitive.pm ui.cfg
Modified:  lib/Vend Form.pm Interpolate.pm Order.pm Session.pm
Modified:           UserDB.pm
Modified:  lib/Vend/Table Common.pm DBI.pm DB_File.pm GDBM.pm SDBM.pm
Modified:  scripts  interchange.PL
Removed:   extra/File CounterFile.pm
Log:
	* Create Vend::CounterFile module and use it for counters. This
	  allows us to use/honor Fcntl lock settings and improve reliability
	  on shared sessions.

Revision  Changes    Path
2.15      +0 -3      interchange/Makefile.PL


rev 2.15, prev_rev 2.14
Index: Makefile.PL
===================================================================
RCS file: /anon_cvs/repository/interchange/Makefile.PL,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -r2.14 -r2.15
--- Makefile.PL	1 Feb 2002 16:01:55 -0000	2.14
+++ Makefile.PL	4 Feb 2002 01:31:17 -0000	2.15
@@ -180,9 +180,6 @@
 
 	my @extra_lib_dirs;
 	my @extra_lib_files;
-	# We will use our own version of File::CounterFile always
-	push @extra_lib_dirs, 'File';
-	push @extra_lib_files, 'File/CounterFile.pm';
 
 	eval {
 		require IniConf;



1.2       +1 -1      interchange/code/UI_Tag/component_editor.coretag


rev 1.2, prev_rev 1.1
Index: component_editor.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/component_editor.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- component_editor.coretag	29 Jan 2002 05:52:40 -0000	1.1
+++ component_editor.coretag	4 Feb 2002 01:31:17 -0000	1.2
@@ -167,7 +167,7 @@
 						|| 'templates';
 
 	if($opt->{template}) {
-		$tref;
+		#$tref;
 	}
 	my $rowcount = 0;
 	my $rowdiv = $opt->{across} || 1;



1.2       +1 -0      interchange/code/UI_Tag/file_navigator.coretag


rev 1.2, prev_rev 1.1
Index: file_navigator.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/file_navigator.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_navigator.coretag	29 Jan 2002 05:52:40 -0000	1.1
+++ file_navigator.coretag	4 Feb 2002 01:31:17 -0000	1.2
@@ -4,6 +4,7 @@
 use vars qw/$CGI $Session $Tag $Scratch/;
 eval {
         require Fcntl;
+		local($^W) = 0;
         import Fcntl qw/:mode/;
 };
 if ($@) {



1.2       +1 -1      interchange/code/UI_Tag/image_collate.coretag


rev 1.2, prev_rev 1.1
Index: image_collate.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/image_collate.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- image_collate.coretag	29 Jan 2002 05:52:40 -0000	1.1
+++ image_collate.coretag	4 Feb 2002 01:31:17 -0000	1.2
@@ -152,7 +152,7 @@
 		chdir '..';
 	}
 
-	my $save_mask = umask(2);
+	my $save_mask = umask(02);
 
 	foreach my $base (qw/ items thumb /) {
 		my $imgbase = "$Vend::Cfg->{VendRoot}/images/$base";



1.3       +70 -69    interchange/code/UI_Tag/read_ui_page.coretag


rev 1.3, prev_rev 1.2
Index: read_ui_page.coretag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/read_ui_page.coretag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- read_ui_page.coretag	2 Feb 2002 08:57:11 -0000	1.2
+++ read_ui_page.coretag	4 Feb 2002 01:31:17 -0000	1.3
@@ -1,67 +1,5 @@
 UserTag read-ui-page Order page 
 UserTag read-ui-page addAttr
-UserTag read-ui-page Documentation <<EOD
-[read-ui-page page="<filespec>"]
-
-Returns the structure of a page.
-
-
-ui_component
-
-	Returns the component settings as an array with the elements
-	as major keys, i.e:
-
-		[control-set]
-			[size]1[/size]
-			[color]red[/color]
-		[/control-set]
-
-		[control-set]
-			[size]5[/size]
-			[color]green[/color]
-			[banner]Very Green[/banner]
-		[/control-set]
-
-	becomes:
-
-		[
-			{ size => 1, color => 'red' },
-			{ size => 5, color => 'green', banner => 'Very Green' },
-		]
-
-ui_component_text
-
-	The component settings as text, in the event component settings are
-	not to be edited.
-
-ui_page_setting
-
-	Returns the page global settings as a hash. Reads [set|tmp|seti ..][/set]
-	in the area above the first template region (i.e. @_LEFTONLY_TOP_@), but outside
-	of the [control] region.
-
-		[set page_title]Some title[/set]
-		[set members_only][/set]
-
-	becomes:
-
-		{ page_title => 'Some title', members_only => 1 }
-
-ui_page_setting_text
-
-	The text of the page setting area, used if the page settings are not to
-	be edited.
-
-If the textref=1 is passed in the tag call, a stringified version is
-returned.
-
-ui_content
-
-    Returns the content, which is the section between
-	<!-- BEGIN CONTENT --> and <!-- END CONTENT -->.
-
-EOD
-
 UserTag read-ui-page Routine <<EOR
 sub {
 	my ($pn, $opt) = @_;
@@ -142,13 +80,13 @@
 
 	my @comps;
 
-	sub _setref {
-		my ($ref, $key, $val) = @_;
-		$key = lc $key;
-		$key =~ tr/-/_/;
+	my $setref = sub {
+			my ($ref, $key, $val) = @_;
+			$key = lc $key;
+			$key =~ tr/-/_/;
 #Log("_setref key=$key val=$val");
-		$ref->{$key} = $val;
-	}
+			$ref->{$key} = $val;
+		};
 
 #Debug("preamble=|$preamble| postamble=|$postamble|");
 	if ( 
@@ -202,7 +140,7 @@
 		while($stuff =~ s{\[control-set\](.*?)\[/control-set\]}{}is ) {
 			my $sets = $1;
 			my $r = {};
-			$sets =~ s{\[([-\w]+)\](.*?)\[/\1\]}{ _setref($r, $1, $2) }eisg;
+			$sets =~ s{\[([-\w]+)\](.*?)\[/\1\]}{ $setref->($r, $1, $2) }eisg;
 			push @comps, $r;
 		}
 
@@ -232,3 +170,66 @@
 
 }
 EOR
+
+UserTag read-ui-page Documentation <<EOD
+[read-ui-page page="<filespec>"]
+
+Returns the structure of a page.
+
+
+ui_component
+
+	Returns the component settings as an array with the elements
+	as major keys, i.e:
+
+		[control-set]
+			[size]1[/size]
+			[color]red[/color]
+		[/control-set]
+
+		[control-set]
+			[size]5[/size]
+			[color]green[/color]
+			[banner]Very Green[/banner]
+		[/control-set]
+
+	becomes:
+
+		[
+			{ size => 1, color => 'red' },
+			{ size => 5, color => 'green', banner => 'Very Green' },
+		]
+
+ui_component_text
+
+	The component settings as text, in the event component settings are
+	not to be edited.
+
+ui_page_setting
+
+	Returns the page global settings as a hash. Reads [set|tmp|seti ..][/set]
+	in the area above the first template region (i.e. @_LEFTONLY_TOP_@), but outside
+	of the [control] region.
+
+		[set page_title]Some title[/set]
+		[set members_only][/set]
+
+	becomes:
+
+		{ page_title => 'Some title', members_only => 1 }
+
+ui_page_setting_text
+
+	The text of the page setting area, used if the page settings are not to
+	be edited.
+
+If the textref=1 is passed in the tag call, a stringified version is
+returned.
+
+ui_content
+
+    Returns the content, which is the section between
+	<!-- BEGIN CONTENT --> and <!-- END CONTENT -->.
+
+EOD
+



1.2       +1 -1      interchange/code/UserTag/fcounter.tag


rev 1.2, prev_rev 1.1
Index: fcounter.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UserTag/fcounter.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fcounter.tag	29 Jan 2002 05:52:42 -0000	1.1
+++ fcounter.tag	4 Feb 2002 01:31:17 -0000	1.2
@@ -7,7 +7,7 @@
 	my $opt = shift;
     $file = $Vend::Cfg->{VendRoot} . "/$file"
         unless index($file, '/') == 0;
-    my $ctr = new File::CounterFile $file, $opt->{start} || undef;
+    my $ctr = new Vend::CounterFile $file, $opt->{start} || undef;
     return $ctr->inc();
 }
 EOF



2.15      +3 -3      interchange/dist/lib/UI/Primitive.pm


rev 2.15, prev_rev 2.14
Index: Primitive.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/Primitive.pm,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -r2.14 -r2.15
--- Primitive.pm	3 Feb 2002 22:01:57 -0000	2.14
+++ Primitive.pm	4 Feb 2002 01:31:17 -0000	2.15
@@ -1,6 +1,6 @@
 # UI::Primitive - Interchange configuration manager primitives
 
-# $Id: Primitive.pm,v 2.14 2002/02/03 22:01:57 mheins Exp $
+# $Id: Primitive.pm,v 2.15 2002/02/04 01:31:17 mheins Exp $
 
 # Copyright (C) 1998-2001 Red Hat, Inc. <interchange@redhat.com>
 
@@ -25,7 +25,7 @@
 
 package UI::Primitive;
 
-$VERSION = substr(q$Revision: 2.14 $, 10);
+$VERSION = substr(q$Revision: 2.15 $, 10);
 
 $DEBUG = 0;
 
@@ -36,7 +36,7 @@
 	!;
 
 use File::Find;
-use File::CounterFile;
+use Vend::CounterFile;
 use Text::ParseWords;
 use Exporter;
 use strict;



2.3       +4 -1      interchange/dist/lib/UI/ui.cfg


rev 2.3, prev_rev 2.2
Index: ui.cfg
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/ui.cfg,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- ui.cfg	7 Aug 2001 04:12:56 -0000	2.2
+++ ui.cfg	4 Feb 2002 01:31:17 -0000	2.3
@@ -6,7 +6,10 @@
 Variable UI_BASE admin
 Variable UI_MENU_TABLE icmenu
 Variable UI_HELP_TABLE ichelp
-Variable UI_HELP_URL   http://help.interchange.redhat.com/4.8
+
+## Local help by default, we are not updating often enough
+## Suggest link to this in local help page...
+##Variable UI_HELP_URL   http://help.interchange.redhat.com/4.9
 
 Variable UI_STATE_TABLE   state
 Variable UI_COUNTRY_TABLE country



2.8       +8 -9      interchange/lib/Vend/Form.pm


rev 2.8, prev_rev 2.7
Index: Form.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Form.pm,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- Form.pm	3 Feb 2002 06:37:55 -0000	2.7
+++ Form.pm	4 Feb 2002 01:31:17 -0000	2.8
@@ -1,6 +1,6 @@
 # Vend::Form - Generate Form widgets
 # 
-# $Id: Form.pm,v 2.7 2002/02/03 06:37:55 mheins Exp $
+# $Id: Form.pm,v 2.8 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -36,7 +36,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.7 $, 10);
+$VERSION = substr(q$Revision: 2.8 $, 10);
 
 @EXPORT = qw (
 	display
@@ -800,7 +800,7 @@
 	$run .= $footer;
 }
 
-sub scalar_to_array {
+sub options_to_array {
 	my ($passed, $opt) = @_;
 	return $passed if ref($passed) eq 'ARRAY'
 		and (
@@ -858,12 +858,12 @@
 		return \@out;
 	}
 	else {
-		die "bad data type to scalar_to_array";
+		die "bad data type to options_to_array";
 	}
 }
 
 sub display {
-	my($opt, $item) = @_;
+	my($opt, $item, $data) = @_;
 
 if($opt->{debug}) {
 	::logDebug("display called, options=" . uneval($opt));
@@ -936,16 +936,15 @@
 	#            in $opt
 	my $type = parse_type($opt);
 
-	my $data;
 	my $look;
 
 	if($opt->{passed}) {
-		$data = scalar_to_array($opt->{passed}, $opt);
+		$data = options_to_array($opt->{passed}, $opt);
 	}
 	elsif($opt->{column} and $opt->{table}) {
 		my $key = $opt->{outboard} || $item->{code} || $opt->{code};
 		$opt->{passed} = $Tag->data($opt->{table}, $opt->{column}, $key);
-		$data = scalar_to_array($opt->{passed}, $opt);
+		$data = options_to_array($opt->{passed}, $opt);
 	}
 	elsif(! $Global::VendRoot) {
 		# Not in Interchange
@@ -991,7 +990,7 @@
 	if($look and $data) {
 		my $ary;
 		if($opt->{options}) {
-			$ary = scalar_to_array($opt->{options}, $opt) || [];
+			$ary = options_to_array($opt->{options}, $opt) || [];
 		}
 		elsif(! scalar(@$data)) {
 			$ary = [['', errmsg('--no current values--')]];



2.55      +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.55, prev_rev 2.54
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.54
retrieving revision 2.55
diff -u -r2.54 -r2.55
--- Interpolate.pm	3 Feb 2002 06:44:42 -0000	2.54
+++ Interpolate.pm	4 Feb 2002 01:31:17 -0000	2.55
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.54 2002/02/03 06:44:42 mheins Exp $
+# $Id: Interpolate.pm,v 2.55 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.54 $, 10);
+$VERSION = substr(q$Revision: 2.55 $, 10);
 
 @EXPORT = qw (
 
@@ -2523,7 +2523,7 @@
 #::logDebug("counter: file=$file start=$opt->{start}");
     $file = $Vend::Cfg->{VendRoot} . "/$file"
         unless Vend::Util::file_name_is_absolute($file);
-    my $ctr = new File::CounterFile $file, $opt->{start} || undef;
+    my $ctr = new Vend::CounterFile $file, $opt->{start} || undef;
     return $ctr->value() if $opt->{value};
     return $ctr->dec() if $opt->{decrement};
     return $ctr->inc();



2.14      +4 -4      interchange/lib/Vend/Order.pm


rev 2.14, prev_rev 2.13
Index: Order.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Order.pm,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -r2.13 -r2.14
--- Order.pm	29 Jan 2002 05:52:43 -0000	2.13
+++ Order.pm	4 Feb 2002 01:31:17 -0000	2.14
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.13 2002/01/29 05:52:43 mheins Exp $
+# $Id: Order.pm,v 2.14 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -28,7 +28,7 @@
 package Vend::Order;
 require Exporter;
 
-$VERSION = substr(q$Revision: 2.13 $, 10);
+$VERSION = substr(q$Revision: 2.14 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -1198,9 +1198,9 @@
 
 sub counter_number {
 	my $file = shift || $Vend::Cfg->{OrderCounter};
-	$File::CounterFile::DEFAULT_DIR = $Vend::Cfg->{VendRoot}
+	$Vend::CounterFile::DEFAULT_DIR = $Vend::Cfg->{VendRoot}
 		unless $file =~ m!^/!;
-	my $c = new File::CounterFile $file, "000000";
+	my $c = new Vend::CounterFile $file, "000000";
 	return $c->inc;
 }
 



2.3       +4 -4      interchange/lib/Vend/Session.pm


rev 2.3, prev_rev 2.2
Index: Session.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Session.pm,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- Session.pm	22 Jan 2002 02:07:08 -0000	2.2
+++ Session.pm	4 Feb 2002 01:31:17 -0000	2.3
@@ -1,6 +1,6 @@
 # Vend::Session - Interchange session routines
 #
-# $Id: Session.pm,v 2.2 2002/01/22 02:07:08 mheins Exp $
+# $Id: Session.pm,v 2.3 2002/02/04 01:31:17 mheins Exp $
 # 
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -26,7 +26,7 @@
 require Exporter;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.2 $, 10);
+$VERSION = substr(q$Revision: 2.3 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -201,8 +201,8 @@
 		my $grace = time() - ($Global::Variable->{MV_ROBOT_EXPIRE} || 86400);
 		unlink $fn if -M $fn < $grace;
 	}
-	return File::CounterFile->new($fn)->inc() if $inc;
-	return File::CounterFile->new($fn)->value();
+	return Vend::CounterFile->new($fn)->inc() if $inc;
+	return Vend::CounterFile->new($fn)->value();
 }
 
 



2.3       +3 -3      interchange/lib/Vend/UserDB.pm


rev 2.3, prev_rev 2.2
Index: UserDB.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- UserDB.pm	18 Sep 2001 21:59:22 -0000	2.2
+++ UserDB.pm	4 Feb 2002 01:31:17 -0000	2.3
@@ -1,6 +1,6 @@
 # Vend::UserDB - Interchange user database functions
 #
-# $Id: UserDB.pm,v 2.2 2001/09/18 21:59:22 jon Exp $
+# $Id: UserDB.pm,v 2.3 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -16,7 +16,7 @@
 
 package Vend::UserDB;
 
-$VERSION = substr(q$Revision: 2.2 $, 10);
+$VERSION = substr(q$Revision: 2.3 $, 10);
 
 use vars qw!
 	$VERSION
@@ -1258,7 +1258,7 @@
         my $file = shift || $self->{OPTIONS}{'counter'};
         my $start = $self->{OPTIONS}{username} || 'U00000';
         $file = './etc/username.counter' if ! $file;
-        my $ctr = File::CounterFile->new($file, $start);
+        my $ctr = Vend::CounterFile->new($file, $start);
         return $ctr->inc();
 }
 



2.11      +4 -4      interchange/lib/Vend/Table/Common.pm


rev 2.11, prev_rev 2.10
Index: Common.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Table/Common.pm,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- Common.pm	2 Feb 2002 18:52:54 -0000	2.10
+++ Common.pm	4 Feb 2002 01:31:17 -0000	2.11
@@ -1,6 +1,6 @@
 # Vend::Table::Common - Common access methods for Interchange databases
 #
-# $Id: Common.pm,v 2.10 2002/02/02 18:52:54 mheins Exp $
+# $Id: Common.pm,v 2.11 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -22,13 +22,13 @@
 # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA  02111-1307  USA.
 
-$VERSION = substr(q$Revision: 2.10 $, 10);
+$VERSION = substr(q$Revision: 2.11 $, 10);
 use strict;
 
 package Vend::Table::Common;
 require Vend::DbSearch;
 require Vend::TextSearch;
-require File::CounterFile;
+require Vend::CounterFile;
 use Vend::Util;
 
 use Exporter;
@@ -140,7 +140,7 @@
 	local($/) = "\n";
 	my $c = $s->[$CONFIG];
 	if(! defined $c->{AutoNumberCounter}) {
-		$c->{AutoNumberCounter} = new File::CounterFile
+		$c->{AutoNumberCounter} = new Vend::CounterFile
 									"$c->{DIR}/$c->{name}.autonumber", $start;
 	}
 	my $num;



2.12      +3 -3      interchange/lib/Vend/Table/DBI.pm


rev 2.12, prev_rev 2.11
Index: DBI.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Table/DBI.pm,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- DBI.pm	2 Feb 2002 18:52:54 -0000	2.11
+++ DBI.pm	4 Feb 2002 01:31:17 -0000	2.12
@@ -1,6 +1,6 @@
 # Vend::Table::DBI - Access a table stored in an DBI/DBD database
 #
-# $Id: DBI.pm,v 2.11 2002/02/02 18:52:54 mheins Exp $
+# $Id: DBI.pm,v 2.12 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -20,7 +20,7 @@
 # MA  02111-1307  USA.
 
 package Vend::Table::DBI;
-$VERSION = substr(q$Revision: 2.11 $, 10);
+$VERSION = substr(q$Revision: 2.12 $, 10);
 
 use strict;
 
@@ -450,7 +450,7 @@
 
     if (! $config->{AUTO_SEQUENCE} and ! defined $config->{AutoNumberCounter}) {
 	    eval {
-			$config->{AutoNumberCounter} = new File::CounterFile
+			$config->{AutoNumberCounter} = new Vend::CounterFile
 									"$config->{DIR}/$config->{name}.autonumber",
 									$config->{AUTO_NUMBER} || '00001';
 		};



2.1       +3 -3      interchange/lib/Vend/Table/DB_File.pm


rev 2.1, prev_rev 2.0
Index: DB_File.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Table/DB_File.pm,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- DB_File.pm	18 Jul 2001 02:23:20 -0000	2.0
+++ DB_File.pm	4 Feb 2002 01:31:17 -0000	2.1
@@ -1,6 +1,6 @@
 # Vend::Table::DB_File - Access an Interchange table stored in a DB file hash
 #
-# $Id: DB_File.pm,v 2.0 2001/07/18 02:23:20 jon Exp $
+# $Id: DB_File.pm,v 2.1 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -30,7 +30,7 @@
 use Vend::Table::Common;
 
 @ISA = qw(Vend::Table::Common);
-$VERSION = substr(q$Revision: 2.0 $, 10);
+$VERSION = substr(q$Revision: 2.1 $, 10);
 
 sub create {
 	my ($class, $config, $columns, $filename) = @_;
@@ -89,7 +89,7 @@
 		$flags = O_RDWR;
 		if(! defined $config->{AutoNumberCounter}) {
 			eval {
-				$config->{AutoNumberCounter} = new File::CounterFile
+				$config->{AutoNumberCounter} = new Vend::CounterFile
 											"$config->{DIR}/$config->{name}.autonumber",
 											$config->{AUTO_NUMBER} || '00001';
 			};



2.1       +3 -3      interchange/lib/Vend/Table/GDBM.pm


rev 2.1, prev_rev 2.0
Index: GDBM.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Table/GDBM.pm,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- GDBM.pm	18 Jul 2001 02:23:20 -0000	2.0
+++ GDBM.pm	4 Feb 2002 01:31:17 -0000	2.1
@@ -1,6 +1,6 @@
 # Vend::Table::GDBM - Access an Interchange table stored in a GDBM file
 #
-# $Id: GDBM.pm,v 2.0 2001/07/18 02:23:20 jon Exp $
+# $Id: GDBM.pm,v 2.1 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -29,7 +29,7 @@
 use Vend::Table::Common;
 
 @ISA = qw(Vend::Table::Common);
-$VERSION = substr(q$Revision: 2.0 $, 10);
+$VERSION = substr(q$Revision: 2.1 $, 10);
 
 sub new {
 	my ($class, $obj) = @_;
@@ -91,7 +91,7 @@
 		$flags = GDBM_WRITER;
 		if(! defined $config->{AutoNumberCounter}) {
 			eval {
-				$config->{AutoNumberCounter} = new File::CounterFile
+				$config->{AutoNumberCounter} = new Vend::CounterFile
 											"$config->{DIR}/$config->{name}.autonumber",
 											$config->{AUTO_NUMBER} || '00001';
 			};



2.1       +4 -4      interchange/lib/Vend/Table/SDBM.pm


rev 2.1, prev_rev 2.0
Index: SDBM.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Table/SDBM.pm,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -r2.0 -r2.1
--- SDBM.pm	18 Jul 2001 02:23:20 -0000	2.0
+++ SDBM.pm	4 Feb 2002 01:31:17 -0000	2.1
@@ -1,6 +1,6 @@
 # Vend::Table::SDBM - Access an Interchange table stored in Perl's internal SDBM
 #
-# $Id: SDBM.pm,v 2.0 2001/07/18 02:23:20 jon Exp $
+# $Id: SDBM.pm,v 2.1 2002/02/04 01:31:17 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -23,7 +23,7 @@
 # MA  02111-1307  USA.
 
 package Vend::Table::SDBM;
-$VERSION = substr(q$Revision: 2.0 $, 10);
+$VERSION = substr(q$Revision: 2.1 $, 10);
 use strict;
 use Fcntl;
 use SDBM_File;
@@ -31,7 +31,7 @@
 use Vend::Table::Common;
 
 @ISA = qw(Vend::Table::Common);
-$VERSION = substr(q$Revision: 2.0 $, 10);
+$VERSION = substr(q$Revision: 2.1 $, 10);
 
 sub create {
 	my ($class, $config, $columns, $filename) = @_;
@@ -95,7 +95,7 @@
 		$flags = O_RDWR;
 		if(! defined $config->{AutoNumberCounter}) {
 			eval {
-				$config->{AutoNumberCounter} = new File::CounterFile
+				$config->{AutoNumberCounter} = new Vend::CounterFile
 											"$config->{DIR}/$config->{name}.autonumber",
 											$config->{AUTO_NUMBER} || '00001';
 			};



2.21      +3 -3      interchange/scripts/interchange.PL


rev 2.21, prev_rev 2.20
Index: interchange.PL
===================================================================
RCS file: /anon_cvs/repository/interchange/scripts/interchange.PL,v
retrieving revision 2.20
retrieving revision 2.21
diff -u -r2.20 -r2.21
--- interchange.PL	3 Feb 2002 07:18:52 -0000	2.20
+++ interchange.PL	4 Feb 2002 01:31:18 -0000	2.21
@@ -50,7 +50,7 @@
 #
 # Interchange version 4.9.0
 #
-# $Id: interchange.PL,v 2.20 2002/02/03 07:18:52 mheins Exp $
+# $Id: interchange.PL,v 2.21 2002/02/04 01:31:18 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -316,7 +316,7 @@
 use Vend::UserDB;
 use Vend::Interpolate;
 use Vend::Page;
-use File::CounterFile;
+use Vend::CounterFile;
 
 if( ! $Global::Windows and $> == -1 || scalar(getpwuid($>)) eq 'nobody' ) {
 	warn errmsg("\aYou probably don't want to run as nobody!\n");
@@ -1859,7 +1859,7 @@
 	}
 
 	if($Global::HitCount) {
-		my $ctr = new File::CounterFile
+		my $ctr = new Vend::CounterFile
 					"$Global::ConfDir/hits.$Vend::Cat";
         $ctr->inc();
 	}