{file_type} eq 'course_info';
+ return join(" ",
+ "Add problem to set " ,
+ CGI::popup_menu(-name=>'action.add_problem.target_set', -values=>\@allSetNames, -default=>$setName),
+ " as ",
+ CGI::popup_menu(-name=>'action.add_problem.file_type', -values=>['problem','set_header'], -default=>'problem'),
+
+ ); #FIXME add -lables to the pop up menu
+ return "";
+}
+
+sub add_problem_handler {
+ my ($self, $genericParams, $actionParams, $tableParams) = @_;
+# $self->addgoodmessage("add_problem_handler called");
+ my $courseName = $self->{courseID};
+ my $setName = $self->{setID};
+ my $problemNumber = $self->{problemID};
+ my $sourceFilePath = $self->{editFilePath};
+ my $displayMode = $self->{displayMode};
+ my $problemSeed = $self->{problemSeed};
+
+ my $targetSetName = $actionParams->{'action.add_problem.target_set'}->[0];
+ my $targetFileType = $actionParams->{'action.add_problem.file_type'}->[0];
+ my $templatesPath = $self->r->ce->{courseDirs}->{templates};
+ $sourceFilePath =~ s|^$templatesPath/||;
+
+ my $edit_level = $self->r->param("edit_level") || 0;
+ $edit_level++;
+
+ my $viewURL ='';
+ if ($targetFileType eq 'problem') {
+ my $targetProblemNumber = 1+ WeBWorK::Utils::max( $self->r->db->listGlobalProblems($targetSetName));
+
+ #################################################
+ # Update problem record
+ #################################################
+ my $problemRecord = $self->addProblemToSet(
+ setName => $targetSetName,
+ sourceFile => $sourceFilePath,
+ problemID => $targetProblemNumber,
+ );
+ $self->assignProblemToAllSetUsers($problemRecord);
+ $self->addgoodmessage("Added $sourceFilePath to ". $targetSetName. " as problem $targetProblemNumber") ;
+ $self->{file_type} = 'problem'; # change file type to problem -- if it's not already that
+
+ #################################################
+ # Set up redirect Problem.pm
+ #################################################
+ my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
+ courseID => $courseName,
+ setID => $targetSetName,
+ problemID => $targetProblemNumber,
+ );
+ $viewURL = $self->systemLink($problemPage,
+ params => {
+ displayMode => $displayMode,
+ problemSeed => $problemSeed,
+ editMode => "savedFile",
+ edit_level => $edit_level,
+ sourceFilePath => $sourceFilePath,
+ status_message => uri_escape($self->{status_message})
- $inputFilePath = $editFilePath if defined($submit_button) and $submit_button eq 'Revert';
-
- ##### handle button clicks #####
+ }
+ );
+ } elsif ($targetFileType eq 'set_header') {
+ #################################################
+ # Update set record
+ #################################################
+ my $setRecord = $self->db->getGlobalSet($targetSetName);
+ $setRecord->set_header($sourceFilePath);
+ if( $self->db->putGlobalSet($setRecord) ) {
+ $self->addgoodmessage("Added $sourceFilePath to ". $targetSetName. " as new set header ") ;
+ } else {
+ $self->addbadmessage("Unable to make $sourceFilePath the set header for $targetSetName");
+ }
+ $self->{file_type} = 'set_header'; # change file type to set_header if it not already so
+ #################################################
+ # Set up redirect
+ #################################################
+ my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",
+ courseID => $courseName, setID => $targetSetName
+ );
+ $viewURL = $self->systemLink($problemPage,
+ params => {
+ displayMode => $displayMode,
+ editMode => "savedFile",
+ edit_level => $edit_level,
+ status_message => uri_escape($self->{status_message})
+ }
+ );
+ } else {
+ die "Don't know what to do with target file type $targetFileType";
+ }
- if (not defined $submit_button or $submit_button eq 'Revert' ) {
- # this is a fresh editing job
- # copy the pg file to a new file with the same name with .tmp added
- # store this name in the $self->currentSourceFilePath for use in body
+ $self->reply_with_redirect($viewURL);
+}
+
+
+sub save_form {
+ my ($self, $onChange, %actionParams) = @_;
+ my $r => $self->r;
+ if (-w $self->{editFilePath}) {
+ return "Save";
+ } else {
+ return ""; #"Can't save -- No write permission";
+ }
+
+}
+
+sub save_handler {
+ my ($self, $genericParams, $actionParams, $tableParams) = @_;
+ $self->addgoodmessage("save_handler called");
+ my $courseName = $self->{courseID};
+ my $setName = $self->{setID};
+ my $problemNumber = $self->{problemID};
+ my $displayMode = $self->{displayMode};
+ my $problemSeed = $self->{problemSeed};
+
+ #################################################
+ # grab the problemContents from the form in order to save it to a new permanent file
+ # later we will unlink (delete) the current temporary file
+ #################################################
+ my $problemContents = fixProblemContents($self->r->param('problemContents'));
+ $self->{r_problemContents} = \$problemContents;
+
+ #################################################
+ # Construct the output file path
+ #################################################
+ my $editFilePath = $self->{editFilePath};
+ my $outputFilePath = $editFilePath;
+
+ my $do_not_save = 0;
+ my $file_type = $self->{file_type};
+ $self->new_saveFileChanges($outputFilePath);
+ #################################################
+ # Set up redirect to Problem.pm
+ #################################################
+ my $viewURL;
+ ########################################################
+ # construct redirect URL and redirect
+ ########################################################
+ if ($file_type eq 'problem' ) { # redirect to Problem.pm
+ my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",
+ courseID => $courseName, setID => $setName, problemID => $problemNumber
+ );
- # try to read file
- if(-e $inputFilePath) {
- eval { $problemContents = WeBWorK::Utils::readFile($inputFilePath) };
- $problemContents = $@ if $@;
- } else { # file not existing is not an error
- $problemContents = '';
- }
+ $viewURL = $self->systemLink($problemPage,
+ params => {
+ displayMode => $displayMode,
+ problemSeed => $problemSeed,
+ editMode => "savedFile",
+ edit_level => 0,
+ sourceFilePath => $editFilePath,
+ status_message => uri_escape($self->{status_message})
+
+ }
+ );
+ } elsif ($file_type eq 'set_header' or $file_type eq 'hardcopy_header') { # redirect to ProblemSet
+ my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",
+ courseID => $courseName, setID => $setName,
+ );
- $currentSourceFilePath = "$editFilePath.$editFileSuffix";
- $self->{currentSourceFilePath} = $currentSourceFilePath;
- $self->{problemPath} = $editFilePath;
- } elsif ($submit_button eq 'Refresh') {
- # grab the problemContents from the form in order to save it to the tmp file
- # store tmp file name in the $self->currentSourceFilePath for use in body
- $problemContents = $r->param('problemContents');
-
- $currentSourceFilePath = "$editFilePath.$editFileSuffix";
- $self->{currentSourceFilePath} = $currentSourceFilePath;
- $self->{problemPath} = $editFilePath;
- } elsif ($submit_button eq 'Save') {
- # grab the problemContents from the form in order to save it to the permanent file
- # later we will unlink (delete) the temporary file
- # store permanent file name in the $self->currentSourceFilePath for use in body
- $problemContents = $r->param('problemContents');
-
- $currentSourceFilePath = "$editFilePath";
- $self->{currentSourceFilePath} = $currentSourceFilePath;
- $self->{problemPath} = $editFilePath;
- } elsif ($submit_button eq 'Save as') {
- # grab the problemContents from the form in order to save it to a new permanent file
- # later we will unlink (delete) the current temporary file
- # store new permanent file name in the $self->currentSourceFilePath for use in body
- $problemContents = $r->param('problemContents');
- $currentSourceFilePath = $ce->{courseDirs}->{templates} . '/' .$r->param('save_to_new_file');
- $self->{currentSourceFilePath} = $currentSourceFilePath;
- $self->{problemPath} = $currentSourceFilePath;
- } else {
- die "Unrecognized submit command: $submit_button";
- }
-
- # Handle the problem of line endings. Make sure that all of the line endings. Convert \r\n to \n
- $problemContents =~ s/\r\n/\n/g;
- $problemContents =~ s/\r/\n/g;
-
- # FIXME convert all double returns to paragraphs for .txt files
- # instead of doing this here, it should be done n the PLACE WHERE THE FILE IS DISPLAYED!!!
- #if ($self->{file_type} eq 'course_info' ) {
- # $problemContents =~ s/\n\n/\n\n/g;
- #}
+ $viewURL = $self->systemLink($problemPage,
+ params => {
+ displayMode => $displayMode,
+ problemSeed => $problemSeed,
+ editMode => "savedFile",
+ edit_level => 0,
+ status_message => uri_escape($self->{status_message})
- ##############################################################################
- # write changes to the approriate files
- # FIXME make sure that the permissions are set correctly!!!
- # Make sure that the warning is being transmitted properly.
- ##############################################################################
+ }
+ );
- # FIXME set a local state rather continue to call on the submit button.
- if (defined $submit_button and $submit_button eq 'Save as' and defined $currentSourceFilePath and -e $currentSourceFilePath) {
- warn "File $currentSourceFilePath exists. File not saved.";
+
+ } elsif ($file_type eq 'course_info') { # redirect to ProblemSets.pm
+ my $problemSetsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",
+ courseID => $courseName);
+ $viewURL = $self->systemLink($problemSetsPage,
+ params => {
+ editMode => ("savedFile"),
+ edit_level => 0,
+ status_message => uri_escape($self->{status_message})
+ }
+ );
+
} else {
- # make sure any missing directories are created
- $currentSourceFilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates},$currentSourceFilePath);
- eval {
- local *OUTPUTFILE;
- open OUTPUTFILE, ">", $currentSourceFilePath
- or die "Failed to open $currentSourceFilePath";
- print OUTPUTFILE $problemContents;
- close OUTPUTFILE;
- }; # any errors are caught in the next block
+ die "I don't know how to redirect this file type $file_type ";
+ }
+
+ $self->reply_with_redirect($viewURL);
+}
+sub save_as_form {
+ my ($self, $onChange, %actionParams) = @_;
+ return "Save as [TMPL]/".CGI::textfield(-name=>'action.save_as.target_file', -size=>40, -value=>""),;
+
+}
+
+sub save_as_handler {
+ my ($self, $genericParams, $actionParams, $tableParams) = @_;
+ $self->addgoodmessage("save_as_handler called");
+ my $courseName = $self->{courseID};
+ my $setName = $self->{setID};
+ my $problemNumber = $self->{problemID};
+ my $displayMode = $self->{displayMode};
+ my $problemSeed = $self->{problemSeed};
+
+ my $do_not_save = 0;
+ my $new_file_name = $actionParams->{'action.save_as.target_file'}->[0] || '';
+ $new_file_name =~ s/^\s*//; #remove initial and final white space
+ $new_file_name =~ s/\s*$//;
+ if ( $new_file_name !~ /\S/) { # need a non-blank file name
+ # setting $self->{failure} stops saving and any redirects
+ $do_not_save = 1;
+ warn "new file name is $new_file_name";
+ $self->addbadmessage(CGI::p("Please specify a file to save to."));
+ last ACTION_CASES; #stop processing
}
- ###########################################################
- # Catch errors in saving files, clean up temp files
- ###########################################################
+ #################################################
+ # grab the problemContents from the form in order to save it to a new permanent file
+ # later we will unlink (delete) the current temporary file
+ #################################################
+ my $problemContents = fixProblemContents($self->r->param('problemContents'));
+ $self->{r_problemContents} = \$problemContents;
+
+ #################################################
+ # Rescue the user in case they forgot to end the file name with .pg
+ #################################################
+ my $file_type = $self->{file_type};
+ if($self->{file_type} eq 'problem'
+ or $self->{file_type} eq 'blank_problem'
+ or $self->{file_type} eq 'set_header') {
+ $new_file_name =~ s/\.pg$//; # remove it if it is there
+ $new_file_name .= '.pg'; # put it there
+
+ }
+ #################################################
+ # Construct the output file path
+ #################################################
+ my $outputFilePath = $self->r->ce->{courseDirs}->{templates} . '/' .
+ $new_file_name;
+ if (defined $outputFilePath and -e $outputFilePath) {
+ # setting $do_not_save stops saving and any redirects
+ $do_not_save = 1;
+ $self->addbadmessage(CGI::p("File $outputFilePath exists. File not saved."));
+ } else {
+ $self->{editFilePath} = $outputFilePath;
+ $self->{tempFilePath} = ''; # nothing needs to be unlinked.
+ $self->{inputFilePath} = '';
+ }
+
+
+
+ unless ($do_not_save ) {
+ $self->new_saveFileChanges($outputFilePath, \$problemContents);
+ }
+ my $edit_level = $self->r->param("edit_level") || 0;
+ $edit_level++;
+
+ #################################################
+ # Set up redirect
+ # The redirect gives the server time to detect that the new file exists.
+ #################################################
+ my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
+ courseID => $courseName, setID => 'Undefined_Set', problemID => 'Undefined_Set'
+ );
+ my $viewURL = $self->systemLink($problemPage,
+ params=>{
+ sourceFilePath => $outputFilePath, #The path relative to the templates directory is required.
+ edit_level => $edit_level,
+ file_type => 'source_path_for_problem_file',
+ status_message => uri_escape($self->{status_message})
- my $openTempFileErrors = $@ if $@;
+ }
+ );
- if ($openTempFileErrors) {
- $self->{failure} = "Unable to write to $currentSourceFilePath: It is likely that the permissions in the template directory have not been set correctly. See log for details.";
- #diagnose errors:
- warn "Unable to write to $currentSourceFilePath: $openTempFileErrors";
- warn "The file $currentSourceFilePath exists. \n " if -e $currentSourceFilePath; #FIXME
- warn "The file $currentSourceFilePath cannot be found. \n " unless -e $currentSourceFilePath;
- warn "The file $currentSourceFilePath does not have write permissions. \n"
- if -e $currentSourceFilePath and not -w $currentSourceFilePath;
+ $self->reply_with_redirect($viewURL);
+return ""; # no redirect needed
+}
+sub revert_form {
+ my ($self, $onChange, %actionParams) = @_;
+ return "Revert" ;
+
+}
+sub revert_handler {
+ my ($self, $genericParams, $actionParams, $tableParams) = @_;
+ $self->addgoodmessage("revert_handler called");
+
+ my $courseName = $self->{courseID};
+ my $setName = $self->{setID};
+ my $problemNumber = $self->{problemID};
+ my $displayMode = $self->{displayMode};
+ my $problemSeed = $self->{problemSeed};
+ #################################################
+ # Reset the problem paths
+ #################################################
+
+ my $editFilePath = $self->{editFilePath};
+ $self->{inputFilePath} = $editFilePath;
+ $self->{tempFilePath} = '';
+ # unlink the temp files;
+ unlink($self->{tempFilePath});
+ my $problemContents ='';
+ $self->{r_problemContents} = \$problemContents;
+ $self->addgoodmessage("Reverting to original file $editFilePath");
+ # no redirect is needed
+}
+sub make_local_copy_form {
+ my ($self, $genericParams, $actionParams, $tableParams) = @_;
+ my $editFilePath = $self->{editFilePath}; # path to the permanent file to be edited
+ return "" unless -e $editFilePath;
+ return "" if -w $editFilePath;
+ return "" unless $self->{file_type} eq 'problem' or $self->{file_type} eq 'set_header' ;
+ return join ("",
+ "Make local copy at: [TMPL]/".determineLocalFilePath($editFilePath),
+ CGI::hidden(-name=>'action.make_local_copy.target_file', -value=>determineLocalFilePath($editFilePath) ),
+ CGI::hidden(-name=>'action.make_local_copy.source_file', -value=>$editFilePath ),
+ );
+
+}
+
+sub make_local_copy_handler {
+ my ($self, $genericParams, $actionParams, $tableParams) = @_;
+ $self->addgoodmessage("make_local_copy_handler called");
+
+ my $courseName = $self->{courseID};
+ my $setName = $self->{setID};
+ my $problemNumber = $self->{problemID};
+
+ my $displayMode = $self->{displayMode};
+ my $problemSeed = $self->{problemSeed};
+
+ my $do_not_save = 0; #error flag
+ #################################################
+ # Save the file locally
+ #################################################
+ my $new_file_name = $actionParams->{'action.make_local_copy.target_file'}->[0] || '';
+ my $sourceFilePath = $actionParams->{'action.make_local_copy.source_file'}->[0] || '';
+ my $templatesPath = $self->r->ce->{courseDirs}->{templates};
+ $sourceFilePath =~ s|^$templatesPath/||; # make sure path relative to templates directory
+
+ if ( $new_file_name !~ /\S/) { # need a non-blank file name
+ # setting $self->{failure} stops saving and any redirects
+ $do_not_save = 1;
+ warn "new file name is $new_file_name";
+ $self->addbadmessage(CGI::p("Please specify a file to save to."));
+ }
+
+ #################################################
+ # grab the problemContents from the form in order to save it to a new permanent file
+ # later we will unlink (delete) the current temporary file
+ #################################################
+
+ my $problemContents = fixProblemContents($self->r->param('problemContents'));
+ $self->{r_problemContents} = \$problemContents;
+ warn "problem contents is empty" unless $problemContents;
+ #################################################
+ # Construct the output file path
+ #################################################
+ my $outputFilePath = $self->r->ce->{courseDirs}->{templates} . '/' .
+ $new_file_name;
+ if (defined $outputFilePath and -e $outputFilePath) {
+ # setting $do_not_save stops saving and any redirects
+ $do_not_save = 1;
+ $self->addbadmessage(CGI::p("File $outputFilePath exists. File not saved."));
} else {
- $self->{success} = "Problem saved to: $currentSourceFilePath";
- # unlink the temporary file if there are no errors and the save button has been pushed
- unlink("$editFilePath.$editFileSuffix")
- if defined $submit_button and ($submit_button eq 'Save' or $submit_button eq 'Save as');
+ #$self->addgoodmessage("Saving to file $outputFilePath.");
}
-
- # return values for use in the body subroutine
- $self->{inputFilePath} = $inputFilePath;
- $self->{displayMode} = $displayMode;
- $self->{problemSeed} = $problemSeed;
- $self->{r_problemContents} = \$problemContents;
- $self->{editFileSuffix} = $editFileSuffix;
+ my $file_type = $self->{file_type};
+ unless ($do_not_save ) {
+ $self->new_saveFileChanges($outputFilePath);
+ }
+ #################################################
+ # Modify source file in problem
+ #################################################
+ if (-r $outputFilePath and !$do_not_save) {
+ my $problemRecord = $self->r->db->getGlobalProblem($setName,$problemNumber);
+ $problemRecord->source_file($new_file_name);
+ if ( $self->r->db->putGlobalProblem($problemRecord) ) {
+ $self->addgoodmessage("A local, editable, copy of [TMPL]/$sourceFilePath has been made for problem $problemNumber.") ;
+ } else {
+ $self->addbadmessage("Unable to change the source file path for set $setName, problem $problemNumber. Unknown error.");
+ }
+ }
+ my $edit_level = $self->r->param("edit_level") || 0;
+ $edit_level++;
+ #################################################
+ # Set up redirect
+ #################################################
+
+ my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
+ courseID => $courseName, setID => $setName, problemID => $problemNumber
+ );
+ my $viewURL = $self->systemLink($problemPage,
+ params=>{
+ sourceFilePath => $sourceFilePath,
+ edit_level => $edit_level,
+ file_type => 'problem',
+ status_message => uri_escape($self->{status_message})
+
+ }
+ );
+ $self->reply_with_redirect($viewURL);
}
+
+
+
1;