--- loncom/html/res/adm/pages/annotator/admannotations.pm	2008/11/20 13:51:14	1.29
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	2009/01/08 19:37:53	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # This will take annotations and then plug them into a page.
 #
-# $Id: admannotations.pm,v 1.29 2008/11/20 13:51:14 jms Exp $
+# $Id: admannotations.pm,v 1.32 2009/01/08 19:37:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,43 +27,6 @@
 #
 ##################
 
-=pod
-
-=head1 NAME
-
-Apache::admannotations
-
-=head1 SYNOPSIS
-
-This will take annotations and then plug them into a page.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 OVERVIEW
-
-(empty)
-
-=head1 SUBROUTINES
-
-=over write_annotation()
-
-Put annotation
-
-=item js_get_symb()
-
-Construct editor
-
-=item construct_editor()
-
-=item construct_error()
-
-=item handler()
-
-=back
-
-=cut
-
 
 package Apache::admannotations;
 
@@ -78,8 +41,7 @@ use Apache::lonlocal;
 sub write_annotation {
     my ($symb, $enc, $annotation) = @_;
 
-    
-    $annotation=~s/$^\s*$//;
+    $annotation=~s/^\s*$//;
     my $key = $symb;
     if (!$enc) {
 	$key = 
@@ -217,8 +179,8 @@ sub handler {
 
     my $page;
 
-    my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($env{'form.symbold'});
-    my ($symb_new,$symb_new_enc) = &Apache::loncommon::clean_symb($env{'form.symbnew'});
+    my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($env{'form.symbold'},1);
+    my ($symb_new,$symb_new_enc) = &Apache::loncommon::clean_symb($env{'form.symbnew'},1);
 
     my $annotation=$env{'form.annotation'};
 
@@ -243,3 +205,41 @@ sub handler {
 1;
 __END__
 
+=pod
+
+=head1 NAME
+
+Apache::admannotations
+
+=head1 SYNOPSIS
+
+This will take annotations and then plug them into a page.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+(empty)
+
+=head1 SUBROUTINES
+
+=over write_annotation()
+
+Put annotation
+
+=item js_get_symb()
+
+Construct editor
+
+=item construct_editor()
+
+=item construct_error()
+
+=item handler()
+
+=back
+
+=cut
+
+