[WWcvs] webwork-modperl: Fixed bug #870 so that setHeaders can be viewed and

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
Fixed bug #870 so that setHeaders can be viewed and edited.

Modified Files:
--------------
    webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor:
        PGProblemEditor.pm

Revision Data
-------------
Index: PGProblemEditor.pm
===================================================================
RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -Llib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm -Llib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm -u -r1.60 -r1.61
--- lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -543,9 +543,17 @@
 # This is a subroutine, not a method
 # 
 sub determineLocalFilePath {
+	my $self= shift;				die "determineLocalFilePath is a method" unless ref($self);
 	my $path = shift;
+# 	my $default_screen_header_path   = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader}; 
+# 	my $default_hardcopy_header_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
+	my $setID = $self->{setID} || int(rand(1000));
 	if ($path =~ /Library/) {
 		$path =~ s|^.*?Library/||;  # truncate the url up to a segment such as ...rochesterLibrary/.......
+# 	} elsif ($path eq $default_screen_header_path) {
+# 		$path = "set$setID/setHeader.pg";
+# 	} elsif ($path eq $default_hardcopy_header_path) {
+# 		$path = "set$setID/hardcopyHeader.tex";
 	} else { # if its not in a library we'll just save it locally
 		$path = "new_problem_".int(rand(1000)).".pg";	#l hope there aren't any collisions.
 	}
@@ -560,13 +568,13 @@
 	$user    = int(rand(1000)) unless defined $user;
 	my $setID = $self->{setID} || int(rand(1000));
 	my $courseDirectory = $self->r->ce->{courseDirs};
-	#FIXME  -- we can put all of the temp files in a special directory
-	# so that even library files can viewed.
 	###############
 	# Calculate the location of the temporary file
 	###############
 	my $templatesDirectory = $courseDirectory->{templates};
-	my $blank_file_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{blankProblem};
+	my $blank_file_path              = $self->r->ce->{webworkFiles}->{screenSnippets}->{blankProblem};
+	my $default_screen_header_path   = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader}; 
+	my $default_hardcopy_header_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
 	my $tmpEditFileDirectory = (defined ($courseDirectory->{tmpEditFileDir}) ) ? $courseDirectory->{tmpEditFileDir} : "$templatesDirectory/tmpEdit";
 	if ($path =~ /^$templatesDirectory/ ) {
 		$path =~ s|^$templatesDirectory||;
@@ -574,6 +582,10 @@
 		$path = "$tmpEditFileDirectory/$path.$user.tmp";
 	} elsif ($path eq $blank_file_path) {
 		$path = "$tmpEditFileDirectory/blank.$setID.$user.tmp";  # handle the case of the blank problem
+	} elsif ($path eq $default_screen_header_path) {
+		$path = "$tmpEditFileDirectory/screenHeader.$setID.$user.tmp";  # handle the case of the screen header in snippets 
+	} elsif ($path eq $default_hardcopy_header_path) {
+		$path = "$tmpEditFileDirectory/hardcopyHeader.$setID.$user.tmp";  # handle the case of the hardcopy header in snippets 
 	} else {
 		die "determineTempFilePath should only be used on paths within the templates directory, not on $path";
 	}
@@ -1069,9 +1081,9 @@
 		#################################################
 		# Update set record
 		#################################################
-		my $setRecord  = $self->db->getGlobalSet($targetSetName);
+		my $setRecord  = $self->r->db->getGlobalSet($targetSetName);
 		$setRecord->set_header($sourceFilePath);
-		if(  $self->db->putGlobalSet($setRecord) ) {
+		if(  $self->r->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");
@@ -1330,12 +1342,12 @@
 	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 "" unless $self->{file_type} eq 'problem';  
+	                 # or $self->{file_type} eq 'set_header' ;    # need problem structure to make local copy -- not available for header
 	                 #  or $self->{file_type} eq 'source_path_for_problem_file'; # need setID and problemID to make local copy
 	return join ("",
-		"Make local copy at: [TMPL]/".determineLocalFilePath($editFilePath),
-		CGI::hidden(-name=>'action.make_local_copy.target_file', -value=>determineLocalFilePath($editFilePath) ),
+		"Make local copy at: [TMPL]/".($self->determineLocalFilePath($editFilePath)),
+		CGI::hidden(-name=>'action.make_local_copy.target_file', -value=>$self->determineLocalFilePath($editFilePath) ),
 		CGI::hidden(-name=>'action.make_local_copy.source_file', -value=>$editFilePath ),
 	);