[BACK]Return to randomlabel.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/randomlabel.pm between versions 1.57 and 1.59

version 1.57, 2004/02/11 21:58:15 version 1.59, 2004/02/23 23:25:39
Line 93  sub start_randomlabel { Line 93  sub start_randomlabel {
     $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
     $Apache::randomlabel::tlabel_cnt=0;      $Apache::randomlabel::obj_cnt=0;
     $Apache::randomlabel::ilabel_cnt=0;  
     if ($target eq 'web') {      if ($target eq 'web') {
  $cgi_id=&Apache::loncommon::get_cgi_id();   $cgi_id=&Apache::loncommon::get_cgi_id();
  %args=();   %args=();
Line 135  sub end_randomlabel { Line 134  sub end_randomlabel {
     my $count;      my $count;
     pop @Apache::lonxml::namespace;      pop @Apache::lonxml::namespace;
     if ($target eq 'web') {      if ($target eq 'web') {
  $count = $Apache::randomlabel::tlabel_cnt;   $count = $Apache::randomlabel::obj_cnt;
  if( $count != 0) { $args{"cgi.$cgi_id.COUNT"}=$count; }   if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }
  $count = $Apache::randomlabel::ilabel_cnt;  
  if( $count != 0) { $args{"cgi.$cgi_id.ICOUNT"}=$count; }  
  $result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";   $result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";
  &Apache::lonnet::appenv(%args);   &Apache::lonnet::appenv(%args);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
Line 169  sub end_bgimg { Line 166  sub end_bgimg {
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
  my $bgimg=&Apache::lonxml::endredirection;    my $bgimg=&Apache::lonxml::endredirection; 
  &Apache::lonnet::logthis("bgimg is -$bgimg-");  
  if ($target eq 'web') {   if ($target eq 'web') {
     $bgimg=&Apache::imageresponse::clean_up_image($bgimg);      $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
     $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);      $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
Line 292  sub end_labelgroup { Line 288  sub end_labelgroup {
  &Apache::structuretags::shuffle(\@idx_arr);   &Apache::structuretags::shuffle(\@idx_arr);
  for(0 .. $#Apache::randomlabel::label_arr) {   for(0 .. $#Apache::randomlabel::label_arr) {
     my $str;      my $str;
     my $xstr;  
     my $ystr;  
     my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";      my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";
     my $x = $Apache::randomlabel::xcoord[$_];      my $x = $Apache::randomlabel::xcoord[$_];
     my $y = $Apache::randomlabel::ycoord[$_];      my $y = $Apache::randomlabel::ycoord[$_];
     my $value = $Apache::randomlabel::value[$_];      my $value = $Apache::randomlabel::value[$_];
       my $i=$Apache::randomlabel::obj_cnt++;
     if( $type eq 'text') {      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;   $str = join(':',$x,$y,&Apache::lonnet::escape($label));
  $xstr = 'X'.$Apache::randomlabel::tlabel_cnt;   $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
  $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;  
  $Apache::randomlabel::tlabel_cnt += 1;  
     } elsif ( $type eq 'image') {      } elsif ( $type eq 'image') {
  &add_vars($gname,$_,   &add_vars($gname,$_,
   $Apache::randomlabel::description[$idx_arr[$_]],    $Apache::randomlabel::description[$idx_arr[$_]],
   $idx_arr[$_],$value,$label,$safeeval);    $idx_arr[$_],$value,$label,$safeeval);
  $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;   $str = join(':',$x,$y,&Apache::lonnet::escape($label));
  $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;   $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
  $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;  
  $Apache::randomlabel::ilabel_cnt += 1;  
     } else {      } else {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
     }      }
     if ($target eq 'web') {      if ($target eq 'web') { $args{"cgi.$cgi_id.OBJ$i"} =$str; }
  $args{"cgi.$cgi_id.$str"} =&Apache::lonnet::escape($label);  
  $args{"cgi.$cgi_id.$xstr"}=$x;  
  $args{"cgi.$cgi_id.$ystr"}=$y;  
     }  
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $WX1=0; #  Web x-coord. of upper left corner (ULC)   my $WX1=0; #  Web x-coord. of upper left corner (ULC)
Removed from v.1.57  
changed lines
  Added in v.1.59

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>