--- loncom/homework/randomlabel.pm	2004/02/23 23:25:39	1.59
+++ loncom/homework/randomlabel.pm	2004/07/02 08:09:49	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.59 2004/02/23 23:25:39 albertel Exp $
+# $Id: randomlabel.pm,v 1.61 2004/07/02 08:09:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,7 +87,7 @@ sub start_randomlabel {
     my $result='';
     push (@Apache::lonxml::namespace,'randomlabel');
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
-    if ( $bgimg !~ /^http:/ ) {
+    if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
 	$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
 	if (&Apache::lonnet::repcopy($bgimg) ne OK) {
 	    $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
@@ -260,6 +260,7 @@ sub start_labelgroup {
 
 sub add_vars {
     my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
+    if (!defined($name) || $name eq '') { return; }
     my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
     my $out=Apache::run::run($code,$safeeval);
     if ($value) {
@@ -451,6 +452,8 @@ sub end_label {
 	    my $description = &Apache::lonxml::get_param('description',
 							 $parstack,$safeeval);
 	    push(@Apache::randomlabel::description,$description);
+	} else {
+	    $ltext=~s/[\r\n]*//gs
 	}
 	push(@Apache::randomlabel::label_arr,$ltext);
     }