--- loncom/homework/randomlabel.pm	2002/11/08 14:41:53	1.40
+++ loncom/homework/randomlabel.pm	2003/02/07 22:03:21	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.40 2002/11/08 14:41:53 albertel Exp $
+# $Id: randomlabel.pm,v 1.43 2003/02/07 22:03:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,6 +86,9 @@ sub start_randomlabel {
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   if ( $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';
+    }
   }
   my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
@@ -97,7 +100,7 @@ sub start_randomlabel {
       $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
   } elsif ($target eq 'tex') {
     my $newbgimg = $bgimg;
-    $bgimg=~s/(.gif|.jpg)$/.eps/;
+    $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
     $bgimg= &Apache::lonnet::filelocation($bgimg);
     if (not $ENV{'request.role'}=~/^au\./) {
 	$bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
@@ -370,7 +373,7 @@ sub start_label {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
   if ($target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
-    my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+    my $ltext=&Apache::lonxml::get_all_text("/label",$parser);
     $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     if ($type eq 'image') {
       &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
@@ -384,7 +387,7 @@ sub start_label {
     push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"$type Label");
-    my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+    my $text=&Apache::lonxml::get_all_text("/label",$parser);
     if ($type eq 'image') {
       $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       $result.=&Apache::edit::text_arg('Description:','description',$token);