--- loncom/homework/randomlabel.pm	2001/10/13 05:57:43	1.4
+++ loncom/homework/randomlabel.pm	2001/10/14 05:08:09	1.5
@@ -103,11 +103,13 @@ sub start_labelgroup {
   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   $type =~tr/A-Z/a-z/;
-  if ($target eq 'web' || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || 
+      $target eq 'grade' || $target eq 'answer') {
     $Apache::randomlabel::groupname=$name;
     $Apache::randomlabel::type=$type;
     @Apache::randomlabel::xcoord = ();
     @Apache::randomlabel::ycoord = ();
+    @Apache::randomlabel::value = ();
     @Apache::randomlabel::label_arr  = ();
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
@@ -125,22 +127,27 @@ sub start_labelgroup {
   return $result;
 }
 
-sub add_var {
-  my ($name,$value,$type,$safeeval) = @_;
-  if ($type eq 'array') {
-    my $code = 'push(@'.$name.',\''.$value.'\');';
-    my $out=Apache::run::run($code,$safeeval);
-  } else {
-    &Apache::lonxml::error('Unsupported add_var type :'.$type.':');
+sub add_vars {
+  my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;
+  my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
+  my $out=Apache::run::run($code,$safeeval);
+  if ($value) {
+    $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';";
+    $out=Apache::run::run($code,$safeeval);
+    $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
+    $out=Apache::run::run($code,$safeeval);
   }
+  $code = '${'.$name."}{'numlocations'}='".($order+1)."';";
+  $out=Apache::run::run($code,$safeeval);
 }
+
 # begin to assign labels to locations
 sub end_labelgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $gname = $Apache::randomlabel::groupname;
   my $type  = $Apache::randomlabel::type;
   my $result='';
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {
     my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
     &Apache::structuretags::shuffle(\@idx_arr);
     for(0 .. $#Apache::randomlabel::label_arr) {
@@ -148,14 +155,17 @@ sub end_labelgroup {
       my $xstr;
       my $ystr;
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";
+      my $x = $Apache::randomlabel::xcoord[$_];
+      my $y = $Apache::randomlabel::ycoord[$_];
+      my $value = $Apache::randomlabel::value[$_];
       if( $type eq 'text') {
-	&add_var($gname,$label,'array',$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_var($gname,$idx_arr[$_],'array',$safeeval);
+	&add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);
 	$str = 'LB'.$Apache::randomlabel::ilabel_cnt;
 	$xstr = 'X'.$Apache::randomlabel::ilabel_cnt;
 	$ystr = 'Y'.$Apache::randomlabel::ilabel_cnt;
@@ -163,11 +173,11 @@ sub end_labelgroup {
       } else {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
-      my $x = $Apache::randomlabel::xcoord[$_];
-      my $y = $Apache::randomlabel::ycoord[$_];
-      $result .= '<param name="' . $str  . '" value="'.$label.'">';
-      $result .= '<param name="' . $xstr . '" value="'.$x.'">';
-      $result .= '<param name="' . $ystr . '" value="'.$y.'">';
+      if ($target eq 'web') {
+	$result .= '<param name="' . $str  . '" value="'.$label.'">';
+	$result .= '<param name="' . $xstr . '" value="'.$x.'">';
+	$result .= '<param name="' . $ystr . '" value="'.$y.'">';
+      }
     }
   } elsif ($target eq 'tex') {
     my $WX1=0; #  Web x-coord. of upper left corner (ULC)
@@ -194,15 +204,16 @@ sub end_labelgroup {
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
       my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];
+      my $value = $Apache::randomlabel::value[$i];
       my $tcX=$x*($texwidth/$wwidth);
       my $tcY=$TY1-$y*($TY1/$wheight)-2;
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {
-	&add_var($gname,$label,'array',$safeeval);
+	&add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);
       } elsif ( $type eq 'image') {
-	&add_var($gname,$idx_arr[$i],'array',$safeeval);
+	&add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);
       } else {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
@@ -213,23 +224,26 @@ sub end_labelgroup {
   return $result;
 }
 
-# <location x=123 y=456 />
+# <location x="123" y="456" value="some value"/>
 sub start_location {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $x= &Apache::lonxml::get_param('x',$parstack,$safeeval);
   my $y= &Apache::lonxml::get_param('y',$parstack,$safeeval);
+  my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
   my $result='';
   push(@Apache::randomlabel::xcoord,$x);
   push(@Apache::randomlabel::ycoord,$y);
+  push(@Apache::randomlabel::value,$value);
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).
+	&Apache::edit::text_arg('Value:','value',$token).
 	'</td></tr><tr><td colspan="3">';
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 'x','y');
+						 'x','y','value');
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
@@ -249,7 +263,8 @@ sub end_location {
 sub start_label {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || 
+      $target eq 'grade' || $target eq 'answer') {
     my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
     push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {