[system] / branches / gage_dev / webwork2 / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /branches/gage_dev/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 993 Revision 994
… …
53 53
54 my $user = $db->getUser($userName); 54 my $user = $db->getUser($userName);
55 my $effectiveUser = $db->getUser($effectiveUserName); 55 my $effectiveUser = $db->getUser($effectiveUserName);
56 # obtain the effective user set, or if that is not yet defined obtain global set 56 # obtain the effective user set, or if that is not yet defined obtain global set
57 my $set = $db->getGlobalUserSet($effectiveUserName, $setName); 57 my $set = $db->getGlobalUserSet($effectiveUserName, $setName);
58 $set = $db->getGlobalSet($setName) unless defined($set); 58 #$set = $db->getGlobalSet($setName) unless defined($set);
59 unless (defined $set) {
60 $userSetClass = $courseEnv->{dbLayout}->{set_user}->{record};
61 $set = global2user($userSetClass, $db->getGlobalSet($setName))
62 }
59 # obtain the effective user problem, or if that is not yet defined obtain global problem 63 # obtain the effective user problem, or if that is not yet defined obtain global problem
60 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber); 64 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber);
61 $problem = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem); 65 $problem = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem);
62 # FIXME 66 # FIXME
63 # a better solution at this point would be to take set and problem, convert them to global_user type 67 # a better solution at this point would be to take set and problem, convert them to global_user type
Legend:
Removed from v.993  
changed lines
  Added in v.994
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9