[LON-CAPA-cvs] cvs: rat / lonratedt.pm loncom/interface loncommon.pm lonindexer.pm

[www]

www		Fri Jan  2 16:00:56 2004 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonindexer.pm 
    /rat	lonratedt.pm 
  Log:
  Remember where we were in Resource Space
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.169 loncom/interface/loncommon.pm:1.170
--- loncom/interface/loncommon.pm:1.169	Fri Jan  2 14:23:47 2004
+++ loncom/interface/loncommon.pm	Fri Jan  2 16:00:56 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.169 2004/01/02 19:23:47 www Exp $
+# $Id: loncommon.pm,v 1.170 2004/01/02 21:00:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -235,10 +235,11 @@
 =cut
 
 sub browser_and_searcher_javascript {
+    my $resurl=&lastresurl();
     return <<END;
     var editbrowser = null;
     function openbrowser(formname,elementname,only,omit,titleelement) {
-        var url = '/res/?';
+        var url = '$resurl/?';
         if (editbrowser == null) {
             url += 'launch=1&';
         }
@@ -281,6 +282,23 @@
         editsearcher.focus();
     }
 END
+}
+
+sub lastresurl {
+    if ($ENV{'environment.lastresurl'}) {
+	return $ENV{'environment.lastresurl'}
+    } else {
+	return '/res';
+    }
+}
+
+sub storeresurl {
+    my $resurl=&Apache::lonnet::clutter(shift);
+    unless ($resurl=~/^\/res/) { return 0; }
+    $resurl=~s/\/$//;
+    &Apache::lonnet::put('environment',{'lastresurl' => $resurl});
+    &Apache::lonnet::appenv('environment.lastresurl' => $resurl);
+    return 1;
 }
 
 sub studentbrowser_javascript {
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.84 loncom/interface/lonindexer.pm:1.85
--- loncom/interface/lonindexer.pm:1.84	Tue Dec 30 15:47:23 2003
+++ loncom/interface/lonindexer.pm	Fri Jan  2 16:00:56 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.84 2003/12/30 20:47:23 albertel Exp $
+# $Id: lonindexer.pm,v 1.85 2004/01/02 21:00:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -446,6 +446,8 @@
 END
 # ---------------------------------------------------------------- Bread crumbs
         $r->print(&Apache::lonhtmlcommon::crumbs($uri));
+# ------------------------------------------------------ Remember where we were
+	&Apache::loncommon::storeresurl($uri);
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
 #        $r->print(&initdebug());
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.50 rat/lonratedt.pm:1.51
--- rat/lonratedt.pm:1.50	Fri Dec 12 10:19:29 2003
+++ rat/lonratedt.pm	Fri Jan  2 16:00:56 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.50 2003/12/12 15:19:29 sakharuk Exp $
+# $Id: lonratedt.pm,v 1.51 2004/01/02 21:00:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -527,6 +527,7 @@
 
 sub editscript {
     my $mode=shift;
+    my $resurl=&Apache::loncommon::lastresurl();
     return(<<ENDSCRIPT);
 var srch;
 var srchflag=-1; // 1 means currently open
@@ -571,7 +572,7 @@
    var options="scrollbars=1,resizable=1,menubar=0";
    idxmode=mode;
    idxflag=1;
-   idx=open("/res/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
+   idx=open("$resurl/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
    idx.focus();
 }
 
@@ -610,7 +611,7 @@
 
     var editbrowser;
     function openbrowser(formname,elementname,only,omit) {
-        var url = '/res/?';
+        var url = '$resurl/?';
         if (editbrowser == null) {
             url += 'launch=1&';
         }