[interchange-cvs] interchange - racke modified lib/Vend/Data.pm

[interchange-core@icdevgroup.org]

User:      racke
Date:      2002-08-02 11:44:56 GMT
Modified:  lib/Vend Data.pm
Log:
these changes are made in order to get Shadow working with text databases

Revision  Changes    Path
2.13      +9 -4      interchange/lib/Vend/Data.pm


rev 2.13, prev_rev 2.12
Index: Data.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/Data.pm,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -r2.12 -r2.13
--- Data.pm	14 Jul 2002 03:21:05 -0000	2.12
+++ Data.pm	2 Aug 2002 11:44:55 -0000	2.13
@@ -1,6 +1,6 @@
 # Vend::Data - Interchange databases
 #
-# $Id: Data.pm,v 2.12 2002/07/14 03:21:05 jon Exp $
+# $Id: Data.pm,v 2.13 2002/08/02 11:44:55 racke Exp $
 #=20
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -616,8 +616,6 @@
 # END SQL
 		'SHADOW' =3D> {
 				qw/
-					Extension			 shadow
-					RestrictedImport	 1
 					Class                Vend::Table::Shadow
 				/
 				},
@@ -784,7 +782,14 @@
 	$base =3D $obj->{'name'};
 	$dir =3D $obj->{DIR} if defined $obj->{DIR};
=20
-	$class_config =3D $db_config{$obj->{Class} || $Global::Default_database};
+	if ($obj->{OrigClass}) {
+		my $ref =3D $db_config{$obj->{OrigClass} || $Global::Default_database};
+		$class_config =3D {%$ref};
+		$class_config->{Class} =3D $db_config{$obj->{Class}}->{Class};
+		$class_config->{OrigClass} =3D $obj->{OrigClass};
+	} else {
+		$class_config =3D $db_config{$obj->{Class} || $Global::Default_database};
+	}
=20
 #::logDebug ("params=3D$database_txt path=3D'$path' base=3D'$base' tail=3D=
'$tail' dir=3D'$dir'") if $type =3D=3D 9;
 	$table_name     =3D $name;