[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface lonwizard.pm

[albertel]

albertel		Sun Mar 23 02:22:58 2003 EDT

  Modified files:              
    /loncom/interface	lonwizard.pm 
    /loncom/homework	grades.pm 
  Log:
  i- navmaps wants the Apache request object as an argument now
  
  
Index: loncom/interface/lonwizard.pm
diff -u loncom/interface/lonwizard.pm:1.19 loncom/interface/lonwizard.pm:1.20
--- loncom/interface/lonwizard.pm:1.19	Fri Mar 21 13:36:40 2003
+++ loncom/interface/lonwizard.pm	Sun Mar 23 02:22:58 2003
@@ -1143,7 +1143,7 @@
         $level = 9; # general course, see lonparmset.pm perldoc
         $affectedResourceId = "0.0";
     } elsif ($wizvars->{GRANULARITY} eq 'map') {
-        my $navmap = Apache::lonnavmaps::navmap->new(
+        my $navmap = Apache::lonnavmaps::navmap->new(Apache->request,
                            $ENV{"request.course.fn"}.".db",
                            $ENV{"request.course.fn"}."_parms.db", 0, 0);
         my $res = $navmap->getById($wizvars->{RESOURCE_ID});
@@ -1153,7 +1153,7 @@
         $level = 8;
         $affectedResourceId = $wizvars->{RESOURCE_ID};
     } else {
-        my $navmap = Apache::lonnavmaps::navmap->new(
+        my $navmap = Apache::lonnavmaps::navmap->new(Apache->request,
                            $ENV{"request.course.fn"}.".db",
                            $ENV{"request.course.fn"}."_parms.db", 0, 0);
         my $res = $navmap->getById($wizvars->{RESOURCE_ID});
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.73 loncom/homework/grades.pm:1.74
--- loncom/homework/grades.pm:1.73	Mon Mar 17 14:08:50 2003
+++ loncom/homework/grades.pm	Sun Mar 23 02:22:58 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.73 2003/03/17 19:08:50 albertel Exp $
+# $Id: grades.pm,v 1.74 2003/03/23 07:22:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2365,7 +2365,7 @@
 
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."<br>\n";
     $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
-    my ($titles,$symbx) = &getSymbMap();
+    my ($titles,$symbx) = &getSymbMap($request);
     my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/); 
     my $ctr=0;
     foreach (@$titles) {
@@ -2438,7 +2438,8 @@
 }
 
 sub getSymbMap {
-    my $navmap = Apache::lonnavmaps::navmap-> new(
+    my ($request) = @_;
+    my $navmap = Apache::lonnavmaps::navmap-> new($request,
 						  $ENV{'request.course.fn'}.'.db',
 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
 
@@ -2514,7 +2515,7 @@
     &sub_page_js($request);
     $request->print($result);
 
-    my $navmap = Apache::lonnavmaps::navmap-> new(
+    my $navmap = Apache::lonnavmaps::navmap-> new($request,
 						  $ENV{'request.course.fn'}.'.db',
 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
     my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
@@ -2668,7 +2669,7 @@
 
     $request->print($result);
 
-    my $navmap = Apache::lonnavmaps::navmap-> new(
+    my $navmap = Apache::lonnavmaps::navmap-> new($request,
 						  $ENV{'request.course.fn'}.'.db',
 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
     my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});