--- loncom/html/res/adm/pages/annotator/admannotations.pm	2000/09/07 20:15:17	1.2
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	2000/09/11 17:51:22	1.4
@@ -15,31 +15,11 @@ use CGI qw(:all);
 use Apache::Constants qw(:common);
 use Apache::lonnet;
 
-##########################
-#
-#  The following are fake get and put functions.
-#  DELETE the following get and put functions and edit the calls
-#    once the module is working.
-#
-#
-#sub get {
-#     return "This is a sample annotation/n hopefully it'll look nice on the screen";
-#}
-#
-#sub put {
-#     return;
-#}
-#
-#
-#  DELETE everything within this comment block
-#
-##########################
-
 # --------------------------------------------------------------Put annotation
 
 sub write_annotation {
     my $url_old=shift;
-    my $annotation=@_;
+    my $annotation=shift;
     Apache::lonnet::put("annotations",($url_old => $annotation));
     return;
 }
@@ -57,26 +37,24 @@ sub get_annotation {
 sub construct_editor {
     my $url_new=shift;
     my %annot_hash=@_;
-    my @delete_this=keys %annot_hash;
     return(<<END_HTML) 
 <html>
 <head>
 <title>Annotations</title>
-<script language="JavaScript">
-function checkDomain() {
-   form.url_new=window.opener.opener.location.href;
-   form.submit();
-   return;
+<script language="JavaScript"> 
+mainhost=window.opener.opener;
+function getDomain() {
+   document.annotInfo.url_new.value=mainhost.location.href;
+   return true;
 }
 </script>
 </head>
 <body BGCOLOR=\"#BBBBBB\">
-@delete_this are the keys for the hash<BR>$url_new is the new URL<BR>$annot_hash{$url_new} is the new annotation<BR>
- <FORM method=post action="http://kirk.lite.msu.edu/adm/annotations" onSubmit="checkDomain();">
+ <FORM name="annotInfo" method="post" action="http://kirk.lite.msu.edu/adm/annotations" onSubmit="getDomain();">
     <TEXTAREA NAME="annotation" WRAP=ON ROWS=12 COLS=36>$annot_hash{$url_new}</TEXTAREA><br>
-    <INPUT TYPE=Reset value="Undo Changes">
+<!--    <INPUT TYPE=Reset value="Undo Changes">  -->
     <INPUT TYPE="hidden" name="url_old" value="$url_new")>
-    <INPUT TYPE="hidden" name="url_new" value="none">
+    <INPUT TYPE="hidden" name="url_new">
     <INPUT TYPE=submit name=submit value="Save">
     <INPUT TYPE=submit name=submit value="Update">
  </FORM>
@@ -98,7 +76,7 @@ sub handler {
          write_annotation($url_old,$annotation);
     }
     if (my $url_new=param("url_new")) {
-#        my %annot_hash;
+      my %annot_hash;
 #        $r->print("$url_new \n");                                      #debug line
 #        $r->print($url_old);                                           #debug line
 #	 $r->print("<--the url_new <BR>\n");                            #debug line
@@ -111,15 +89,17 @@ sub handler {
 #	 $r->print("$phony_var{$url_new} = $url_new");                  #debug line
 #	 $r->print("<--test put-get<BR>\n");                            #debug line
 #        $r->print($annotation);                                        #debug line
-#	 $r->print("<--annotation<BR>\n");                              #debug line
-#         unless ($url_old eq $url_new) {
-         my %annot_hash=get_annotation($url_new);
-#         }
+#        $r->print("<--annotation<BR>\n");                              #debug line
+        if ($url_old eq $url_new) {
+	   %annot_hash=($url_new => $annotation);
+	} else {
+	   %annot_hash=get_annotation($url_new);
+        }
 #	 $r->print($annotation);                                        #debug line
 #	 $r->print("<--annotation again<BR>\n");                        #debug line
-	 my $page=construct_editor($url_new,%annot_hash);
-	 $r->print($page);
-    }
+	my $page=construct_editor($url_new,%annot_hash);
+	$r->print($page);
+      }
     return OK;
 }
 
