--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/09/11 17:51:22 1.4 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2000/10/10 07:51:11 1.8 @@ -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,81 +27,115 @@ sub write_annotation { # --------------------------------------------------------------Get annotation sub get_annotation { - my $url_new=shift; - my %annotation=Apache::lonnet::get("annotations",($url_new)); - return %annotation; + my $urlnew=shift; + my @annotation=Apache::lonnet::get("annotations",$urlnew); + return @annotation; } # ------------------------------------------------------------Construct editor sub construct_editor { - my $url_new=shift; - my %annot_hash=@_; - return(< Annotations - -
-
- - - - - -
+
+
+
+ + + + +
+
END_HTML } -# ----------------------------------------------------------------Main Handler +# ----------------------------------------------------Constructs error window + +sub construct_error { + my $annot_error=shift; + my $button_name=shift; + return(< +Annotations + + + +
+
+ + +
+ +$annot_error + +
+ + + + +
+
+ + +END_HTML2 +} + +# ---------------------------------------------------------------Main Handler sub handler { - my $r=shift; - my $url_old; - my $annotation; - $r->content_type('text/html'); - $r->send_http_header; - if ($url_old=param("url_old")) { - $annotation=param("annotation"); - write_annotation($url_old,$annotation); - } - if (my $url_new=param("url_new")) { - my %annot_hash; -# $r->print("$url_new \n"); #debug line -# $r->print($url_old); #debug line -# $r->print("<--the url_new
\n"); #debug line -# $r->print($annotation); #debug line -# $r->print("<--first annotation
\n"); #debug line -# Apache::lonnet::put("annotations",($url_new => $annotation)); #debug line -# my %annot_hash=Apache::lonnet::get("annotations",($url_new)); #debug line -# $r->print( keys(%phony_var)); #debug line -# $r->print(" = are the keys
\n"); #debug line -# $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 - 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
\n"); #debug line - my $page=construct_editor($url_new,%annot_hash); - $r->print($page); + my $r=shift; + 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'}; + write_annotation($urlold,$annotation); + } + 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=($annotation); + } else { + @annot_hash=get_annotation($urlnew); + } + $page=construct_editor($annot_hash[0],$urlnew); } - return OK; + } else { + $page=construct_error("Connection broken with home server. Please contact your system administrator.","try again"); + } + $r->print($page); + return OK; } 1; __END__ +