--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/10/10 20:30:34 1.9 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2006/04/20 04:19:55 1.26 @@ -1,139 +1,210 @@ -#!/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.26 2006/04/20 04:19:55 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::lonnet(); +use Apache::loncommon(); +use Apache::lonnet; +use Apache::lonlocal; # --------------------------------------------------------------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 $urlnew=shift; - my %annotation=Apache::lonnet::get("annotations",$urlnew); + my ($urlnew) = @_; + my %annotation=&Apache::lonnet::get('nohist_annotations',[$urlnew]); return %annotation; } # ------------------------------------------------------------Construct editor +sub js_get_url { + 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(); + + my %lt = ( 'close no save' => "Close (no save)", + 'save' => "Save and Update",); + %lt = &Apache::lonlocal::texthash(%lt); + + return(< -
-
- - - - -
+
+
+ + + + +
- - +$end_page END_HTML } # ----------------------------------------------------Constructs error window sub construct_error { - my $annot_error=shift; - my $button_name=shift; - return(< -Annotations - - - +ENDJS + + my $start_page = &Apache::loncommon::start_page('Annotations',$js, + {'only_body' => 1,}); + my $end_page = &Apache::loncommon::end_page(); + + my %lt = ( 'close' => "Close", + 'button' => $button_name,); + %lt = &Apache::lonlocal::texthash(%lt); + + return(< -
+
- + $annot_error - +
- - - - -
+ + + + + - - +$end_page END_HTML2 } # ---------------------------------------------------------------Main Handler sub handler { - 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{$urlnew}=$annotation; - } else { - %annot_hash=get_annotation($urlnew); - } - $page=construct_editor($annot_hash{$urlnew},$urlnew); - } - } else { - $page=construct_error("Connection broken with home server. Please contact your system administrator.","try again"); - } - $r->print($page); - return OK; + my ($r) = @_; + + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + 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 (exists($env{'form.urlnew'})) { + unless ($urlnew) { + $page=&construct_error(&mt("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; + } else { + %annot_hash=&get_annotation($urlnew); + } + $page=&construct_editor($annot_hash{$urlnew},$env{'form.urlnew'}); + } + } + $r->print($page); + return OK; } 1;