[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth lonuploadedacc.pm /homework lonhomework.pm

[www]

www		Mon May 12 21:56:32 2003 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/auth	lonuploadedacc.pm 
    /loncom/homework	lonhomework.pm 
  Log:
  Making uploaded problems work is worse than shooting down the Remote ...
  
  loncapa_apache.conf is same as 1.47
  lonuploadedacc.pm is same as 1.7
  lonhomework.pm is same as 1.124
  
  Aarghh ...
  
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.50 loncom/loncapa_apache.conf:1.51
--- loncom/loncapa_apache.conf:1.50	Mon May 12 21:18:37 2003
+++ loncom/loncapa_apache.conf	Mon May 12 21:56:31 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.50 2003/05/13 01:18:37 www Exp $
+## $Id: loncapa_apache.conf,v 1.51 2003/05/13 01:56:31 www Exp $
 ##
 
 #
@@ -205,14 +205,6 @@
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</LocationMatch>
-
-<LocationMatch "^/adm/smpprob/">
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonsimpleproblem
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
Index: loncom/auth/lonuploadedacc.pm
diff -u loncom/auth/lonuploadedacc.pm:1.8 loncom/auth/lonuploadedacc.pm:1.9
--- loncom/auth/lonuploadedacc.pm:1.8	Mon May 12 17:22:57 2003
+++ loncom/auth/lonuploadedacc.pm	Mon May 12 21:56:32 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User Files
 #
-# $Id: lonuploadedacc.pm,v 1.8 2003/05/12 21:22:57 www Exp $
+# $Id: lonuploadedacc.pm,v 1.9 2003/05/13 01:56:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,6 @@
                  $udom.'/'.$uname.'/'.$ufile.':'.$ENV{'form.token'},
 				     $remoteserver);
     if ($reply eq 'ok') {
-       $ENV{'request.state'}='uploaded';
        return OK;
    } else {
        &Apache::lonnet::logthis(
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.125 loncom/homework/lonhomework.pm:1.126
--- loncom/homework/lonhomework.pm:1.125	Mon May 12 21:18:37 2003
+++ loncom/homework/lonhomework.pm	Mon May 12 21:56:32 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.125 2003/05/13 01:18:37 www Exp $
+# $Id: lonhomework.pm,v 1.126 2003/05/13 01:56:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,8 @@
 }
 
 sub get_target {
-  if ($ENV{'request.state'} eq "published") {
+  if (($ENV{'request.state'} eq "published") ||
+      ($ENV{'request.state'} eq "uploaded")) {
     if ( defined($ENV{'form.grade_target'}  ) 
 	 && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});