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

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Tue Mar 18 06:41:01 2003


User:      racke
Date:      2003-03-18 11:40:27 GMT
Modified:  dist/lib/UI/pages/admin merge_meta.html
Log:
set sane default to avoid breakage of perl code if no ui-version record
exists

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


rev 2.5, prev_rev 2.4
Index: merge_meta.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/merge_meta.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- merge_meta.html	17 Feb 2003 13:24:31 -0000	2.4
+++ merge_meta.html	18 Mar 2003 11:40:27 -0000	2.5
@@ -24,11 +24,13 @@
 	my $compnew = $newver;
 	$compnew =~ s/\D+//g;
 
-	my $curver = $db->field("ui-version", 'label');
+	my $curver = '4.8.7';
+	if ($db->record_exists('ui-version')) {
+        $curver = $db->field("ui-version", 'label');
+	}
 	$Scratch->{curver} = $curver;
 	my $compcur = $curver;
 	$compcur =~ s/\D+//g;
-
 	if ($curver eq $newver) {
 		$Scratch->{merge_complete}
 				= errmsg("Already merged to current version %s.", $curver);