--- rat/lonambiguous.pm	2003/01/14 18:47:50	1.8
+++ rat/lonambiguous.pm	2005/03/01 00:22:57	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to resolve ambiguous file locations
 #
-# $Id: lonambiguous.pm,v 1.8 2003/01/14 18:47:50 www Exp $
+# $Id: lonambiguous.pm,v 1.15 2005/03/01 00:22:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,11 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 10/11,10/12,10/16 Gerd Kortemeyer
 
 package Apache::lonambiguous;
 
@@ -37,6 +32,8 @@ use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common REDIRECT);
 use GDBM_File;
+use Apache::loncommon;
+use Apache::lonlocal;
 
 my %bighash;
 
@@ -53,21 +50,32 @@ sub cleanup {
 
 sub getlost {
     my ($r,$errmsg)=@_;
-    $r->content_type('text/html');
+    $errmsg=&mt($errmsg);
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     $r->print(
- '<head><title>Unknown Error</title></head><body bgcolor="#FFFFFF"><h1>'.
- 'LON-CAPA</h1>Could not handle ambiguous resource reference.<p>'.$errmsg.
+ '<head><title>Unknown Error</title></head>'.
+  &Apache::loncommon::bodytag('Could not handle ambiguous resource reference').
+  $errmsg.
  '</body></html>');
 }
 
 # ================================================================ Main Handler
 
+sub make_symb {
+    my ($id)=@_;
+    my ($mapid,$resid)=split(/\./,$id);
+    my $map=$bighash{'map_id_'.$mapid};
+    my $res=$bighash{'src_'.$id};
+    my $symb=&Apache::lonnet::encode_symb($map,$resid,$res);
+    return $symb;
+}
+
 sub handler {
    my $r=shift;
 
    if ($r->header_only) {
-      $r->content_type('text/html');
+      &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       return OK;
    }
@@ -85,7 +93,7 @@ sub handler {
                  my $resid=$2;
                  my $resurl=$bighash{'src_'.$mapid.'.'.$resid};
                  &Apache::lonnet::symblist($bighash{'map_id_'.$mapid},
-				           $resurl => $resid);
+				           $resurl => [$resurl,$resid]);
                  untie(%bighash);
                  $r->header_out(Location => 
                                 'http://'.$ENV{'HTTP_HOST'}.$resurl);
@@ -122,13 +130,13 @@ sub handler {
 # ---------------------------------------------------------- There was an entry
 
     if ($syval) {
-
-       if ($syval=~/\_$/) {
+	my ($page,undef,$res)=&Apache::lonnet::decode_symb($syval);
+	if ($res eq 'page') {
 # ----------------------------------- Okay, this should have appeared on a page
-	   $syval=~s/\_\_\_$//;
- 	   $r->content_type('text/html');
+	   &Apache::loncommon::content_type($r,'text/html');
            $r->header_out(Location => 
-                'http://'.$ENV{'HTTP_HOST'}.'/res/'.$syval);
+			  'http://'.$ENV{'HTTP_HOST'}.
+			  &Apache::lonnet::clutter($page));
            return REDIRECT;
        } else {
 #  There is not really a problem (???), but cannot go back without endless loop
@@ -136,7 +144,12 @@ sub handler {
            return OK;
        }
     }
-
+# ------------------------------------Encrypted requests go straight to navmaps
+   if ($ENV{'request.enc'}) {
+       &Apache::loncommon::content_type($r,'text/html');
+       $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps');
+       return REDIRECT;
+   }
 # ------------------------------------------------ Would be standalone resource
 
    if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
@@ -147,46 +160,59 @@ sub handler {
 # ------------------------------------------------------------------- Has ID(s)
          my @possibilities=split(/\,/,$ids);
          my $couldbe='';
-         map {
-             if (&Apache::lonnet::allowed('bre',$bighash{'src_'.$_})) {
+         foreach (@possibilities) {
+             if ($bighash{'encrypted_'.$_}) { next; }
+	     my $symb=&make_symb($_);
+             if (&Apache::lonnet::allowed('bre',$bighash{'src_'.$_},$symb)) {
 	         if ($couldbe) {
 		     $couldbe.=','.$_;
                  } else {
                      $couldbe=$_;
                  }
              }
-	 } @possibilities;
+	 }
          if ($couldbe) {
             @possibilities=split(/\,/,$couldbe);
+	    if ($#possibilities==0) {
+		my $id=$possibilities[0];
+		my $resurl=$bighash{'src_'.$id};
+		my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]};
+		my $symb=&make_symb($id);
+		&Apache::loncommon::content_type($r,'text/html');
+		&Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
+		$r->header_out(Location => 
+			   'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
+		return REDIRECT;
+	    }
             if ($#possibilities>0) {
 # ----------------------------------------------- Okay, really multiple choices
-               $r->content_type('text/html');
+	       &Apache::loncommon::content_type($r,'text/html');
                $r->send_http_header;
+               my $bodytag=
+                      &Apache::loncommon::bodytag('Pick Instance of Resource');
                $r->print(<<ENDSTART);
 <head><title>Choose Location</title></head>
-<body bgcolor="#FFFFFF">
-<h1>LON-CAPA</h1>
+$bodytag
 The resource you had been accessing appears more than once in this course,
 and LON-CAPA has insufficient session information to determine which instance
 of the resource you meant.
 <p>
 Please click on the instance of the resource you intended to access:
-<p>
-<form action="/adm/ambiguous" method=post>
-<input type=hidden name=orgurl value="$thisfn">
-<input type=hidden name=selecturl value=1>
-<table border=2>
-<tr><th>&nbsp;</th><th>Title</th><th>Type</th><th>Part of ...</th></tr>
+</p>
+<table border="2">
+<tr><th>Title</th><th>Part of ...</th></tr>
 ENDSTART
                map {
+		   my $resurl=$bighash{'src_'.$_};
                    my $mapurl=$bighash{'map_id_'.(split(/\./,$_))[0]};
-                   $r->print('<tr><td><input type=submit value=Select name="'.
-                              $_.'"></td><td>'.$bighash{'title_'.$_}.
-                              '</td><td>'.$bighash{'type_'.$_}.
-                              '</td><td><a href="'.$mapurl.'">'.$mapurl.
-			      '</a></td></tr>');
+		   my $symb=&make_symb($_);
+		   $r->print('<tr><td><a href="'.$resurl.'?symb='.$symb.'">'.
+			     &Apache::lonnet::gettitle($symb).
+			     '</a></td><td>'.
+			     &Apache::lonnet::gettitle($mapurl).'&nbsp;'.
+			     '</td></tr>');
                } @possibilities;
-               $r->print('</table></form></body></html>');
+               $r->print('</table></body></html>');
 	       untie(%bighash);
                return OK;
             }

Title	Part of ...
	'.$bighash{'title_'.$_}. - '	'.$bighash{'type_'.$_}. - '	'.$mapurl. - '
'. + &Apache::lonnet::gettitle($symb). + '	'. + &Apache::lonnet::gettitle($mapurl).' '. + '