--- loncom/html/res/adm/pages/annotator/admannotations.pm	2000/09/19 16:55:50	1.6
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	2000/10/10 20:30:34	1.9
@@ -13,7 +13,7 @@ package Apache::admannotations;
 use strict;
 use CGI qw(:all);
 use Apache::Constants qw(:common);
-use Apache::lonnet;
+use Apache::lonnet();
 
 # --------------------------------------------------------------Put annotation
 
@@ -27,16 +27,16 @@ sub write_annotation {
 # --------------------------------------------------------------Get annotation
 
 sub get_annotation {
-    my $url_new=shift;
-    my %annotation=Apache::lonnet::get("annotations",($url_new));
+    my $urlnew=shift;
+    my %annotation=Apache::lonnet::get("annotations",$urlnew);
     return %annotation;
 }
 
 # ------------------------------------------------------------Construct editor
 
 sub construct_editor {
-    my $url_new=shift;
-    my %annot_hash=@_;
+    my $annotation=shift;
+    my $urlnew=shift;
     return(<<END_HTML)
 <html>
 <head>
@@ -44,7 +44,7 @@ sub construct_editor {
 <script language="JavaScript">
 mainhost=window.opener.opener;
 function getDomain() {
-   document.annotInfo.url_new.value=mainhost.location.href;
+   document.annotInfo.urlnew.value=mainhost.location.href;
    return true;
 }
 </script>
@@ -52,9 +52,9 @@ function getDomain() {
 <body BGCOLOR=\"#BBBBBB\">
  <center>
   <FORM name="annotInfo" method="post" action="http://kirk.lite.msu.edu/adm/annotations" onSubmit="return getDomain();">
-    <TEXTAREA NAME="annotation" WRAP=ON ROWS=12 COLS=36>$annot_hash{$url_new}</TEXTAREA><br>
-    <INPUT TYPE="hidden" name="url_old" value="$url_new")>
-    <INPUT TYPE="hidden" name="url_new" value="">
+    <TEXTAREA NAME="annotation" WRAP=ON ROWS=12 COLS=36>$annotation</TEXTAREA><br>
+    <INPUT TYPE="hidden" name="urlold" value="$urlnew")>
+    <INPUT TYPE="hidden" name="urlnew" value="">
     <INPUT TYPE=submit name=submit value="Save and Update">
     <INPUT TYPE=button name="close" value="close (no save)" onClick="javascript:window.close();">
   </FORM>
@@ -64,7 +64,7 @@ function getDomain() {
 END_HTML
 }
 
-# --------------------------------------------Constructs the can't edit window
+# ----------------------------------------------------Constructs error window
 
 sub construct_error {
   my $annot_error=shift;
@@ -75,7 +75,7 @@ sub construct_error {
 <script language="JavaScript">
 mainhost=window.opener.opener;
 function getDomain() {
-   document.annotInfo.url_new.value=mainhost.location.href;
+   document.annotInfo.urlnew.value=mainhost.location.href;
    return true;
 }
 </script>
@@ -90,8 +90,8 @@ $annot_error
 </i>
 </td>
 </table>
-    <INPUT TYPE="hidden" name="url_old" value="")>
-    <INPUT TYPE="hidden" name="url_new" value="">
+    <INPUT TYPE="hidden" name="urlold" value="")>
+    <INPUT TYPE="hidden" name="urlnew" value="">
     <INPUT TYPE=submit name=submit value="$button_name">
     <INPUT TYPE=button name="close" value="close (no save)" onClick="javascript:window.close();">
   </FORM>
@@ -101,38 +101,41 @@ $annot_error
 END_HTML2
 }
 
-# ----------------------------------------------------------------Main Handler
+# ---------------------------------------------------------------Main Handler
 
 sub handler {
   my $r=shift;
-  my $url_old;
-  my $annotation;
   my $page;
+  my %annot_hash;
+  my $urlold;
+  my $annotation;
+  my $urlnew;
   $r->content_type('text/html');
   $r->send_http_header;
-  if ($url_old=param("url_old")) {
-    $annotation=param("annotation");
-    write_annotation($url_old,$annotation);
+  if (exists($ENV{'form.urlold'})) {
+      $urlold=$ENV{'form.urlold'};
+      $annotation=$ENV{'form.annotation'};
+      write_annotation($urlold,$annotation);
   }
-  if (my $url_new=param("url_new")) {
-    my %annot_hash;
-    if ($url_old eq $url_new) {
-      %annot_hash=($url_new => $annotation);
-    } else {
-      %annot_hash=get_annotation($url_new);
-    }
-    if (exists($annot_hash{"con_lost"})) {
-      $page=construct_error("Connection broken with home server. Please contact your system administrator.","try again");
-    } else {
-      $page=construct_editor($url_new,%annot_hash);
-    }
-    $r->print($page);
+  if (exists($ENV{'form.urlnew'})) {
+      $urlnew=$ENV{'form.urlnew'};
+      if ($urlnew eq '') {
+	  $page=construct_error("Cannot annotate current window. Please point your browser to a Lon-CAPA page and then 'continue'.","continue");
+      } else {
+	  if ($urlold eq $urlnew) {
+	      $annot_hash{$urlnew}=$annotation;
+	  } else {
+	      %annot_hash=get_annotation($urlnew);
+	  }
+	  $page=construct_editor($annot_hash{$urlnew},$urlnew);
+      }
   } else {
-    $page=construct_error("Cannot annotate current window. Please point your browser to a Lon-CAPA page and then 'continue'.","coninue");
-    $r->print($page);
+      $page=construct_error("Connection broken with home server. Please contact your system administrator.","try again");
   }
+  $r->print($page);
   return OK;
 }
 
 1;
 __END__
+
