--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/09/07 20:59:00 1.3
+++ 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(<
Annotations
-
-@delete_this are the keys for the hash
$url_new is the new URL
$annot_hash{$url_new} is the new annotation
-
@@ -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
\n"); #debug line
@@ -111,7 +89,7 @@ sub handler {
# $r->print("$phony_var{$url_new} = $url_new"); #debug line
# $r->print("<--test put-get
\n"); #debug line
# $r->print($annotation); #debug line
-# $r->print("<--annotation
\n"); #debug line
+# $r->print("<--annotation
\n"); #debug line
if ($url_old eq $url_new) {
%annot_hash=($url_new => $annotation);
} else {
@@ -119,9 +97,9 @@ sub handler {
}
# $r->print($annotation); #debug line
# $r->print("<--annotation again
\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;
}