\n/g; - } + # 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; + #} + ############################################################################## - # # 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) { + if (defined $submit_button and $submit_button eq 'Save as' and defined $currentSourceFilePath and -e $currentSourceFilePath) { warn "File $currentSourceFilePath exists. File not saved."; } else { eval { @@ -307,14 +401,15 @@ print OUTPUTFILE $problemContents; close OUTPUTFILE; }; + # FIXME: why is this in an eval{} ?!?!?! } + # record an error string for later use if there was a difficulty in writing to the file # FIXME is this string ever inspected? my $openTempFileErrors = $@ if $@; - if ( $openTempFileErrors) { - + if ($openTempFileErrors) { $self->{openTempFileErrors} = "Unable to write to $currentSourceFilePath: $openTempFileErrors"; #diagnose errors: warn "Editing errors: $openTempFileErrors\n"; @@ -322,157 +417,19 @@ 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; - - - } else { # unlink the temporary file if there are no errors and the save button has been pushed - - $self->{openTempFileErrors} = ''; - unlink("$editFilePath.$editFileSuffix") if defined($submit_button) and ($submit_button eq 'Save' or $submit_button eq 'Save as'); - }; - + $self->{openTempFileErrors} = ''; + unlink("$editFilePath.$editFileSuffix") + if defined $submit_button and ($submit_button eq 'Save' or $submit_button eq 'Save as'); + } # return values for use in the body subroutine -# $self->{problemPath} = $editFilePath; $self->{inputFilePath} = $inputFilePath; $self->{displayMode} = $displayMode; $self->{problemSeed} = $problemSeed; $self->{r_problemContents} = \$problemContents; $self->{editFileSuffix} = $editFileSuffix; - - - - -} -sub saveFile { - my $self = shift; - - - - - - -} -sub path { - my $self = shift; - my $r = $self->{r}; - my $set_id = ''; - my $problem_id = ''; - unless (defined( $r->param("file_type") and $r->param("file_type") eq 'course_info' ) ){ - $set_id = $r->urlpath->arg("setID"); - $problem_id = $r->urlpath->arg("problemID"); - } - #FIXME this is a bad way to pass the args, since it's position changes if the set/problem info - # isn't there - my $args = $_[-1]; - - my $ce = $self->{ce}; - my $root = $ce->{webworkURLs}->{root}; - my $courseName = $ce->{courseName}; - return $self->pathMacro($args, - "Home" => "$root", - $courseName => "$root/$courseName", - 'instructor' => "$root/$courseName/instructor", - 'sets' => "$root/$courseName/instructor/sets/", - "$set_id" => "$root/$courseName/instructor/sets/$set_id/", - "problems" => "$root/$courseName/instructor/sets/$set_id/problems", - "$problem_id" => '' - ); -} -sub body { - my $self = shift; - - # test area - my $r = $self->{r}; - my $db = $self->{db}; - my $ce = $self->{ce}; - my $user = $r->param('user'); - - - - ################ - # Gathering info - # What is needed - # $editFilePath -- - # $formURL -- given by $r->uri - # $tmpProblemPath - my $editFilePath = $self->{problemPath}; # path to the permanent file to be edited - my $inputFilePath = $self->{inputFilePath}; # path to the file currently being worked with (might be a .tmp file) - - - - - - my $header = CGI::i("Editing problem: $inputFilePath"); - - ######################################################################### - # Find the text for the problem, either in the tmp file, if it exists - # or in the original file in the template directory - ######################################################################### - my $problemContents = ${$self->{r_problemContents}}; - -# eval { $problemContents = WeBWorK::Utils::readFile($editFilePath) }; # try to read file -# $problemContents = $@ if $@; - - - - ######################################################################### - # Format the page - ######################################################################### - # Define parameters for textarea - # FIXME - # Should the seed be set from some particular user instance?? - # The mode list should be obtained from global.conf ultimately - my $rows = 20; - my $columns = 80; - my $mode_list = ['plainText','formattedText','images']; - my $displayMode = $self->{displayMode}; - my $problemSeed = $self->{problemSeed}; - my $uri = $r->uri; - ######################################################################## - # Define a link to view the problem - #FIXME - - ######################################################################### - - - warn "Errors in the problem ".CGI::br().$self->{editErrors} if $self->{editErrors}; - - - return CGI::p($header), - #CGI::start_form("POST",$r->uri,-target=>'_problem'), doesn't pass on the target parameter??? - qq!