[interchange-cvs] interchange - racke modified dist/lib/UI/pages/admin/merge_meta.html
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Jan 29 09:35:01 2003
User: racke
Date: 2003-01-29 14:34:08 GMT
Modified: dist/lib/UI/pages/admin Tag: LINUXIA merge_meta.html
Log:
merged changes 2.1 vs 2.2
+++ 2.2 +++
improved cryptic error message
Revision Changes Path
No revision
No revision
2.1.2.2 +7 -3 interchange/dist/lib/UI/pages/admin/merge_meta.html
rev 2.1.2.2, prev_rev 2.1.2.1
Index: merge_meta.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/merge_meta.html,v
retrieving revision 2.1.2.1
retrieving revision 2.1.2.2
diff -u -r2.1.2.1 -r2.1.2.2
--- merge_meta.html 25 Jan 2003 22:21:14 -0000 2.1.2.1
+++ merge_meta.html 29 Jan 2003 14:34:08 -0000 2.1.2.2
@@ -198,10 +198,14 @@
my $bdb = $Db{mv_metadata_asc};
my $mtab = q{__UI_META_TABLE__} || 'mv_metadata';
my $mdb = $Db{$mtab};
- if(! $bdb or ! $mdb) {
- return errmsg("Cannot merge metadata -- a table is missing.");
+ if(! $bdb) {
+ return errmsg("Cannot merge metadata -- table %s is missing.",
+ 'mv_metadata_asc');
+ }
+ if(! $mdb) {
+ return errmsg("Cannot merge metadata -- table %s is missing.",
+ $mtab);
}
-
my @base;
while( my ($k) = $bdb->each_record()) {
push @base, $k;