--- loncom/html/res/adm/pages/annotator/admannotations.pm	2006/04/20 04:19:55	1.26
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	2007/04/24 23:26:26	1.27
@@ -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.26 2006/04/20 04:19:55 albertel Exp $
+# $Id: admannotations.pm,v 1.27 2007/04/24 23:26:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,52 +38,66 @@ use Apache::lonlocal;
 # --------------------------------------------------------------Put annotation
 
 sub write_annotation {
-    my ($urlold, $annotation) = @_;
-    if ($annotation) { 
-	&Apache::lonnet::put('nohist_annotations',{$urlold => $annotation});
+    my ($symb, $enc, $annotation) = @_;
+
+    return if (!$annotation);
+
+    my $key = $symb;
+    if (!$enc) {
+	$key = 
+	    &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
     }
+
+    &Apache::lonnet::put('nohist_annotations',{$key => $annotation});
     return;
 }
 
 # --------------------------------------------------------------Get annotation
 
 sub get_annotation {
-    my ($urlnew) = @_;
-    my %annotation=&Apache::lonnet::get('nohist_annotations',[$urlnew]);
-    return %annotation;
+    my ($symb,$enc) = @_;
+
+    my $key = $symb;
+    if (!$enc) {
+	$key = 
+	    &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+    }
+    my %annotation=&Apache::lonnet::get('nohist_annotations',[$key]);
+    return $annotation{$key};
 }
 
 # ------------------------------------------------------------Construct editor
-sub js_get_url {
+sub js_get_symb {
     return <<ENDJS;
-function get_url() {
-    var url;
+function get_symb() {
+    var symb;
     if (typeof(window.opener.clientwindow) != 'undefined') {
-	url=window.opener.clientwindow.location.href;
+	symb=window.opener.clientwindow.location.href;
     } else {
-	url=window.opener.location.href;
+	symb=window.opener.location.href;
     }
-    return url;
+    symb=window.opener.currentSymb;
+    return symb;
 }
 ENDJS
 }
 
 sub construct_editor {
-    my ($annotation,$urlnew) = @_;
+    my ($annotation,$symbnew) = @_;
     if ($annotation=~/^error:/) { $annotation=''; }
 
-    my $get_url = &js_get_url();
+    my $get_symb = &js_get_symb();
 
     my $js = <<ENDJS;
 <script type="text/javascript">
 var timeout;
 
-$get_url
+$get_symb
 
 function changed() {
-    var urlnew=get_url();
-    if (urlnew!=document.annotInfo.urlold.value) {
-	document.annotInfo.urlnew.value=urlnew;
+    var symbnew=get_symb();
+    if (symbnew!=document.annotInfo.symbold.value) {
+	document.annotInfo.symbnew.value=symbnew;
         document.annotInfo.submit();
     }
     timeout=setTimeout('changed();','1000');
@@ -110,10 +124,10 @@ $start_page
  <center>
   <form name="annotInfo" method="post" action="/adm/annotations">
     <textarea name="annotation" wrap="on" rows="12" cols="36">$annotation</textarea><br />
-    <input type="hidden" name="urlold" value="$urlnew" />
-    <input type="hidden" name="urlnew" value="" />
+    <input type="hidden" name="symbold" value="$symbnew" />
+    <input type="hidden" name="symbnew" value="" />
     <input type="button" name="send" value="$lt{'save'}"
-           onclick="javascript:this.form.urlnew.value=get_url();this.form.submit();" />
+           onclick="javascript:this.form.symbnew.value=get_symb();this.form.submit();" />
     <input type="button" name="close" value="$lt{'close no save'}" 
            onclick="javascript:window.close();" />
   </form>
@@ -127,10 +141,10 @@ END_HTML
 sub construct_error {
     my ($annot_error,$button_name) = @_;
 
-    my $get_url = &js_get_url();
+    my $get_symb = &js_get_symb();
     my $js = <<ENDJS;
 <script type="text/javascript">
-$get_url
+$get_symb
 </script>
 ENDJS
 
@@ -153,10 +167,10 @@ $annot_error
 </i></font>
 </td>
 </table>
-    <input type="hidden" name="urlold" value="" />
-    <input type="hidden" name="urlnew" value="" />
+    <input type="hidden" name="symbold" value="" />
+    <input type="hidden" name="symbnew" value="" />
     <input type="button" name="send" value="$lt{'button'}"
-           onclick="javascript:this.form.urlnew.value=get_url();this.form.submit();" />
+           onclick="javascript:this.form.symbnew.value=get_symb();this.form.submit();" />
     <input type="button" name="close" value="$lt{'close'}" 
            onclick="javascript:window.close();" />
   </form>
@@ -165,6 +179,16 @@ $end_page
 END_HTML2
 }
 
+sub clean_symb {
+    my ($symb) = @_;
+
+    &Apache::lonenc::check_decrypt(\$symb);
+    my $enc = $env{'request.enc'};
+    delete($env{'request.enc'});
+    
+    return ($symb,$enc);
+}
+
 # ---------------------------------------------------------------Main Handler
 
 sub handler {
@@ -176,31 +200,24 @@ sub handler {
 
 
     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 ($symb_old,$symb_old_enc) = &clean_symb($env{'form.symbold'});
+    my ($symb_new,$symb_new_enc) = &clean_symb($env{'form.symbnew'});
+
     my $annotation=$env{'form.annotation'};
 
-    if ($urlold) {
-	&write_annotation($urlold,$annotation);
+    if ($symb_old) {
+	&write_annotation($symb_old,$symb_old_enc,$annotation);
     }
-    if (exists($env{'form.urlnew'})) {
-	unless ($urlnew) {
+    if (exists($env{'form.symbnew'})) {
+	unless ($symb_new) {
 	    $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);
+	    if ($symb_old ne $symb_new) {
+		$annotation=&get_annotation($symb_new,$symb_new_enc);
 	    }
-	    $page=&construct_editor($annot_hash{$urlnew},$env{'form.urlnew'});
+	    # pass same symb through.
+	    $page=&construct_editor($annotation,$env{'form.symbnew'});
 	}
     }
     $r->print($page);