[LON-CAPA-cvs] cvs: rat / lonuserstate.pm loncom/interface lonnavmaps.pm

[www]

www		Thu Jul 25 12:55:53 2002 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
    /rat	lonuserstate.pm 
  Log:
  Add symb after existing query string, if present.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.38 loncom/interface/lonnavmaps.pm:1.39
--- loncom/interface/lonnavmaps.pm:1.38	Mon Jul  8 16:27:10 2002
+++ loncom/interface/lonnavmaps.pm	Thu Jul 25 12:55:53 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.38 2002/07/08 20:27:10 www Exp $
+# $Id: lonnavmaps.pm,v 1.39 2002/07/25 16:55:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -716,7 +716,8 @@
 			$r->print($add.$indentstr);
 			if ($rid) {
 			    $r->print('<a href="'.$hash{'src_'.$linkid}.
-                                      '?symb='.&Apache::lonnet::escape($symb)
+                                      (($hash{'src_'.$linkid}=~/\?/)?'&':'?').
+                                      'symb='.&Apache::lonnet::escape($symb)
                                        .'">'.
 				      $hwk.$hash{'title_'.$rid}.$hwke.'</a>');
 			}
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.34 rat/lonuserstate.pm:1.35
--- rat/lonuserstate.pm:1.34	Mon Jul 15 08:22:32 2002
+++ rat/lonuserstate.pm	Thu Jul 25 12:55:53 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.34 2002/07/15 12:22:32 www Exp $
+# $Id: lonuserstate.pm,v 1.35 2002/07/25 16:55:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -279,7 +279,8 @@
        $beenhere.=$rid.'&';  
        if (($retfurl eq '') && ($hash{'src_'.$rid})) {
            my ($mapid,$resid)=split(/\./,$rid);
-           $retfurl=$hash{'src_'.$rid}.'?symb='.
+           $retfurl=$hash{'src_'.$rid}.
+           (($hash{'src_'.$rid}=~/\?/)?'&':'?').'symb='.
            &Apache::lonnet::symbclean(
                            &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
                            '___'.$resid.'___'.