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

Diff for /loncom/homework/edit.pm between versions 1.75 and 1.77

version 1.75, 2004/01/09 23:22:18 version 1.77, 2004/01/14 22:59:18
Line 739  ENDBUTTON Line 739  ENDBUTTON
     return $result;      return $result;
 }  }
   
 # coordinate pair (x1,y1)-(x2,y2)  # coordinates (x1,y1)-(x2,y2)...
 sub entercoordpair {  # mode can be either box, or polygon
     my ($id,$mode,$width,$height) = @_;  sub entercoord {
       my ($idx,$mode,$width,$height,$type) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }      unless ($Apache::edit::bgimgsrc) { return ''; }
     my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);      my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
       &Apache::lonnet::logthis($Apache::edit::bgfile);
     my $form    = 'lonhomework';      my $form    = 'lonhomework';
     my $element;      my $element;
     if (! defined($mode) || $mode eq 'attribute') {      if (! defined($mode) || $mode eq 'attribute') {
         $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");          $element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>      } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
         $element = &Apache::lonnet::escape('homework_edit_'.          $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);                                             $Apache::lonxml::curdepth);
     }      }
     my $formheight='';      my $id=$Apache::lonxml::curdepth;
       my %data=("imagechoice.$id.type"      =>$type,
         "imagechoice.$id.formname"  =>$form,
         "imagechoice.$id.file"      =>$bgfile,
         "imagechoice.$id.formcoord" =>$element);
     if ($height) {      if ($height) {
  $formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;   $data{"imagechoice.$id.formheight"}=$height.'_'.
       $Apache::edit::bgimgsrccurdepth;
     }      }
     my $formwidth='';  
     if ($width) {      if ($width) {
  $formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;   $data{"imagechoice.$id.formwidth"}=$width.'_'.
       $Apache::edit::bgimgsrccurdepth;
     }      }
     my $result = <<"ENDBUTTON";      &Apache::lonnet::appenv(%data);
 <a href="/cgi-bin/imagechoice.pl?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"      my $text="Enter Coordinates";
 target="imagechoice">Click Coordinate Pair</a>      if ($type eq 'polygon') { $text='Create Polygon Data'; }
 ENDBUTTON      my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;      return $result;
 }  }
   
 # coordinate polygon (x1,y1)-(x2,y2)...  sub deletecoorddata {
 sub entercoordpolygon {      &Apache::lonnet::delenv("imagechoice\\.");
     my ($id,$mode,$width,$height) = @_;  
     unless ($Apache::edit::bgimgsrc) { return ''; }  
     my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);  
     my $form    = 'lonhomework';  
     my $element;  
     if (! defined($mode) || $mode eq 'attribute') {  
         $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");  
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>  
         $element = &Apache::lonnet::escape('homework_edit_'.  
                                            $Apache::lonxml::curdepth);  
     }  
     my $id=&Apache::loncommon::get_cgi_id();  
     my %data=("cgi.$id.mode"      =>'polygon',  
       "cgi.$id.formname"  =>$form,  
       "cgi.$id.file"      =>$bgfile,  
       "cgi.$id.formcoord" =>$element);  
     if ($height) {  
  $data{"cgi.$id.formheight"}=$height.'_'.$Apache::edit::bgimgsrccurdepth;  
     }  
     if ($width) {  
  $data{"cgi.$id.formwidth"}=$width.'_'.$Apache::edit::bgimgsrccurdepth;  
     }  
     &Apache::lonnet::appenv(%data);  
     my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">Create Polygon Data</a>';  
     return $result;  
 }  }
   
 #----------------------------------------------------- browse  #----------------------------------------------------- browse
 sub browse {  sub browse {
     # insert a link to call up the filesystem browser (lonindexer)      # insert a link to call up the filesystem browser (lonindexer)
Removed from v.1.75  
changed lines
  Added in v.1.77

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