Diff for /loncom/homework/randomlabel.pm between versions 1.53 and 1.61

version 1.53, 2003/11/11 00:25:24 version 1.61, 2004/07/02 08:09:49
Line 67  my %args; Line 67  my %args;
 my $cgi_id;  my $cgi_id;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));      &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
 }  }
   
 sub check_int {  sub check_int {
Line 87  sub start_randomlabel { Line 87  sub start_randomlabel {
     my $result='';      my $result='';
     push (@Apache::lonxml::namespace,'randomlabel');      push (@Apache::lonxml::namespace,'randomlabel');
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);      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);   $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
  if (&Apache::lonnet::repcopy($bgimg) ne OK) {   if (&Apache::lonnet::repcopy($bgimg) ne OK) {
     $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
     my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));      $Apache::randomlabel::obj_cnt=0;
     my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));  
     my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));  
     if (!$texwidth) { $texwidth=90; }  
     $Apache::randomlabel::tlabel_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=();
  $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);   $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $newbgimg = $bgimg;   my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
  $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;   my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
  $bgimg= &Apache::lonnet::filelocation($bgimg);   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
  $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;   if (!$texwidth) { $texwidth=90; }
  $bgimg=~s/\/$//;   $result.=&make_eps_image($bgimg,$texwidth,$h,$w);
  #if no eps file try to replicate it  
  if (not-e $bgimg) {  
     if (&Apache::lonnet::repcopy($bgimg) ne OK ) {  
  #if replication failed try to find ps file  
  $bgimg=~s/\.eps$/\.ps/;  
  #if no ps file try to replicate it  
  if (not -e $bgimg &&  
     &Apache::lonnet::repcopy($bgimg) ne OK) {  
                     #if replication failed try to produce eps file dynamically  
     $bgimg=~s/\.ps$/\.eps/;  
     my $temp_file;  
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";  
     $temp_file = Apache::File->new('>>'.$filename);  
     $newbgimg =~ s/(.*)\/res\//\/home\/httpd\/html\/res\//;  
     print $temp_file "$newbgimg\n";  
     $bgimg=~s/\/home\/httpd\/html\/res/\/home\/httpd\/prtspool/; }  
     }  
  }  
  $bgimg=~s/\/$//;  
  my $dirtywidth=$texwidth+5;  
  $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.  
     $texwidth.' mm \epsffile{'.$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.  
     $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $Apache::edit::bgimgsrc=   $Apache::edit::bgimgsrc=
Line 162  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 182  sub end_randomlabel { Line 152  sub end_randomlabel {
     return $result;      return $result;
 }  }
   
   sub start_bgimg {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result='';
       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
    &Apache::lonxml::startredirection; 
       }
       return $result;
   }
   
   sub end_bgimg {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result='';
       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
    my $bgimg=&Apache::lonxml::endredirection; 
    if ($target eq 'web') {
       $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
       $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
    } elsif ($target eq 'tex') {
       my $w=&check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval,-2));
       my $h=&check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval,-2));
       my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,-2));
       if (!$texwidth) { $texwidth=90; }
       $result.=&make_eps_image($bgimg,$texwidth,$h,$w);
    }
       }
       return $result;
   }
   
   sub make_eps_image {
       my ($bgimg,$texwidth,$h,$w)=@_;
       my $newbgimg = $bgimg;
       $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
       $bgimg= &Apache::lonnet::filelocation($bgimg);
       $bgimg=~s|http:/[^/]*|/home/httpd/html|;
       $bgimg=~s|/$||;
       #if no eps file try to replicate it
       if (not-e $bgimg) {
    if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
       #if replication failed try to find ps file
       $bgimg=~s/\.eps$/\.ps/;
       #if no ps file try to replicate it
       if (not -e $bgimg &&
    &Apache::lonnet::repcopy($bgimg) ne OK) {
    #if replication failed try to produce eps file dynamically
    $bgimg=~s/\.ps$/\.eps/;
    my $temp_file;
    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
    $temp_file = Apache::File->new('>>'.$filename);
    $newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|;
    print $temp_file "$newbgimg\n";
    $bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;
    $bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
       }
    }
       }
       $bgimg=~s|/$||;
       my $dirtywidth=$texwidth+5;
       my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.
    ' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.$bgimg.
    '}\setlength{\unitlength}{1mm}  \begin{picture}('.
    $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
       return $result;
   }
   
 sub adjust_textwidth {  sub adjust_textwidth {
     my $texwidth=shift;       my $texwidth=shift; 
     my $pagewidth=$ENV{'form.textwidth'};      my $pagewidth=$ENV{'form.textwidth'};
Line 226  sub start_labelgroup { Line 260  sub start_labelgroup {
   
 sub add_vars {  sub add_vars {
     my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;      my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
       if (!defined($name) || $name eq '') { return; }
     my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";      my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
     my $out=Apache::run::run($code,$safeeval);      my $out=Apache::run::run($code,$safeeval);
     if ($value) {      if ($value) {
Line 254  sub end_labelgroup { Line 289  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)
Line 377  sub start_label { Line 403  sub start_label {
     my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);      my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
     if ($target eq 'web' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'tex' ||
  $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {   $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
  my $ltext=&Apache::lonxml::get_all_text("/label",$parser);   &Apache::lonxml::startredirection; 
  $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);  
  if ($type eq 'image') {  
     &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");  
     $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],  
  $ltext);  
     &Apache::lonxml::debug("into $ltext");  
     my $description = &Apache::lonxml::get_param('description',  
  $parstack,$safeeval);  
     push(@Apache::randomlabel::description,$description);  
  }  
  push(@Apache::randomlabel::label_arr,$ltext);  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token,"$type Label");   $result.=&Apache::edit::tag_start($target,$token,"$type Label");
  my $text=&Apache::lonxml::get_all_text("/label",$parser);   my $text=&Apache::lonxml::get_all_text("/label",$parser);
Line 422  sub start_label { Line 437  sub start_label {
 sub end_label {  sub end_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my @result;      my @result;
     if ($target eq 'edit') { @result=('','no') }      if ($target eq 'edit') {
    @result=('','no') ;
       } elsif ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
        $target eq 'answer' || $target eq 'analyze') {
    my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
    my $ltext=&Apache::lonxml::endredirection; 
    if ($type eq 'image') {
       &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
       $ltext=&Apache::imageresponse::clean_up_image($ltext);
   #    $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
   # $ltext);
       &Apache::lonxml::debug("into $ltext");
       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);
       }
     return @result;      return @result;
 }  }
   

Removed from v.1.53  
changed lines
  Added in v.1.61


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