[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm

[albertel]

albertel		Mon May 20 16:35:13 2002 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  - variables added to safespace for random image problems
  - BUG#67 almost done, just needs priting support
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.27 loncom/homework/randomlabel.pm:1.28
--- loncom/homework/randomlabel.pm:1.27	Fri May 17 17:27:44 2002
+++ loncom/homework/randomlabel.pm	Mon May 20 16:35:13 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.27 2002/05/17 21:27:44 albertel Exp $
+# $Id: randomlabel.pm,v 1.28 2002/05/20 20:35:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -184,7 +184,7 @@
 }
 
 sub add_vars {
-  my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;
+  my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
   my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
   my $out=Apache::run::run($code,$safeeval);
   if ($value) {
@@ -193,6 +193,10 @@
     $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
     $out=Apache::run::run($code,$safeeval);
   }
+  if ($image) {
+      my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';";
+      my $out=Apache::run::run($code,$safeeval);
+  }
   $code = '${'.$name."}{'numlocations'}='".($order+1)."';";
   $out=Apache::run::run($code,$safeeval);
 }
@@ -215,13 +219,15 @@
       my $y = $Apache::randomlabel::ycoord[$_];
       my $value = $Apache::randomlabel::value[$_];
       if( $type eq 'text') {
-	&add_vars($gname,$_,$label,$idx_arr[$_],$value,$safeeval);
+	&add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
 	$str = 'LB'.$Apache::randomlabel::tlabel_cnt;
 	$xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
 	$ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
 	$Apache::randomlabel::tlabel_cnt += 1;
       } elsif ( $type eq 'image') {
-	&add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);
+	&add_vars($gname,$_,
+		  $Apache::randomlabel::description[$idx_arr[$_]],
+		  $idx_arr[$_],$value,$label,$safeeval);
 	$str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
 	$xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
 	$ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
@@ -270,9 +276,11 @@
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {
-	&add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);
+	&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
       } elsif ( $type eq 'image') {
-	&add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);
+	&add_vars($gname,$i,
+		  $Apache::randomlabel::description[$idx_arr[$i]],
+		  $idx_arr[$i],$value,$label,$safeeval);
       } else {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }