[interchange-cvs] interchange - racke modified 2 files

[interchange-core@icdevgroup.org]

User:      racke
Date:      2003-02-17 13:24:31 GMT
Modified:  .        WHATSNEW
Modified:  dist/lib/UI/pages/admin merge_meta.html
Log:
check for default column as well

Revision  Changes    Path
2.106     +2 -2      interchange/WHATSNEW


rev 2.106, prev_rev 2.105
Index: WHATSNEW
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW,v
retrieving revision 2.105
retrieving revision 2.106
diff -u -r2.105 -r2.106
--- WHATSNEW	17 Feb 2003 12:18:16 -0000	2.105
+++ WHATSNEW	17 Feb 2003 13:24:31 -0000	2.106
@@ -267,8 +267,8 @@
   and have to re-enter custom view information that is already
   present in a modified base meta display.
 
-* Add check for existence of the extended column and display of merge
-  errors to merge_meta page.
+* Add check for existence of the extended/default columns
+  and display of merge errors to merge_meta page.
 
 Payment
 -------



2.4       +3 -2      interchange/dist/lib/UI/pages/admin/merge_meta.html


rev 2.4, prev_rev 2.3
Index: merge_meta.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/merge_meta.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- merge_meta.html	16 Feb 2003 12:19:09 -0000	2.3
+++ merge_meta.html	17 Feb 2003 13:24:31 -0000	2.4
@@ -210,9 +210,10 @@
 					$mtab);
 			return;
 		}
-		if(! $mdb->column_exists('extended')) {
+		my @needcols = qw(extended default);
+		if(@needcols = grep {! $mdb->column_exists($_)} @needcols) {
 			$Scratch->{merge_error}
-				= errmsg("Cannot merge metadata -- column 'extended' is missing in table %s.", $mtab);
+				= errmsg("Cannot merge metadata -- column(s) '%s' is missing in table %s.", join(',', @needcols), $mtab);
 			return;
 		}
 		my @base;