--- rat/lonambiguous.pm	2003/04/12 15:43:58	1.9
+++ rat/lonambiguous.pm	2004/12/20 20:13:03	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to resolve ambiguous file locations
 #
-# $Id: lonambiguous.pm,v 1.9 2003/04/12 15:43:58 www Exp $
+# $Id: lonambiguous.pm,v 1.12 2004/12/20 20:13:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonnet;
 use Apache::Constants qw(:common REDIRECT);
 use GDBM_File;
 use Apache::loncommon;
+use Apache::lonlocal;
 
 my %bighash;
 
@@ -54,6 +55,7 @@ sub cleanup {
 
 sub getlost {
     my ($r,$errmsg)=@_;
+    $errmsg=&mt($errmsg);
     $r->content_type('text/html');
     $r->send_http_header;
     $r->print(
@@ -65,11 +67,20 @@ sub getlost {
 
 # ================================================================ 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;
    }
@@ -138,7 +149,6 @@ sub handler {
            return OK;
        }
     }
-
 # ------------------------------------------------ Would be standalone resource
 
    if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
@@ -149,17 +159,30 @@ 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);
+		$r->content_type('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');
@@ -174,24 +197,21 @@ and LON-CAPA has insufficient session in
 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>'.
-                              ($mapurl=~/^\/uploaded\//?'':'<a href="'.$mapurl.'">').
-                              &Apache::lonnet::gettitle($mapurl).'&nbsp;'.
-			      ($mapurl=~/^\/uploaded\//?'':'</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;
             }