--- trunk/xmlrpc/daemon/Webwork.pm	2002/06/19 02:36:03	385
+++ trunk/xmlrpc/daemon/Webwork.pm	2002/06/19 03:27:44	386
@@ -27,12 +27,13 @@
 # only Global.pm is actively used.
 
 use lib "/Users/gage/webwork/system/lib/", "/Users/gage/webwork/system/courseScripts/";
+
 my $WEBWORKDIRECTORY = '/Users/gage/webwork/';
 my $COURSESCRIPTSDIRECTORY = "/Users/gage/webwork/system/courseScripts/";
 my $PGTRANSLATOR = "PGtranslator5.pm";
 
-my $COURSETEMPDIRECTORY = '/Users/gage/Sites/demoCoursetmp/';
-my $COURSETEMPURL 		=	'http://webwork-db.math.rochester.edu/~gage/demoCoursetmp';
+my $COURSETEMPDIRECTORY = '/Users/gage/Sites/rochester_problibtmp/';
+my $COURSETEMPURL 		=	'/~gage/rochester_problibtmp';
 
 
 
@@ -42,10 +43,11 @@
 BEGIN{
 	my $GLOBAL_INIT = "/Users/gage/webwork/system/lib/Global.pm";
 	print "Opening $GLOBAL_INIT\n";
-	require $GLOBAL_INIT or die $GLOBAL_INIT;
+	require "/Users/gage/webwork/system/lib/webworkConfig.pm" or croak 'webworkConfig.pm';
+	require $GLOBAL_INIT or croak $GLOBAL_INIT;
 	import Global;
 }
-
+$Global::cgiURL='foo';
 
 
 require $PGTRANSLATOR or die "Can't open $PGTRANSLATOR";
@@ -85,36 +87,36 @@
 
 my $PG_PL 						= 	"${courseScriptsDirectory}PG.pl";
 my $DANGEROUS_MACROS_PL			= 	"${courseScriptsDirectory}dangerousMacros.pl";
-my @MODULE_LIST					= ( "Exporter", "DynaLoader", "GD", "WWPlot", "Fun", 
+my @MODULE_LIST					= ( 	"Exporter", "DynaLoader", "GD", "WWPlot", "Fun", 
 										"Circle", "Label", "PGrandom", "Units", "Hermite", 
 										"List", "Match","Multiple", "Select", "AlgParser", 
 										"AnswerHash", "Fraction", "VectorField", "Complex1", 
 										"Complex", "MatrixReal1", "Matrix","Distributions",
 										"Regression"
-								);
-my @EXTRA_PACKAGES				= ( "AlgParserWithImplicitExpand", "Expr", 
+);
+my @EXTRA_PACKAGES				= ( 	"AlgParserWithImplicitExpand", "Expr", 
 										"ExprWithImplicitExpand", "AnswerEvaluator", 
-										"AnswerEvaluatorMaker"  
-
-							);
+										
+);
 
 my $INITIAL_MACRO_PACKAGES;
 unless (defined ($main::do_not_preload_macros) && $main::do_not_preload_macros == 1) {
-	$INITIAL_MACRO_PACKAGES 		=  <<END_OF_TEXT;
+
+	$INITIAL_MACRO_PACKAGES 		= <<END_OF_TEXT;
 		DOCUMENT();
 		loadMacros(
-		"PGbasicmacros.pl",
-		"PGchoicemacros.pl",
-		"PGanswermacros.pl",
-		"PGnumericalmacros.pl",
-		"PGgraphmacros.pl",
-		"PGauxiliaryFunctions.pl",
-		"PGmatrixmacros.pl",
-		"PGcomplexmacros.pl",
-		"PGstatisticsmacros.pl"
+			"PGbasicmacros.pl",
+			"PGchoicemacros.pl",
+			"PGanswermacros.pl",
+			"PGnumericalmacros.pl",
+			"PGgraphmacros.pl",
+			"PGauxiliaryFunctions.pl",
+			"PGmatrixmacros.pl",
+			"PGcomplexmacros.pl",
+			"PGstatisticsmacros.pl"
 		
 		);
-		
+
 		ENDDOCUMENT();
 	
 END_OF_TEXT
@@ -122,25 +124,25 @@
 	$INITIAL_MACRO_PACKAGES 		=  <<END_OF_TEXT;
 		DOCUMENT();
 		loadMacros(
-# 		"PGbasicmacros.pl",
-# 		"PGchoicemacros.pl",
-# 		"PGanswermacros.pl",
-# 		"PGnumericalmacros.pl",
-# 		"PGgraphmacros.pl",
-# 		"PGauxiliaryFunctions.pl",
-# 		"PGmatrixmacros.pl",
-# 		"PGcomplexmacros.pl",
-# 		"PGstatisticsmacros.pl"
+		# 		"PGbasicmacros.pl",
+		# 		"PGchoicemacros.pl",
+		# 		"PGanswermacros.pl",
+		# 		"PGnumericalmacros.pl",
+		# 		"PGgraphmacros.pl",
+		# 		"PGauxiliaryFunctions.pl",
+		# 		"PGmatrixmacros.pl",
+		# 		"PGcomplexmacros.pl",
+		# 		"PGstatisticsmacros.pl"
 		
 		);
 		
 		ENDDOCUMENT();
-	
+			
 END_OF_TEXT
 
 
 }
-
+#print $INITIAL_MACRO_PACKAGES;
 ###############################################################################
 #
 ###############################################################################
@@ -167,7 +169,8 @@
 print STDERR "Begin intitalization\n";
 my $dummy_envir = {	courseScriptsDirectory 	=> 	$courseScriptsDirectory,
 					displayMode 			=>	$displayMode,
-					macroDirectory			=> 	$macroDirectory};
+					macroDirectory			=> 	$macroDirectory,
+					cgiURL					=>	'foo_cgiURL'};
 my $pt = new PGtranslator5;  #pt stands for problem translator;
 $pt ->rh_directories(	{	courseScriptsDirectory 	=> $courseScriptsDirectory,
                       		macroDirectory			=> $macroDirectory,