[interchange-cvs] interchange - heins modified lib/Vend/Table/Editor.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Wed Apr 9 11:09:08 2003


User:      heins
Date:      2003-04-09 15:08:50 GMT
Modified:  lib/Vend/Table Editor.pm
Log:
	* Fix "die" and server error when column defined twice in
	  fields-to-edit specification. Do warning instead.

	* Add ability to pass no-meta=1 parameter (don't show meta links)
	  from CGI or table definition.

Revision  Changes    Path
1.29      +11 -3     interchange/lib/Vend/Table/Editor.pm


rev 1.29, prev_rev 1.28
Index: Editor.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Table/Editor.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Editor.pm	29 Mar 2003 20:33:13 -0000	1.28
+++ Editor.pm	9 Apr 2003 15:08:50 -0000	1.29
@@ -1,6 +1,6 @@
 # Vend::Table::Editor - Swiss-army-knife table editor for Interchange
 #
-# $Id: Editor.pm,v 1.28 2003/03/29 20:33:13 mheins Exp $
+# $Id: Editor.pm,v 1.29 2003/04/09 15:08:50 mheins Exp $
 #
 # Copyright (C) 2002 ICDEVGROUP <interchange@icdevgroup.org>
 # Copyright (C) 2002 Mike Heins <mike@perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Table::Editor;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.28 $, 10);
+$VERSION = substr(q$Revision: 1.29 $, 10);
 
 use Vend::Util;
 use Vend::Interpolate;
@@ -931,7 +931,14 @@
 
 #::logDebug("$tag content length=" . length($value));
 
-	die "duplicate tag settor $tag" if exists $outhash{$tag};
+	if(exists $outhash{$tag}) {
+		my $col = $tag;
+		$col =~ s/^COLUMN_//;
+		my $msg = errmsg("Column '%s' defined twice, skipping second.", $col);
+		Vend::Tags->warnings($msg);
+		return;
+	}
+
 	$outhash{$tag} = $value;
 
 	if(@others) {
@@ -1243,6 +1250,7 @@
 		mv_data_table
 		mv_update_empty
 		nodelete
+		no_meta
 		output_map
 		panel_height
 		panel_id