[interchange-cvs] interchange - heins modified lib/Vend/Data.pm
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Thu Jan 31 12:58:01 2002
User: heins
Date: 2002-01-31 17:57:02 GMT
Modified: lib/Vend Data.pm
Log:
* Remove some debug, fix bad indentation.
Revision Changes Path
2.6 +24 -28 interchange/lib/Vend/Data.pm
rev 2.6, prev_rev 2.5
Index: Data.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Data.pm,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- Data.pm 29 Dec 2001 19:49:33 -0000 2.5
+++ Data.pm 31 Jan 2002 17:57:02 -0000 2.6
@@ -1,6 +1,6 @@
# Vend::Data - Interchange databases
#
-# $Id: Data.pm,v 2.5 2001/12/29 19:49:33 mheins Exp $
+# $Id: Data.pm,v 2.6 2002/01/31 17:57:02 mheins Exp $
#
# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
#
@@ -663,37 +663,33 @@
push @delayed, $name;
next;
}
- if(! $data->{name}) {
-#::logDebug("Screwed up database: " . ::uneval( $data) );
- next;
- }
- if( $data->{type} > 6 or $data->{HOT} or $data->{IMPORT_ONCE} ) {
-#::logDebug("Importing '$data->{name}'...");
- eval {
- $Vend::Database{$name} = import_database($data);
- };
- if($@) {
- my $msg = "table '%s' failed: %s";
- $msg = ::errmsg($msg, $name, $@);
- ::logError($msg);
+ if(! $data->{name}) {
+ next;
}
- }
- else {
-#::logDebug("Tieing '$data->{name}'...");
- if($data->{GUESS_NUMERIC}) {
- my $dir = $data->{DIR} || $Vend::Cfg->{ProductDir};
- my $fn = Vend::Util::catfile( $dir, $data->{file} );
- my @fields = grep /\S/, split /\s+/, ::readfile("$fn.numeric");
-#::logDebug("fields=@fields");
- $data->{NUMERIC} = {};
- for(@fields) {
- $data->{NUMERIC}{$_} = 1;
+ if( $data->{type} > 6 or $data->{HOT} or $data->{IMPORT_ONCE} ) {
+ eval {
+ $Vend::Database{$name} = import_database($data);
+ };
+ if($@) {
+ my $msg = "table '%s' failed: %s";
+ $msg = ::errmsg($msg, $name, $@);
+ ::logError($msg);
}
}
- my $class = $db_config{$data->{Class}}->{Class};
- $Vend::Database{$name} = new $class ($data);
+ else {
+ if($data->{GUESS_NUMERIC}) {
+ my $dir = $data->{DIR} || $Vend::Cfg->{ProductDir};
+ my $fn = Vend::Util::catfile( $dir, $data->{file} );
+ my @fields = grep /\S/, split /\s+/, ::readfile("$fn.numeric");
+ $data->{NUMERIC} = {};
+ for(@fields) {
+ $data->{NUMERIC}{$_} = 1;
+ }
+ }
+ my $class = $db_config{$data->{Class}}->{Class};
+ $Vend::Database{$name} = new $class ($data);
+ }
}
- }
# So mirrors will not happen until after mirror source
if(@delayed) {