Ww3 feature/problem set details

bin/check_modules.pl

@@ -44,6 +44,7 @@
 	Dancer
 	Dancer::Plugin::Database
 	Data::Dumper
+    Data::Compare
 	Data::UUID 
 	Date::Format
 	Date::Parse

webwork3/bin/app.pl

@@ -1,151 +1,159 @@
 #!/usr/bin/env perl
-use Dancer;
-use Dancer::Plugin::Database;
 
 BEGIN {$ENV{MOD_PERL_API_VERSION}=2}
 
-# link to WeBWorK code libraries
-use lib config->{webwork_dir}.'/lib';
-use lib config->{pg_dir}.'/lib';
-
-use WeBWorK::CourseEnvironment;
-use WeBWorK::DB;
-use WeBWorK::Authen;
-
-## note: Routes::Authenication must be passed first
-use Routes::Authentication qw/buildSession setCourseEnvironment setCookie/; 
-use Routes::Course;
-use Routes::Library;
-use Routes::ProblemSets;
-use Routes::User;
-use Routes::Settings;
-use Routes::PastAnswers;
-
-set serializer => 'JSON';
-
-hook 'before' => sub {
-
-    # for my $key (keys(%{request->params})){
-    # 	my $value = defined(params->{$key}) ? params->{$key} : ''; 
-    # 	debug($key . " : " . $value);
-    # } 
-
-};
-
-## right now, this is to help handshaking between the original webservice and dancer.  
-## it does nothing except sets the session using the hook 'before' above. 
-
-post '/handshake' => sub {
-
-
-	debug "in /handshake";
-
-	setCourseEnvironment(params->{course_id});
-
-	debug session; 
-	buildSession();
-	if (! session 'logged_in'){
-		send_error('You are no longer logged in.  You may need to reauthenticate.',419);
-	}
-
-	return {msg => "If you get this message the handshaking between Dancer and WW2 worked."};
-};
-
-
-post '/courses/:course_id/login' => sub {
-
-	my $authen = new WeBWorK::Authen(vars->{ce});
-	$authen->set_params({
-			user => params->{user},
-			password => params->{password},
-			key => params->{session_key}
-		});
-
-	my $result = $authen->verify();
-
-	if($result){
-		my $key = $authen->create_session(params->{user});
-
-		session user => params->{user};
-		session key => $key;
-
-		my $permission = vars->{db}->getPermissionLevel(session->{user});
-		session permission => $permission->{permission};
-		session timestamp => time();
-
-		setCookie();
-
-		return {session_key=>$key, user=>params->{user},logged_in=>1};
-
-	} else {
-		return {logged_in=>0};
-	} 
-};
-
-
-post '/courses/:course_id/logout' => sub {
-
-	my $deleteKey = vars->{db}->deleteKey(session 'user');
-	my $sessionDestroy = session->destroy;
-
-	my $hostname = vars->{ce}->{server_root_url};
-	$hostname =~ s/https?:\/\///;
-
-	if ($hostname ne "localhost" && $hostname ne "127.0.0.1") {
-		cookie "WeBWorK.CourseAuthen." . params->{course_id} => "", domain=>$hostname, expires => "-1 hour";
-	} else {
-		cookie "WeBWorK.CourseAuthen." . params->{course_id} => "", expires => "-1 hour";
-	}
-
-	return {logged_in=>0};
-};
-
-
-get '/app-info' => sub {
-	return {
-		environment=>config->{environment},
-		port=>config->{port},
-		content_type=>config->{content_type},
-		startup_info=>config->{startup_info},
-		server=>config->{server},
-		appdir=>config->{appdir},
-		template=>config->{template},
-		logger=>config->{logger},
-		session=>config->{session},
-		session_expires=>config->{session_expires},
-		session_name=>config->{session_name},
-		session_secure=>config->{session_secure},
-		session_is_http_only=>config->{session_is_http_only},
-	};
-};
-
-get '/courses/:course_id/info' => sub {
-
-	setCourseEnvironment(params->{course_id});
-
-	return {
-		course_id => params->{course_id},
-		webwork_dir => vars->{ce}->{webwork_dir},
-		webworkURLs => vars->{ce}->{webworkURLs},
-		webworkDirs => vars->{ce}->{webworkDirs}
-	};
-
-};
-
-
-sub checkCourse {
-	if (! defined(session->{course})) {
-		if (defined(params->{course_id})) {
-			session->{course} = params->{course_id};
-		} else {
-			send_error("The course has not been defined.  You may need to authenticate again",401);	
-		}
-
-	}
-
-	var ce => WeBWorK::CourseEnvironment->new({webwork_dir => config->{webwork_dir}, courseName=> session->{course}});
-
-}
-
-
-Dancer->dance;
+use Dancer;
+use WeBWorK3;
+
+
+
+#package WeBWorK3;
+#use Dancer;
+#use Dancer::Plugin::Database;
+#
+## link to WeBWorK code libraries
+#use lib config->{webwork_dir}.'/lib';
+#use lib config->{pg_dir}.'/lib';
+#
+#use WeBWorK::CourseEnvironment;
+#use WeBWorK::DB;
+#use WeBWorK::Authen;
+#
+### note: Routes::Authenication must be passed first
+#use Routes::Authentication qw/buildSession setCourseEnvironment setCookie/; 
+#use Routes::Course;
+#use Routes::Library;
+#use Routes::ProblemSets;
+#use Routes::User;
+#use Routes::Settings;
+#use Routes::PastAnswers;
+#
+#set serializer => 'JSON';
+#
+#hook 'before' => sub {
+#
+#    # for my $key (keys(%{request->params})){
+#    # 	my $value = defined(params->{$key}) ? params->{$key} : ''; 
+#    # 	debug($key . " : " . $value);
+#    # } 
+#
+#};
+#
+### right now, this is to help handshaking between the original webservice and dancer.  
+### it does nothing except sets the session using the hook 'before' above. 
+#
+#post '/handshake' => sub {
+#
+#
+#	debug "in /handshake";
+#
+#	setCourseEnvironment(params->{course_id});
+#
+#	debug session; 
+#	buildSession();
+#	if (! session 'logged_in'){
+#		send_error('You are no longer logged in.  You may need to reauthenticate.',419);
+#	}
+#
+#	return {msg => "If you get this message the handshaking between Dancer and WW2 worked."};
+#};
+#
+#
+#post '/courses/:course_id/login' => sub {
+#
+#	my $authen = new WeBWorK::Authen(vars->{ce});
+#	$authen->set_params({
+#			user => params->{user},
+#			password => params->{password},
+#			key => params->{session_key}
+#		});
+#
+#	my $result = $authen->verify();
+#
+#	if($result){
+#		my $key = $authen->create_session(params->{user});
+#		
+#		session user => params->{user};
+#		session key => $key;
+#
+#		my $permission = vars->{db}->getPermissionLevel(session->{user});
+#		session permission => $permission->{permission};
+#		session timestamp => time();
+#
+#		setCookie();
+#
+#		return {session_key=>$key, user=>params->{user},logged_in=>1};
+#
+#	} else {
+#		return {logged_in=>0};
+#	} 
+#};
+#
+#
+#post '/courses/:course_id/logout' => sub {
+#
+#	my $deleteKey = vars->{db}->deleteKey(session 'user');
+#	my $sessionDestroy = session->destroy;
+#
+#	my $hostname = vars->{ce}->{server_root_url};
+#	$hostname =~ s/https?:\/\///;
+#
+#	if ($hostname ne "localhost" && $hostname ne "127.0.0.1") {
+#		cookie "WeBWorKCourseAuthen." . params->{course_id} => "", domain=>$hostname, expires => "-1 hour";
+#	} else {
+#		cookie "WeBWorKCourseAuthen." . params->{course_id} => "", expires => "-1 hour";
+#	}
+#
+#	return {logged_in=>0};
+#};
+#
+#
+#get '/app-info' => sub {
+#	return {
+#        appname => config->{appname},
+#		environment=>config->{environment},
+#		port=>config->{port},
+#		content_type=>config->{content_type},
+#		startup_info=>config->{startup_info},
+#		server=>config->{server},
+#		appdir=>config->{appdir},
+#		template=>config->{template},
+#		logger=>config->{logger},
+#		session=>config->{session},
+#		session_expires=>config->{session_expires},
+#		session_name=>config->{session_name},
+#		session_secure=>config->{session_secure},
+#		session_is_http_only=>config->{session_is_http_only},
+#	};
+#};
+#
+#get '/courses/:course_id/info' => sub {
+#
+#	setCourseEnvironment(params->{course_id});
+#
+#	return {
+#		course_id => params->{course_id},
+#		webwork_dir => vars->{ce}->{webwork_dir},
+#		webworkURLs => vars->{ce}->{webworkURLs},
+#		webworkDirs => vars->{ce}->{webworkDirs}
+#	};
+#
+#};
+#
+#
+#sub checkCourse {
+#	if (! defined(session->{course})) {
+#		if (defined(params->{course_id})) {
+#			session->{course} = params->{course_id};
+#		} else {
+#			send_error("The course has not been defined.  You may need to authenticate again",401);	
+#		}
+#
+#	}
+#
+#	var ce => WeBWorK::CourseEnvironment->new({webwork_dir => config->{webwork_dir}, courseName=> session->{course}});
+#
+#}
+
+
+dance;