[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_2-11-gf99f328

[Jon Jensen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  f99f328f8ac6349888ac08f56b7c71202e3c27eb (commit)
       via  16f8eac4fd86b8245e6dbdf5d660961132a349dc (commit)
      from  2f5ddb1382f6082e73a8a23d3d35a957e0d688a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f99f328f8ac6349888ac08f56b7c71202e3c27eb
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Oct 22 16:58:14 2009 -0600

    Minor tweaks
    
    * Clarify flow of xls option checks.
    * Update copyright and version.
    * Remove stale CVS Id tag.

commit 16f8eac4fd86b8245e6dbdf5d660961132a349dc
Author: Carl Bailey <carl at endpoint.com>
Date:   Sun Oct 18 12:09:33 2009 -0400

    remove reference to deprecated Spreadsheet::WriteExcel::Big module

-----------------------------------------------------------------------

Summary of changes and diff:
 code/UI_Tag/backup_database.coretag |   40 ++++++++++++++--------------------
 1 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/code/UI_Tag/backup_database.coretag b/code/UI_Tag/backup_database.coretag
index 20bd4e7..d17a1d5 100644
--- a/code/UI_Tag/backup_database.coretag
+++ b/code/UI_Tag/backup_database.coretag
@@ -1,15 +1,13 @@
-# Copyright 2002-2008 Interchange Development Group and others
+# Copyright 2002-2009 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.10 2008-08-12 22:02:57 jon Exp $
 
 UserTag backup-database Order    tables
 UserTag backup-database AddAttr
-UserTag backup-database Version  $Revision: 1.10 $
+UserTag backup-database Version  1.11
 UserTag backup-database Routine  <<EOR
 sub {
 	my ($tables, $opt) = @_;
@@ -24,28 +22,24 @@ sub {
 
 	eval {
 		require Compress::Zlib;
-	} if $opt ->{compress};
+	} if $opt->{compress};
 
 	my $xls;
 
-	eval {
-		require Spreadsheet::WriteExcel::Big;
-		import Spreadsheet::WriteExcel::Big;
-		$xls = Spreadsheet::WriteExcel::Big->new("$backup_dir/DBDOWNLOAD.xls");
-	} if $opt ->{xls};
-
-	eval {
-		require Spreadsheet::WriteExcel;
-		import Spreadsheet::WriteExcel;
-		$xls = Spreadsheet::WriteExcel->new("$backup_dir/DBDOWNLOAD.xls");
-	} if $opt ->{xls} and ! $xls;
-
-	undef $opt->{xls} unless $xls;
-
-	if($opt->{xls}) {
-		if($opt->{max_xls_string}) {
-			$Max_xls_string = int($opt->{max_xls_string}) || 255;
-			$xls->{_xls_strmax} = $Max_xls_string;
+	if ($opt->{xls}) {
+		eval {
+			require Spreadsheet::WriteExcel;
+			import Spreadsheet::WriteExcel;
+			$xls = Spreadsheet::WriteExcel->new("$backup_dir/DBDOWNLOAD.xls");
+		};
+		if ($xls) {
+			if ($opt->{max_xls_string}) {
+				$Max_xls_string = int($opt->{max_xls_string}) || 255;
+				$xls->{_xls_strmax} = $Max_xls_string;
+			}
+		}
+		else {
+			undef $opt->{xls};
 		}
 	}
 


hooks/post-receive
-- 
Interchange