[interchange-cvs] interchange - jon modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Tue Aug 12 22:02:57 UTC 2008


User:      jon
Date:      2008-08-12 22:02:57 GMT
Modified:  code/UI_Tag backup_database.coretag
Modified:  lib/Vend Data.pm
Log:
Allow explicit manual table exports even when NoExportExternal is enabled.

This could be done from any invocation of Vend::Data::export_database,
but is here done only from the [backup-database] tag used in the admin.

Revision  Changes    Path
1.10                 interchange/code/UI_Tag/backup_database.coretag


rev 1.10, prev_rev 1.9
Index: backup_database.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/backup_database.coretag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- backup_database.coretag	30 Mar 2007 23:40:54 -0000	1.9
+++ backup_database.coretag	12 Aug 2008 22:02:57 -0000	1.10
@@ -1,15 +1,15 @@
-# Copyright 2002-2007 Interchange Development Group and others
+# Copyright 2002-2008 Interchange Development Group and others
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: backup_database.coretag,v 1.9 2007-03-30 23:40:54 pajamian Exp $
+# $Id: backup_database.coretag,v 1.10 2008-08-12 22:02:57 jon Exp $
 
 UserTag backup-database Order    tables
 UserTag backup-database AddAttr
-UserTag backup-database Version  $Revision: 1.9 $
+UserTag backup-database Version  $Revision: 1.10 $
 UserTag backup-database Routine  <<EOR
 sub {
 	my ($tables, $opt) = @_;
@@ -69,6 +69,7 @@
 			$status = export(
 						$table,
 						{
+							force => 1,
 							table => $table,
 							file => $file,
 							type => 'TAB',



2.68                 interchange/lib/Vend/Data.pm


rev 2.68, prev_rev 2.67
Index: Data.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Data.pm,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -u -r2.67 -r2.68
--- Data.pm	5 May 2008 15:14:00 -0000	2.67
+++ Data.pm	12 Aug 2008 22:02:57 -0000	2.68
@@ -1,6 +1,6 @@
 # Vend::Data - Interchange databases
 #
-# $Id: Data.pm,v 2.67 2008-05-05 15:14:00 markj Exp $
+# $Id: Data.pm,v 2.68 2008-08-12 22:02:57 jon Exp $
 # 
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -1154,7 +1154,7 @@
 
 	$db = $db->ref();
 
-	if ($Vend::Cfg->{NoExportExternal}) {
+	if ($Vend::Cfg->{NoExportExternal} and !$opt->{force}) {
 		# Skip export only for "external" tables (currently SQL and LDAP),
 		# just like NoImportExternal does
 		my $class = $db->config('Class');
@@ -1164,7 +1164,7 @@
 
 	my $table_name = $db->config('name');
 
-	return 1 if $Vend::Cfg->{NoExport}->{$table_name};
+	return 1 if $Vend::Cfg->{NoExport}{$table_name} and !$opt->{force};
 
 	my $qual;
 	if($qual = $opt->{where}) {







More information about the interchange-cvs mailing list