[interchange-cvs] interchange - racke modified dist/lib/UI/pages/admin/merge_meta.html

[interchange-core@icdevgroup.org]

User:      racke
Date:      2003-02-16 12:19:09 GMT
Modified:  dist/lib/UI/pages/admin merge_meta.html
Log:
check for extended column
display error messages to the user

Revision  Changes    Path
2.3       +18 -4     interchange/dist/lib/UI/pages/admin/merge_meta.html


rev 2.3, prev_rev 2.2
Index: merge_meta.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/merge_meta.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- merge_meta.html	29 Jan 2003 14:33:03 -0000	2.2
+++ merge_meta.html	16 Feb 2003 12:19:09 -0000	2.3
@@ -199,12 +199,21 @@
 		my $mtab = q{__UI_META_TABLE__} || 'mv_metadata';
 		my $mdb = $Db{$mtab};
 		if(! $bdb) {
-			return errmsg("Cannot merge metadata -- table %s is missing.",
-				'mv_metadata_asc');
+		    $Scratch->{merge_error} 
+				= errmsg("Cannot merge metadata -- table %s is missing.",
+					'mv_metadata_asc');
+			return;
 		}
 		if(! $mdb) {
-			return errmsg("Cannot merge metadata -- table %s is missing.",
-				$mtab);
+			$Scratch->{merge_error}
+				= errmsg("Cannot merge metadata -- table %s is missing.",
+					$mtab);
+			return;
+		}
+		if(! $mdb->column_exists('extended')) {
+			$Scratch->{merge_error}
+				= errmsg("Cannot merge metadata -- column 'extended' is missing in table %s.", $mtab);
+			return;
 		}
 		my @base;
 		while( my ($k) = $bdb->each_record()) {
@@ -258,11 +267,16 @@
 		}
 		return;
 	[/perl]
+	[if scratch merge_error]
+	<blockquote class=cerror>[scratchd merge_error]</blockquote>
+	[else]
 	<UL>
 		<LI>Entries merged: [scratch merge_updated]
 		<LI>No merge needed: [scratch merge_complete]
 		<LI>Merge still needed: [scratch merge_needed]
 	</UL>
+	[/else]
+	[/if]
 	</dd>
 
 	<dt class=titlebox>Items to merge </dt>