--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/08/29 16:24:13 1.1 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2000/09/11 17:51:22 1.4 @@ -8,39 +8,19 @@ # ################## -package Apache::admannotation; +package Apache::admannotations; use strict; 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=shift; - put("annotations",($url_old,$annotation)); + Apache::lonnet::put("annotations",($url_old => $annotation)); return; } @@ -48,53 +28,38 @@ sub write_annotation { sub get_annotation { my $url_new=shift; - my $annotation=get("annotations",$url_new); - return $annotation; + my %annotation=Apache::lonnet::get("annotations",($url_new)); + return %annotation; } # ------------------------------------------------------------Construct editor sub construct_editor { my $url_new=shift; - my $annotation=shift; + my %annot_hash=@_; return(< - - - - -
-
- - - + + + +
+ + + +
- - - + + END_HTML } @@ -111,12 +76,30 @@ sub handler { write_annotation($url_old,$annotation); } if (my $url_new=param("url_new")) { - unless ($url_old eq $url_new) { - $annotation=get_annotation($url_new); - } - my $page = construct_editor($url_new,$annotation); - $r->print($page); - } + 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); + } return OK; }