--- loncom/html/res/adm/pages/annotator/admannotations.pm 2000/10/18 11:01:50 1.12
+++ loncom/html/res/adm/pages/annotator/admannotations.pm 2001/12/19 17:17:46 1.17
@@ -1,9 +1,33 @@
-#
+# The LearningOnline Network with CAPA
# This will take annotations and then plug them into a page.
#
+# $Id: admannotations.pm,v 1.17 2001/12/19 17:17:46 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/
+#
# 08/25/00 Ben Tyszka
#
-# 10/17,10/18 Gerd Kortemeyer
+# 10/17,10/18,10/20 Gerd Kortemeyer
#
#
##################
@@ -20,7 +44,7 @@ sub write_annotation {
my $urlold=shift;
my $annotation=shift;
if ($annotation) {
- &Apache::lonnet::put("annotations",($urlold => $annotation));
+ &Apache::lonnet::put('nohist_annotations',{$urlold => $annotation});
}
return;
}
@@ -29,7 +53,7 @@ sub write_annotation {
sub get_annotation {
my $urlnew=shift;
- my %annotation=&Apache::lonnet::get("annotations",$urlnew);
+ my %annotation=&Apache::lonnet::get('nohist_annotations',[$urlnew]);
return %annotation;
}
@@ -37,6 +61,7 @@ sub get_annotation {
sub construct_editor {
my $annotation=shift;
+ if ($annotation=~/^error:/) { $annotation=''; }
my $urlnew=shift;
return(<