--- loncom/homework/edit.pm	2004/01/12 19:53:54	1.76
+++ loncom/homework/edit.pm	2004/01/14 22:59:18	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.76 2004/01/12 19:53:54 albertel Exp $
+# $Id: edit.pm,v 1.77 2004/01/14 22:59:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -739,51 +739,23 @@ ENDBUTTON
     return $result;
 }
 
-# coordinate pair (x1,y1)-(x2,y2)
-sub entercoordpair {
-    my ($id,$mode,$width,$height) = @_;
+# coordinates (x1,y1)-(x2,y2)...
+# mode can be either box, or polygon
+sub entercoord {
+    my ($idx,$mode,$width,$height,$type) = @_;
     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 $formheight='';
-    if ($height) {
-	$formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
-    }
-    my $formwidth='';
-    if ($width) {
-	$formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
-    }
-    my $result = <<"ENDBUTTON";
-<a href="/cgi-bin/imagechoice.pl?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"
-target="imagechoice">Click Coordinate Pair</a>
-ENDBUTTON
-    return $result;
-}
-
-# coordinate polygon (x1,y1)-(x2,y2)...
-sub entercoordpolygon {
-    my ($id,$mode,$width,$height) = @_;
-    unless ($Apache::edit::bgimgsrc) { return ''; }
-    &Apache::lonnet::logthis($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 $element;
     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>
         $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
     my $id=$Apache::lonxml::curdepth;
-    my %data=("imagechoice.$id.mode"      =>'polygon',
+    my %data=("imagechoice.$id.type"      =>$type,
 	      "imagechoice.$id.formname"  =>$form,
 	      "imagechoice.$id.file"      =>$bgfile,
 	      "imagechoice.$id.formcoord" =>$element);
@@ -796,7 +768,9 @@ sub entercoordpolygon {
 	    $Apache::edit::bgimgsrccurdepth;
     }
     &Apache::lonnet::appenv(%data);
-    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">Create Polygon Data</a>';
+    my $text="Enter Coordinates";
+    if ($type eq 'polygon') { $text='Create Polygon Data'; }
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }