--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/10/10 20:30:34 1.9 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2000/10/17 21:28:56 1.11 @@ -4,6 +4,7 @@ # # 08/25/00 Ben Tyszka # +# 10/17 Gerd Kortemeyer # # ################## @@ -18,9 +19,13 @@ use Apache::lonnet(); # --------------------------------------------------------------Put annotation sub write_annotation { - my $url_old=shift; + my $urlold=shift; my $annotation=shift; - Apache::lonnet::put("annotations",($url_old => $annotation)); + $urlold=~s/^http\:\/\///; + $urlold=~s/^[^\/]+//; + if ($annotation) { + &Apache::lonnet::put("annotations",($urlold => $annotation)); + } return; } @@ -28,7 +33,9 @@ sub write_annotation { sub get_annotation { my $urlnew=shift; - my %annotation=Apache::lonnet::get("annotations",$urlnew); + $urlnew=~s/^http\:\/\///; + $urlnew=~s/^[^\/]+//; + my %annotation=&Apache::lonnet::get("annotations",$urlnew); return %annotation; } @@ -49,9 +56,9 @@ function getDomain() { } - +
-
+
@@ -80,9 +87,9 @@ function getDomain() { } - +
- +
@@ -105,13 +112,18 @@ END_HTML2 sub handler { my $r=shift; + + $r->content_type('text/html'); + $r->send_http_header; + return OK if $r->header_only; + + my $page; my %annot_hash; my $urlold; my $annotation; my $urlnew; - $r->content_type('text/html'); - $r->send_http_header; + if (exists($ENV{'form.urlold'})) { $urlold=$ENV{'form.urlold'}; $annotation=$ENV{'form.annotation'}; @@ -120,7 +132,7 @@ sub handler { 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"); + $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;