[WWcvs] webwork2: removing unused code.

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
removing unused code.  Factoring code

Modified Files:
--------------
    webwork2/lib/WebworkWebservice:
        RenderProblem.pm

Revision Data
-------------
Index: RenderProblem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WebworkWebservice/RenderProblem.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -Llib/WebworkWebservice/RenderProblem.pm -Llib/WebworkWebservice/RenderProblem.pm -u -r1.10 -r1.11
--- lib/WebworkWebservice/RenderProblem.pm
+++ lib/WebworkWebservice/RenderProblem.pm
@@ -1,6 +1,20 @@
 #!/usr/local/bin/perl -w 
 
-# Copyright (C) 2001 Michael Gage 
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader$
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
 
 
 
@@ -41,30 +55,36 @@
 our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
 our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
 our $COURSENAME   = $WebworkWebservice::COURSENAME;
+our $PROTOCOL     = $WebworkWebservice::PROTOCOL;
 our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
-our $HOSTURL      ="http://$HOST_NAME:80"; 
-our $ce           =$WebworkWebservice::SeedCE;
-# create a local course environment for some course
-    $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
-#print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
-
-
-#other services
-# File variables
-#our $WARNINGS='';
-
-
-# imported constants
-
-my $COURSE_TEMP_DIRECTORY 	= 	$ce->{courseDirs}->{html_tmp};
-my $COURSE_TEMP_URL 		= 	$HOSTURL.$ce->{courseURLs}->{html_tmp};
-
-my $pgMacrosDirectory 		= 	$ce->{pg_dir}.'/macros/';      
-my $macroDirectory			=	$ce->{courseDirs}->{macros}.'/'; 
-my $templateDirectory		= 	$ce->{courseDirs}->{templates}; 
-
-my %PG_environment          =   $ce->{pg}->{specialPGEnvironmentVars};
-
+our $PORT         = $WebworkWebservice::HOST_PORT;
+our $HOSTURL      = "$PROTOCOL://$HOST_NAME:$PORT"; 
+# 
+# #our $ce           = $WebworkWebservice::SeedCE;
+# # create a local course environment for some course
+# our $ce           = WeBWorK::CourseEnvironment->new(
+#                 {webwork_dir=> $WW_DIRECTORY,  courseName=>$COURSENAME} 
+#     );
+#     $ce->{apache_root_url} = $HOSTURL;
+# #print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
+# 
+# 
+# #other services
+# # File variables
+# #our $WARNINGS='';
+# 
+# 
+# # imported constants
+# 
+# my $COURSE_TEMP_DIRECTORY 	= 	$ce->{courseDirs}->{html_tmp};
+# my $COURSE_TEMP_URL 		= 	$HOSTURL.$ce->{courseURLs}->{html_tmp};
+# 
+# my $pgMacrosDirectory 		= 	$ce->{pg_dir}.'/macros/';      
+# my $macroDirectory			=	$ce->{courseDirs}->{macros}.'/'; 
+# my $templateDirectory		= 	$ce->{courseDirs}->{templates}; 
+# 
+# my %PG_environment          =   $ce->{pg}->{specialPGEnvironmentVars};
+# 
 
 use constant DISPLAY_MODES => {
 	# display name   # mode name
@@ -118,19 +138,17 @@
 	}
 	#FIXME  put in check to make sure the course exists.
 	eval {
-		$ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $courseName);
+		$ce           = WeBWorK::CourseEnvironment->new({webwork_dir=>$WW_DIRECTORY, courseName=> $courseName});
+		$ce->{apache_root_url}= $HOSTURL;
 	# Create database object for this course
 		$db = WeBWorK::DB->new($ce->{dbLayout});
 	};
 	# $ce->{pg}->{options}->{catchWarnings}=1;  #FIXME warnings aren't automatically caught 
 	# when using xmlrpc -- turn this on in the daemon2_course.
 	#^FIXME  need better way of determining whether the course actually exists.
-	if ($@) {
-		$ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
-		$db = WeBWorK::DB->new($ce->{dbLayout});
-	}
+	warn "Unable to create course $courseName. Error: $@" if $@;
 	my $user = $rh->{user};
-	$user    = 'gage' unless defined $user and $user =~/\S/;
+	$user    = 'practice1' unless defined $user and $user =~/\S/;
 	
 ###########################################
 # Authenticate this request
@@ -296,8 +314,7 @@
         r_source        => $r_problem_source, # reference to a source file string.
         # if reference is not defined then the path is obtained 
         # from the problem object.
-        permissionLevel => 10, # $rh->{envir}->{permissionLevel};
-		r_envirOverrides    => $rh, 
+        permissionLevel => $rh->{envir}->{permissionLevel} || 0,
 	};
 	
 	my $formFields = $rh->{envir}->{inputs_ref};
@@ -346,11 +363,13 @@
 		$formFields,
 		# translation options
 		$translationOptions,
+# 		{ # extras
+# 				overrides       => $rh->{overrides}},
+#         }
 		
 	);
   
 
-
 	# new version of output:
 	my $out2   = {
 		text 						=> encode_base64( $pg->{body_text}  ),