[WWcvs] webwork2: changed browse_library to browse_npl_library to prevent confusion with the NPL directory

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

Log Message:
-----------
changed browse_library to browse_npl_library  to prevent confusion with 
the NPL directory

Tags:
----
rel-2-4-patches

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        SetMaker.pm

Revision Data
-------------
Index: SetMaker.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v
retrieving revision 1.77.2.4.2.1
retrieving revision 1.77.2.4.2.2
diff -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -u -r1.77.2.4.2.1 -r1.77.2.4.2.2
--- lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
@@ -733,7 +733,7 @@
 	my $library_selected = $self->{current_library_set};
 	my $set_selected = $r->param('local_sets');
 	my (@dis1, @dis2, @dis3, @dis4) = ();
-	@dis1 =	 (-disabled=>1) if($browse_which eq 'browse_library');	 
+	@dis1 =	 (-disabled=>1) if($browse_which eq 'browse_npl_library');	 
 	@dis2 =	 (-disabled=>1) if($browse_which eq 'browse_local');
 	@dis3 =	 (-disabled=>1) if($browse_which eq 'browse_mysets');
 	@dis4 =	 (-disabled=>1) if($browse_which eq 'browse_setdefs');
@@ -786,7 +786,7 @@
 
 	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
 		"Browse ",
-		CGI::submit(-name=>"browse_library", -value=>"National Problem Library", -style=>$these_widths, @dis1),
+		CGI::submit(-name=>"browse_npl_library", -value=>"National Problem Library", -style=>$these_widths, @dis1),
 		CGI::submit(-name=>"browse_local", -value=>"Local Problems", -style=>$these_widths, @dis2),
 		CGI::submit(-name=>"browse_mysets", -value=>"From This Course", -style=>$these_widths, @dis3),
 		CGI::submit(-name=>"browse_setdefs", -value=>"Set Definition Files", -style=>$these_widths, @dis4),
@@ -800,7 +800,7 @@
 		$self->browse_local_panel($library_selected);
 	} elsif ($browse_which eq 'browse_mysets') {
 		$self->browse_mysets_panel($library_selected, $list_of_local_sets);
-	} elsif ($browse_which eq 'browse_library') {
+	} elsif ($browse_which eq 'browse_npl_library') {
 		$self->browse_library_panel();
 	} elsif ($browse_which eq 'browse_setdefs') {
 		$self->browse_setdef_panel($library_selected);
@@ -849,7 +849,7 @@
 	$problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
 
 
-	#if($self->{r}->param('browse_which') ne 'browse_library') {
+	#if($self->{r}->param('browse_which') ne 'browse_npl_library') {
 	my $problem_seed = $self->{'problem_seed'} || 1234;
 	my $edit_link = CGI::a({href=>$self->systemLink(
 		 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
@@ -981,7 +981,7 @@
 
 	############# Default of which problem selector to display
 
-	my $browse_which = $r->param('browse_which') || 'browse_library';
+	my $browse_which = $r->param('browse_which') || 'browse_npl_library';
 
 	
 
@@ -996,7 +996,7 @@
 
 	########### Start the logic through if elsif elsif ...
     debug("browse_lib", $r->param("$browse_lib"));
-    debug("browse_library", $r->param("browse_library"));
+    debug("browse_npl_library", $r->param("browse_npl_library"));
     debug("browse_mysets", $r->param("browse_mysets"));
     debug("browse_setdefs", $r->param("browse_setdefs"));
 	##### Asked to browse certain problems
@@ -1004,8 +1004,8 @@
 		$browse_which = $browse_lib;
 		$self->{current_library_set} = "";
 		$use_previous_problems = 0; @pg_files = (); ## clear old problems
-	} elsif ($r->param('browse_library')) {
-		$browse_which = 'browse_library';
+	} elsif ($r->param('browse_npl_library')) {
+		$browse_which = 'browse_npl_library';
 		$self->{current_library_set} = "";
 		$use_previous_problems = 0; @pg_files = (); ## clear old problems
 	} elsif ($r->param('browse_local')) {