--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/09/11 17:51:22 1.4 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2006/04/10 23:32:53 1.22 @@ -1,107 +1,177 @@ -#!/usr/bin/perl -T -# +# The LearningOnline Network with CAPA # This will take annotations and then plug them into a page. # -# 08/25/00 Ben Tyszka +# $Id: admannotations.pm,v 1.22 2006/04/10 23:32:53 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ # ################## package Apache::admannotations; use strict; -use CGI qw(:all); use Apache::Constants qw(:common); +use Apache::loncommon(); use Apache::lonnet; # --------------------------------------------------------------Put annotation sub write_annotation { - my $url_old=shift; - my $annotation=shift; - Apache::lonnet::put("annotations",($url_old => $annotation)); + my ($urlold, $annotation) = @_; + if ($annotation) { + &Apache::lonnet::put('nohist_annotations',{$urlold => $annotation}); + } return; } # --------------------------------------------------------------Get annotation sub get_annotation { - my $url_new=shift; - my %annotation=Apache::lonnet::get("annotations",($url_new)); + my ($urlnew) = @_; + my %annotation=&Apache::lonnet::get('nohist_annotations',[$urlnew]); return %annotation; } # ------------------------------------------------------------Construct editor sub construct_editor { - my $url_new=shift; - my %annot_hash=@_; - return(< - -Annotations - - - -
-
- - - - - -
- - +ENDJS + + my %load_items = ('onload' => "timeout=setTimeout('changed()','1000')", + 'onunload' => 'clearTimeout(timeout);'); + my $start_page = + &Apache::loncommon::start_page('Annotations',$js, + {'only_body' => 1, + 'add_entries' => \%load_items,}); + + my $end_page = + &Apache::loncommon::end_page(); + return(< +
+
+ + + + +
+ +$end_page END_HTML } -# ----------------------------------------------------------------Main Handler +# ----------------------------------------------------Constructs error window + +sub construct_error { + my ($annot_error,$button_name) = @_; + my $start_page = &Apache::loncommon::start_page('Annotations',undef, + {'only_body' => 1,}); + my $end_page = &Apache::loncommon::end_page(); + + return(< +
+ + +
+ +$annot_error + +
+ + + + +
+ +$end_page +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); + return OK if $r->header_only; + + + my $page; + my %annot_hash; + + my $urlold=$env{'form.urlold'}; + $urlold=~s/^http\:\/\///; + $urlold=~s/^[^\/]+//; + $urlold=~s/\?.*$//; + my $urlnew=$env{'form.urlnew'}; + $urlnew=~s/^http\:\/\///; + $urlnew=~s/^[^\/]+//; + $urlnew=~s/\?.*$//; + my $annotation=$env{'form.annotation'}; + + if ($urlold) { + &write_annotation($urlold,$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); + if (exists($env{'form.urlnew'})) { + unless ($urlnew) { + $page=&construct_error("Cannot annotate current window. Please point your browser to a LON-CAPA page and then 'continue'.","continue"); } 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); - } + if ($urlold eq $urlnew) { + $annot_hash{$urlnew}=$annotation; + } else { + %annot_hash=&get_annotation($urlnew); + } + $page=&construct_editor($annot_hash{$urlnew},$env{'form.urlnew'}); + } + } + $r->print($page); return OK; } 1; __END__ +