--- trunk/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm 2004/05/15 19:10:18 2116 +++ trunk/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm 2007/01/03 22:47:30 4735 @@ -1,7 +1,7 @@ ################################################################################ # WeBWorK Online Homework Delivery System -# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/ -# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.7 2004/05/07 21:04:07 jj Exp $ +# Copyright © 2000-2006 The WeBWorK Project, http://openwebwork.sf.net/ +# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.76 2006/10/30 20:51:25 sh002i Exp $ # # This program is free software; you can redistribute it and/or modify it under # the terms of either: (a) the GNU General Public License as published by the @@ -10,7 +10,7 @@ # # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the +# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the # Artistic License for more details. ################################################################################ @@ -20,21 +20,45 @@ =head1 NAME -WeBWorK::ContentGenerator::Instructor::SetMaker - Make problem sets. +WeBWorK::ContentGenerator::Instructor::SetMaker - Make homework sets. =cut use strict; use warnings; -use CGI::Pretty qw(); + +#use CGI qw(-nosticky); +use WeBWorK::CGI; +use WeBWorK::Debug; use WeBWorK::Form; -use WeBWorK::Utils qw(readDirectory max); +use WeBWorK::Utils qw(readDirectory max sortByName); use WeBWorK::Utils::Tasks qw(renderProblems); +use File::Find; require WeBWorK::Utils::ListingDB; -use constant MAX_SHOW => 20; +use constant MAX_SHOW_DEFAULT => 20; +use constant NO_LOCAL_SET_STRING => 'No sets in this course yet'; +use constant SELECT_SET_STRING => 'Select a Set from this Course'; +use constant SELECT_LOCAL_STRING => 'Select a Problem Collection'; +use constant MY_PROBLEMS => ' My Problems '; +use constant MAIN_PROBLEMS => ' Unclassified Problems '; +use constant CREATE_SET_BUTTON => 'Create New Set'; +use constant ALL_CHAPTERS => 'All Chapters'; +use constant ALL_SUBJECTS => 'All Subjects'; +use constant ALL_SECTIONS => 'All Sections'; +use constant ALL_TEXTBOOKS => 'All Textbooks'; + +use constant LIB2_DATA => { + 'dbchapter' => {name => 'library_chapters', all => 'All Chapters'}, + 'dbsection' => {name => 'library_sections', all =>'All Sections' }, + 'dbsubject' => {name => 'library_subjects', all => 'All Subjects' }, + 'textbook' => {name => 'library_textbook', all => 'All Textbooks'}, + 'textchapter' => {name => 'library_textchapter', all => 'All Chapters'}, + 'textsection' => {name => 'library_textsection', all => 'All Sections'}, + 'keywords' => {name => 'library_keywords', all => '' }, + }; ## Flags for operations on files @@ -42,58 +66,164 @@ use constant HIDDEN => (1 << 1); use constant SUCCESS => (1 << 2); -## Maybe this should be in ContentGenerator.pm - -sub adderrmsg { - my $self = shift; - my $msg = shift; - $self->addmessage(CGI::div({class=>"ResultsWithError"}, $msg)); +## for additional problib buttons +my %problib; ## filled in in global.conf +my %ignoredir = ( + '.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1, + 'headers' => 1, 'macros' => 1, 'email' => 1, +); + +sub prepare_activity_entry { + my $self=shift; + my $r = $self->r; + my $user = $self->r->param('user') || 'NO_USER'; + return("In SetMaker as user $user"); } -sub addgoodmsg { - my $self = shift; - my $msg = shift; - $self->addmessage(CGI::div({class=>"ResultsWithoutError"}, $msg)); -} - - ## This is for searching the disk for directories containing pg files. ## to make the recursion work, this returns an array where the first -## item is 1 or 0 depending on whether or not the current -## directory has any pg files. The second is a list of directories -## which contain pg files. +## item is the number of pg files in the directory. The second is a +## list of directories which contain pg files. +## +## If a directory contains only one pg file and the directory name +## is the same as the file name, then the directory is considered +## to be part of the parent directory (it is probably in a separate +## directory only because it has auxiliary files that want to be +## kept together with the pg file). +## +## If a directory has a file named "=library-ignore", it is never +## included in the directory menu. If a directory contains a file +## called "=library-combine-up", then its pg are included with those +## in the parent directory (and the directory does not appear in the +## menu). If it has a file called "=library-no-combine" then it is +## always listed as a separate directory even if it contains only one +## pg file. + sub get_library_sets { - my $amtop = shift; - my $topdir = shift; - my @lis = readDirectory($topdir); - my @pgs = grep { m/\.pg$/ and (not m/Header\.pg/) and -f "$topdir/$_"} @lis; - my $havepg = scalar(@pgs)>0 ? 1 : 0; - my @mdirs = grep {$_ ne "." and $_ ne ".." and $_ ne "Library" - and -d "$topdir/$_"} @lis; - if($amtop) { # we don't want the library - @mdirs = grep {$_ ne "Library"} @mdirs; - } - my ($adir, @results, @thisresult); - for $adir (@mdirs) { - @results = get_library_sets(0, "$topdir/$adir"); - my $isadirok = shift @results; - @thisresult = (@thisresult, @results); - if ($isadirok) { - @thisresult = ("$topdir/$adir", @thisresult); - } - } - return(($havepg, @thisresult)); + my $top = shift; my $dir = shift; + # ignore directories that give us an error + my @lis = eval { readDirectory($dir) }; + if ($@) { + warn $@; + return (0); + } + return (0) if grep /^=library-ignore$/, @lis; + + my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$dir/$_"} @lis; + my $pgcount = scalar(@pgfiles); + my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg'; + my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis)); + + my @pgdirs; + my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis; + if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs} + foreach my $subdir (@dirs) { + my @results = get_library_sets(0, "$dir/$subdir"); + $pgcount += shift @results; push(@pgdirs,@results); + } + + return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis; + return (0,@pgdirs,$dir); +} + +sub get_library_pgs { + my $top = shift; my $base = shift; my $dir = shift; + my @lis = readDirectory("$base/$dir"); + return () if grep /^=library-ignore$/, @lis; + return () if !$top && grep /^=library-no-combine$/, @lis; + + my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_"} @lis; + my $others = scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) && + !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis); + + my @dirs = grep {!$ignoredir{$_} and -d "$base/$dir/$_"} @lis; + if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs} + foreach my $subdir (@dirs) {push(@pgs, get_library_pgs(0,"$base/$dir",$subdir))} + + return () unless $top || (scalar(@pgs) == 1 && $others) || grep /^=library-combine-up$/, @lis; + return (map {"$dir/$_"} @pgs); } -## List all the pg files in the requested directory sub list_pg_files { - my $templatedir = shift; - my $topdir = shift; + my ($templates,$dir) = @_; + my $top = ($dir eq '.')? 1 : 2; + my @pgs = get_library_pgs($top,$templates,$dir); + return sortByName(undef,@pgs); +} + +## Search for set definition files + +sub get_set_defs { + my $topdir = shift; + my @found_set_defs; + # get_set_defs_wanted is a closure over @found_set_defs + my $get_set_defs_wanted = sub { + #my $fn = $_; + #my $fdir = $File::Find::dir; + #return() if($fn !~ /^set.*\.def$/); + ##return() if(not -T $fn); + #push @found_set_defs, "$fdir/$fn"; + push @found_set_defs, $_ if m|/set[^/]*\.def$|; + }; + find({ wanted => $get_set_defs_wanted, follow_fast=>1, no_chdir=>1}, $topdir); + map { $_ =~ s|^$topdir/?|| } @found_set_defs; + return @found_set_defs; +} - my @lis = readDirectory("$templatedir/$topdir"); - my @pgs = grep { m/\.pg$/ and (not m/Header\.pg/) and -f "$templatedir/$topdir/$_"} @lis; - @pgs = map { "$topdir/$_" } @pgs; - return(@pgs); +## Try to make reading of set defs more flexible. Additional strategies +## for fixing a path can be added here. + +sub munge_pg_file_path { + my $self = shift; + my $pg_path = shift; + my $path_to_set_def = shift; + my $end_path = $pg_path; + # if the path is ok, don't fix it + return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path"); + # if we have followed a link into a self contained course to get + # to the set.def file, we need to insert the start of the path to + # the set.def file + $end_path = "$path_to_set_def/$pg_path"; + return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path"); + # if we got this far, this path is bad, but we let it produce + # an error so the user knows there is a troublesome path in the + # set.def file. + return($pg_path); +} + +## Read a set definition file. This could be abstracted since it happens +## elsewhere. Here we don't have to process so much of the file. + +sub read_set_def { + my $self = shift; + my $r = $self->r; + my $filePathOrig = shift; + my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig"; + $filePathOrig =~ s/set.*\.def$//; + $filePathOrig =~ s|/$||; + $filePathOrig = "." if ($filePathOrig !~ /\S/); + my @pg_files = (); + my ($line, $got_to_pgs, $name, @rest) = ("", 0, ""); + if ( open (SETFILENAME, "$filePath") ) { + while($line = ) { + chomp($line); + $line =~ s|(#.*)||; # don't read past comments + if($got_to_pgs) { + unless ($line =~ /\S/) {next;} # skip blank lines + ($name,@rest) = split (/\s*,\s*/,$line); + $name =~ s/\s*//g; + push @pg_files, $name; + } else { + $got_to_pgs = 1 if ($line =~ /problemList\s*=/); + } + } + } else { + $self->addbadmessage("Cannot open $filePath"); + } + # This is where we would potentially munge the pg file paths + # One possibility + @pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files; + return(@pg_files); } ## go through past page getting a list of identifiers for the problems @@ -101,764 +231,1131 @@ ## be hidden sub get_past_problem_files { - my $r = shift; - my @found=(); - my $count =1; - while (defined($r->param("filetrial$count"))) { - my $val = 0; - $val |= ADDED if($r->param("trial$count")); - $val |= HIDDEN if($r->param("hideme$count")); - push @found, [$r->param("filetrial$count"), $val]; - $count++; - } - return(\@found); + my $r = shift; + my @found=(); + my $count =1; + while (defined($r->param("filetrial$count"))) { + my $val = 0; + $val |= ADDED if($r->param("trial$count")); + $val |= HIDDEN if($r->param("hideme$count")); + push @found, [$r->param("filetrial$count"), $val]; + $count++; + } + return(\@found); } #### For adding new problems sub add_selected { - my $self = shift; - my $db = shift; - my $setName = shift; - my @past_problems = @{$self->{past_problems}}; - my @selected = @past_problems; - my (@path, $file, $selected, $freeProblemID); - $freeProblemID = max($db->listGlobalProblems($setName)) + 1; - my $addedcount=0; - - for $selected (@selected) { - if($selected->[1] & ADDED) { - $file = $selected->[0]; - @path = split "/", $selected->[0]; - pop @path; # Remove the file name from the path - shift @path if $path[0] eq ""; # remove the null element from the begining - my $problemRecord = $db->newGlobalProblem(); - $problemRecord->problem_id($freeProblemID++); - $problemRecord->set_id($setName); - $problemRecord->source_file($file); - $problemRecord->value("1"); - $problemRecord->max_attempts("-1"); - $db->addGlobalProblem($problemRecord); - $self->assignProblemToAllSetUsers($problemRecord); - $selected->[1] &= SUCCESS; - $addedcount++; - } - } - return($addedcount); + my $self = shift; + my $db = shift; + my $setName = shift; + my @past_problems = @{$self->{past_problems}}; + my @selected = @past_problems; + my (@path, $file, $selected, $freeProblemID); + # DBFIXME count would work just as well + $freeProblemID = max($db->listGlobalProblems($setName)) + 1; + my $addedcount=0; + + for $selected (@selected) { + if($selected->[1] & ADDED) { + $file = $selected->[0]; + my $problemRecord = $self->addProblemToSet(setName => $setName, + sourceFile => $file, problemID => $freeProblemID); + $freeProblemID++; + $self->assignProblemToAllSetUsers($problemRecord); + $selected->[1] |= SUCCESS; + $addedcount++; + } + } + return($addedcount); } ############# List of sets of problems in templates directory sub get_problem_directories { - my $ce = shift; - my @all_problem_directories = get_library_sets(1, $ce->{courseDirs}->{templates}); - my $includetop = shift @all_problem_directories; - my $j; - for ($j=0; $j{courseDirs}->{templates}/?||; - } - @all_problem_directories = sort @all_problem_directories; - unshift @all_problem_directories, ' -- Top -- ' if($includetop); - return (\@all_problem_directories); + my $ce = shift; + my $lib = shift; + my $source = $ce->{courseDirs}{templates}; + my $main = MY_PROBLEMS; my $isTop = 1; + if ($lib) {$source .= "/$lib"; $main = MAIN_PROBLEMS; $isTop = 2} + my @all_problem_directories = get_library_sets($isTop, $source); + my $includetop = shift @all_problem_directories; + my $j; + for ($j=0; $j{courseDirs}->{templates}/?||; + } + @all_problem_directories = sortByName(undef, @all_problem_directories); + unshift @all_problem_directories, $main if($includetop); + return (\@all_problem_directories); } +############# Everyone has a view problems line. Abstract it +sub view_problems_line { + my $internal_name = shift; + my $label = shift; + my $r = shift; # so we can get parameter values + my $result = CGI::submit(-name=>"$internal_name", -value=>$label); + + my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()}; + my @active_modes = grep { exists $display_modes{$_} } + @{$r->ce->{pg}->{displayModes}}; + push @active_modes, 'None'; + # We have our own displayMode since its value may be None, which is illegal + # in other modules. + my $mydisplayMode = $r->param('mydisplayMode') || $r->ce->{pg}->{options}->{displayMode}; + $result .= ' Display Mode: '.CGI::popup_menu(-name=> 'mydisplayMode', + -values=>\@active_modes, + -default=> $mydisplayMode); + # Now we give a choice of the number of problems to show + my $defaultMax = $r->param('max_shown') || MAX_SHOW_DEFAULT; + $result .= ' Max. Shown: '. + CGI::popup_menu(-name=> 'max_shown', + -values=>[5,10,15,20,25,30,50,'All'], + -default=> $defaultMax); + + return($result); +} + + ### The browsing panel has three versions -##### Version 1 is local problems +##### Version 1 is local problems sub browse_local_panel { - my $self = shift; - my $library_selected = shift; - - my $list_of_prob_dirs= get_problem_directories($self->r->ce); - if(scalar(@$list_of_prob_dirs) == 0) { - $library_selected = "Found no directories containing problems"; - unshift @{$list_of_prob_dirs}, $library_selected; - } else { - my $default_value = "Select a Local Problem Collection"; - if (not $library_selected or $library_selected eq $default_value) { - unshift @{$list_of_prob_dirs}, $default_value; - $library_selected = $default_value; - } - } - - print CGI::Tr(CGI::td({-class=>"InfoPanel"}, "Local Problems: ", - CGI::popup_menu(-name=> 'library_sets', - -values=>$list_of_prob_dirs, - -default=> $library_selected), - CGI::br(), - CGI::submit(-name=>"view_local_set", -value=>"View Problems"), - )); + my $self = shift; + my $library_selected = shift; + my $lib = shift || ''; $lib =~ s/^browse_//; + my $name = ($lib eq '')? 'Local' : $problib{$lib}; + + my $list_of_prob_dirs= get_problem_directories($self->r->ce,$lib); + if(scalar(@$list_of_prob_dirs) == 0) { + $library_selected = "Found no directories containing problems"; + unshift @{$list_of_prob_dirs}, $library_selected; + } else { + my $default_value = SELECT_LOCAL_STRING; + if (not $library_selected or $library_selected eq $default_value) { + unshift @{$list_of_prob_dirs}, $default_value; + $library_selected = $default_value; + } + } + debug("library is $lib and sets are $library_selected"); + my $view_problem_line = view_problems_line('view_local_set', 'View Problems', $self->r); + print CGI::Tr({}, CGI::td({-class=>"InfoPanel", -align=>"left"}, "$name Problems: ", + CGI::popup_menu(-name=> 'library_sets', + -values=>$list_of_prob_dirs, + -default=> $library_selected), + CGI::br(), + $view_problem_line, + )); } -##### Version 2 is local problem sets +##### Version 2 is local homework sets sub browse_mysets_panel { - my $self = shift; - my $library_selected = shift; - my $list_of_local_sets = shift; - my $default_value = "Select a Problem Set"; - - if(scalar(@$list_of_local_sets) == 0) { - $list_of_local_sets = ['There are no local sets yet']; - } elsif (not $library_selected or $library_selected eq $default_value) { - unshift @{$list_of_local_sets}, $default_value; - $library_selected = $default_value; - } - - print CGI::Tr(CGI::td({-class=>"InfoPanel"}, "Browse from: ", - CGI::popup_menu(-name=> 'library_sets', - -values=>$list_of_local_sets, - -default=> $library_selected), - CGI::br(), - CGI::submit(-name=>"view_mysets_set", -value=>"View This Set"), - )); -} - -##### Version 3 is the problem library - - -# There a different levels, and you can pick a new chapter, -# pick a new section, pick all from chapter, pick all from section -# -# Incoming data - current chapter, current section + my $self = shift; + my $library_selected = shift; + my $list_of_local_sets = shift; + my $default_value = "Select a Homework Set"; + + if(scalar(@$list_of_local_sets) == 0) { + $list_of_local_sets = [NO_LOCAL_SET_STRING]; + } elsif (not $library_selected or $library_selected eq $default_value) { + unshift @{$list_of_local_sets}, $default_value; + $library_selected = $default_value; + } + + my $view_problem_line = view_problems_line('view_mysets_set', 'View Problems', $self->r); + print CGI::Tr({}, + CGI::td({-class=>"InfoPanel", -align=>"left"}, "Browse from: ", + CGI::popup_menu(-name=> 'library_sets', + -values=>$list_of_local_sets, + -default=> $library_selected), + CGI::br(), + $view_problem_line + )); +} + +##### Version 3 is the problem library +# +# This comes in 3 forms, problem library version 1, and for version 2 there +# is the basic, and the advanced interfaces. This function checks what we are +# supposed to do, or aborts if the problem library has not been installed. + sub browse_library_panel { - my $self = shift; - my $r = $self->r; - my $ce = $r->ce; - - my $libraryRoot = $r->{ce}->{webworkDirs}->{libraryRoot}; - - unless($libraryRoot) { - print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"}, - "The problem library has not been installed."))); - return; - } - # Test if the Library directory exists. If not, try to make it - unless(-d "$ce->{courseDirs}->{templates}/Library") { - unless(symlink($libraryRoot, "$ce->{courseDirs}->{templates}/Library")) { - my $msg = <<"HERE"; + my $self=shift; + my $r = $self->r; + my $ce = $r->ce; + + # See if the problem library is installed + my $libraryRoot = $r->{ce}->{problemLibrary}->{root}; + + unless($libraryRoot) { + print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"}, + "The problem library has not been installed."))); + return; + } + # Test if the Library directory link exists. If not, try to make it + unless(-d "$ce->{courseDirs}->{templates}/Library") { + unless(symlink($libraryRoot, "$ce->{courseDirs}->{templates}/Library")) { + my $msg = <<"HERE"; You are missing the directory templates/Library, which is needed -for the Problem Library to function. It should be a link pointing to +for the Problem Library to function. It should be a link pointing to $libraryRoot, which you set in conf/global.conf. -I tried to make the link for you, but that failed. Check the permissions +I tried to make the link for you, but that failed. Check the permissions in your templates directory. HERE - $self->adderrmsg($msg); - } - } - - my $default_chap = "All Chapters"; - my $default_sect = "All Sections"; - - my @chaps = WeBWorK::Utils::ListingDB::getAllChapters($r->{ce}); - unshift @chaps, $default_chap; - my $chapter_selected = $r->param('library_chapters') || $default_chap; - - my @sects=(); - if ($chapter_selected ne $default_chap) { - @sects = WeBWorK::Utils::ListingDB::getAllSections($r->{ce}, $chapter_selected); - } - - my @textbooks = ('Textbook info not ready'); - - unshift @sects, $default_sect; - my $section_selected = $r->param('library_sections') || $default_sect; - - print CGI::Tr(CGI::td({-class=>"InfoPanel"}, - CGI::start_table(), - CGI::Tr( + $self->addbadmessage($msg); + } + } + + # Now check what version we are supposed to use + my $libraryVersion = $r->{ce}->{problemLibrary}->{version} || 1; + if($libraryVersion == 1) { + return $self->browse_library_panel1; + } elsif($libraryVersion == 2) { + return $self->browse_library_panel2 if($self->{library_basic}==1); + return $self->browse_library_panel2adv; + } else { + print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"}, + "The problem library version is set to an illegal value."))); + return; + } +} + +sub browse_library_panel1 { + my $self = shift; + my $r = $self->r; + my $ce = $r->ce; + + my @chaps = WeBWorK::Utils::ListingDB::getAllChapters($r->{ce}); + unshift @chaps, LIB2_DATA->{dbchapter}{all}; + my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}->{all}; + + my @sects=(); + if ($chapter_selected ne LIB2_DATA->{dbchapter}{all}) { + @sects = WeBWorK::Utils::ListingDB::getAllSections($r->{ce}, $chapter_selected); + } + + unshift @sects, ALL_SECTIONS; + my $section_selected = $r->param('library_sections') || LIB2_DATA->{dbsection}{all}; + + my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r); + + print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, + CGI::start_table(), + CGI::Tr({}, CGI::td(["Chapter:", - CGI::popup_menu(-name=> 'library_chapters', - -values=>\@chaps, - -default=> $chapter_selected, - -onchange=>"submit();return true" - ), - CGI::submit(-name=>"lib_select_chapter", -value=>"Update Section List")])), - CGI::Tr( + CGI::popup_menu(-name=> 'library_chapters', + -values=>\@chaps, + -default=> $chapter_selected, + -onchange=>"submit();return true" + ), + CGI::submit(-name=>"lib_select_chapter", -value=>"Update Section List")])), + CGI::Tr({}, CGI::td("Section:"), CGI::td({-colspan=>2}, CGI::popup_menu(-name=> 'library_sections', - -values=>\@sects, - -default=> $section_selected - ))), - -# CGI::Tr( -# CGI::td("Textbook:"), -# CGI::td({-colspan=>2}, -# CGI::popup_menu(-name=> 'library_textbooks', -# -values=>\@textbooks, -# # -default=> $section_selected -# ))), - -# CGI::Tr( -# CGI::td("Keywords:"), -# CGI::td({-colspan=>2}, CGI::textfield(-name=>"keywords", -# -default=>"Keywords not implemented yet", -# -override=>1, -size=>60))), - CGI::Tr(CGI::td({-colspan=>3},CGI::submit(-name=>"lib_view", -value=>"View Problems"))), + -values=>\@sects, + -default=> $section_selected + ))), + + CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)), CGI::end_table(), - )); + )); } -sub make_top_row { - my $self = shift; - my $r = $self->r; - my %data = @_; - - my $list_of_local_sets = $data{all_set_defs}; - my $have_local_sets = scalar(@$list_of_local_sets); - my $browse_which = $data{browse_which}; - my $library_selected = $r->param('library_sets'); - my $set_selected = $r->param('local_sets'); - - my ($dis1, $dis2, $dis3) = ("","",""); - $dis1 = '-disabled' if($browse_which eq 'browse_library'); - $dis2 = '-disabled' if($browse_which eq 'browse_local'); - $dis3 = '-disabled' if($browse_which eq 'browse_mysets'); - - my $these_widths = "width: 27ex"; - print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"}, - CGI::submit(-name=>"browse_library", -value=>"Browse Problem Library", -style=>$these_widths, $dis1), - CGI::submit(-name=>"browse_local", -value=>"Browse Local Problems", -style=>$these_widths, $dis2), - CGI::submit(-name=>"browse_mysets", -value=>"Browse From This Course", -style=>$these_widths, $dis3), - )); - - print CGI::Tr(CGI::td({-bgcolor=>"black"})); - - if ($browse_which eq 'browse_local') { - $self->browse_local_panel($library_selected); - } elsif ($browse_which eq 'browse_mysets') { - $self->browse_mysets_panel($library_selected, $list_of_local_sets); - } else { - $self->browse_library_panel(); - } - - print CGI::Tr(CGI::td({-bgcolor=>"black"})); - - if($have_local_sets ==0) { - $list_of_local_sets = ['There are no local sets yet']; - } elsif (not $set_selected or $set_selected eq "Select a Set for This Course") { - if ($list_of_local_sets->[0] eq "Select a Problem Set") { - shift @{$list_of_local_sets}; - } - unshift @{$list_of_local_sets}, "Select a Set for This Course"; - $set_selected = "Select a Set for This Course"; - } - - print CGI::Tr(CGI::td({-class=>"InfoPanel"}, "Current Set: ", - CGI::popup_menu(-name=> 'local_sets', - -values=>$list_of_local_sets, - -default=> $set_selected), - CGI::submit(-name=>"edit_local", -value=>"Edit Current Set"), - CGI::br(), - CGI::br(), - CGI::submit(-name=>"new_local_set", -value=>"Create New Local Set:"), - " ", - CGI::textfield(-name=>"new_set_name", - -default=>"Name for new set here", - -override=>1, -size=>30), - CGI::br(), - )); - - print CGI::Tr(CGI::td({-bgcolor=>"black"})); - - print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"}, - CGI::submit(-name=>"update", -style=>$these_widths, - -value=>"Act on Marked Problems"), - CGI::submit(-name=>"rerandomize", - -style=>$these_widths, - -value=>"Rerandomize"), - CGI::submit(-name=>"cleardisplay", - -style=>$these_widths, - -value=>"Clear Problem Display"))); +sub browse_library_panel2 { + my $self = shift; + my $r = $self->r; + my $ce = $r->ce; + + my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r); + unshift @subjs, LIB2_DATA->{dbsubject}{all}; + + my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r); + unshift @chaps, LIB2_DATA->{dbchapter}{all}; + + my @sects=(); + @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r); + unshift @sects, LIB2_DATA->{dbsection}{all}; + + my $subject_selected = $r->param('library_subjects') || LIB2_DATA->{dbsubject}{all}; + my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}{all}; + my $section_selected = $r->param('library_sections') || LIB2_DATA->{dbsection}{all}; + + my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r); + + my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r); + if($count_line==0) { + $count_line = "There are no matching pg files"; + } else { + $count_line = "There are $count_line matching WeBWorK problem files"; + } + print CGI::Tr({}, + CGI::td({-class=>"InfoPanel", -align=>"left"}, + CGI::hidden(-name=>"library_is_basic", -default=>1,-override=>1), + CGI::start_table({-width=>"100%"}), + CGI::Tr({}, + CGI::td(["Subject:", + CGI::popup_menu(-name=> 'library_subjects', + -values=>\@subjs, + -default=> $subject_selected, + -onchange=>"submit();return true" + )]), + CGI::td({-colspan=>2, -align=>"right"}, + CGI::submit(-name=>"lib_select_subject", -value=>"Update Chapter/Section Lists")) + ), + CGI::Tr({}, + CGI::td(["Chapter:", + CGI::popup_menu(-name=> 'library_chapters', + -values=>\@chaps, + -default=> $chapter_selected, + -onchange=>"submit();return true" + )]), + CGI::td({-colspan=>2, -align=>"right"}, + CGI::submit(-name=>"library_advanced", -value=>"Advanced Search")) + ), + CGI::Tr({}, + CGI::td(["Section:", + CGI::popup_menu(-name=> 'library_sections', + -values=>\@sects, + -default=> $section_selected, + -onchange=>"submit();return true" + )]), + ), + CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)), + CGI::Tr(CGI::td({-colspan=>3, -align=>"center"}, $count_line)), + CGI::end_table(), + )); + } -sub make_data_row { - my $self = shift; - my $sourceFileName = shift; - my $pg = shift; - my $cnt = shift; - - $sourceFileName =~ s|^./||; # clean up top ugliness - - my $urlpath = $self->r->urlpath; - my $problem_output = $pg->{flags}->{error_flag} ? - CGI::em("This problem produced an error") - : CGI::div({class=>"RenderSolo"}, $pg->{body_text}); - - - my $edit_link = ''; - #if($self->{r}->param('browse_which') ne 'browse_library') { - if($sourceFileName !~ /^Library\//) { - $edit_link = CGI::a({href=>$self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", - courseID =>$urlpath->arg("courseID"), - setID=>"Undefined_Set", - problemID=>"1"), - params=>{sourceFilePath => "$sourceFileName"} - )}, "Edit it" ); - } - - my $try_link = CGI::a({href=>$self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", - courseID =>$urlpath->arg("courseID"), - setID=>"Undefined_Set", - problemID=>"1"), - params =>{effectiveUser => $self->r->param('user'), - editMode => "SetMaker", - sourceFilePath => "$sourceFileName"} )}, "Try it"); - - - - print CGI::Tr({-align=>"left"}, CGI::td( - - CGI::div({-style=>"background-color: #DDDDDD; margin: 0px auto"}, -CGI::span({-style=>"float:left ; text-align: left"},"File name: $sourceFileName "), -CGI::span({-style=>"float:right ; text-align: right"}, $edit_link, " ", $try_link) - ), CGI::br(), +sub browse_library_panel2adv { + my $self = shift; + my $r = $self->r; + my $ce = $r->ce; + my $right_button_style = "width: 18ex"; + + my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r); + if(! grep { $_ eq $r->param('library_subjects') } @subjs) { + $r->param('library_subjects', ''); + } + unshift @subjs, LIB2_DATA->{dbsubject}{all}; + my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r); + if(! grep { $_ eq $r->param('library_chapters') } @chaps) { + $r->param('library_chapters', ''); + } + unshift @chaps, LIB2_DATA->{dbchapter}{all}; + my @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r); + if(! grep { $_ eq $r->param('library_sections') } @sects) { + $r->param('library_sections', ''); + } + unshift @sects, LIB2_DATA->{dbsection}{all}; + my $texts = WeBWorK::Utils::ListingDB::getDBTextbooks($r); + my @textarray = map { $_->[0] } @{$texts}; + my %textlabels = (); + for my $ta (@{$texts}) { + $textlabels{$ta->[0]} = $ta->[1]." by ".$ta->[2]." (edition ".$ta->[3].")"; + } + if(! grep { $_ eq $r->param('library_textbook') } @textarray) { + $r->param('library_textbook', ''); + } + unshift @textarray, LIB2_DATA->{textbook}{all}; + my $atb = LIB2_DATA->{textbook}{all}; $textlabels{$atb} = LIB2_DATA->{textbook}{all}; + + my $textchap_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textchapter'); + my @textchaps = map { $_->[0] } @{$textchap_ref}; + if(! grep { $_ eq $r->param('library_textchapter') } @textchaps) { + $r->param('library_textchapter', ''); + } + unshift @textchaps, LIB2_DATA->{textchapter}{all}; - CGI::checkbox(-name=>"hideme$cnt",-value=>1,-label=>"Don't show me on the next update"), - CGI::br(), - CGI::checkbox(-name=>"trial$cnt",-value=>1,-label=>"Add me to the current set on the next update"), - CGI::hidden(-name=>"filetrial$cnt", -default=>[$sourceFileName]). - CGI::p($problem_output), - )); + my $textsec_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textsection'); + my @textsecs = map { $_->[0] } @{$textsec_ref}; + if(! grep { $_ eq $r->param('library_textsection') } @textsecs) { + $r->param('library_textsection', ''); + } + unshift @textsecs, LIB2_DATA->{textsection}{all}; + + my %selected = (); + for my $j (qw( dbsection dbchapter dbsubject textbook textchapter textsection )) { + $selected{$j} = $r->param(LIB2_DATA->{$j}{name}) || LIB2_DATA->{$j}{all}; + } + + my $text_popup = CGI::popup_menu(-name => 'library_textbook', + -values =>\@textarray, + -labels => \%textlabels, + -default=>$selected{textbook}, + -onchange=>"submit();return true"); + + + my $library_keywords = $r->param('library_keywords') || ''; + + my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r); + + my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r); + if($count_line==0) { + $count_line = "There are no matching pg files"; + } else { + $count_line = "There are $count_line matching WeBWorK problem files"; + } + + print CGI::Tr({}, + CGI::td({-class=>"InfoPanel", -align=>"left"}, + CGI::hidden(-name=>"library_is_basic", -default=>2,-override=>1), + CGI::start_table({-width=>"100%"}), + # Html done by hand since it is temporary + CGI::Tr(CGI::td({-colspan=>4, -align=>"center"}, 'All Selected Constraints Joined by "And"')), + CGI::Tr({}, + CGI::td(["Subject:", + CGI::popup_menu(-name=> 'library_subjects', + -values=>\@subjs, + -default=> $selected{dbsubject}, + -onchange=>"submit();return true" + )]), + CGI::td({-colspan=>2, -align=>"right"}, + CGI::submit(-name=>"lib_select_subject", -value=>"Update Menus", + -style=> $right_button_style))), + CGI::Tr({}, + CGI::td(["Chapter:", + CGI::popup_menu(-name=> 'library_chapters', + -values=>\@chaps, + -default=> $selected{dbchapter}, + -onchange=>"submit();return true" + )]), + CGI::td({-colspan=>2, -align=>"right"}, + CGI::submit(-name=>"library_reset", -value=>"Reset", + -style=>$right_button_style)) + ), + CGI::Tr({}, + CGI::td(["Section:", + CGI::popup_menu(-name=> 'library_sections', + -values=>\@sects, + -default=> $selected{dbsection}, + -onchange=>"submit();return true" + )]), + CGI::td({-colspan=>2, -align=>"right"}, + CGI::submit(-name=>"library_basic", -value=>"Basic Search", + -style=>$right_button_style)) + ), + CGI::Tr({}, + CGI::td(["Textbook:", $text_popup]), + ), + CGI::Tr({}, + CGI::td(["Text chapter:", + CGI::popup_menu(-name=> 'library_textchapter', + -values=>\@textchaps, + -default=> $selected{textchapter}, + -onchange=>"submit();return true" + )]), + ), + CGI::Tr({}, + CGI::td(["Text section:", + CGI::popup_menu(-name=> 'library_textsection', + -values=>\@textsecs, + -default=> $selected{textsection}, + -onchange=>"submit();return true" + )]), + ), + CGI::Tr({}, + CGI::td("Keywords:"),CGI::td({-colspan=>2}, + CGI::textfield(-name=>"library_keywords", + -default=>$library_keywords, + -override=>1, + -size=>40))), + CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)), + CGI::Tr(CGI::td({-colspan=>3, -align=>"center"}, $count_line)), + CGI::end_table(), + )); + } +##### Version 4 is the set definition file panel + +sub browse_setdef_panel { + my $self = shift; + my $r = $self->r; + my $ce = $r->ce; + my $library_selected = shift; + my $default_value = "Select a Set Definition File"; + # in the following line, the parens after sort are important. if they are + # omitted, sort will interpret get_set_defs as the name of the comparison + # function, and ($ce->{courseDirs}{templates}) as a single element list to + # be sorted. *barf* + my @list_of_set_defs = sort(get_set_defs($ce->{courseDirs}{templates})); + if(scalar(@list_of_set_defs) == 0) { + @list_of_set_defs = (NO_LOCAL_SET_STRING); + } elsif (not $library_selected or $library_selected eq $default_value) { + unshift @list_of_set_defs, $default_value; + $library_selected = $default_value; + } + my $view_problem_line = view_problems_line('view_setdef_set', 'View Problems', $self->r); + my $popupetc = CGI::popup_menu(-name=> 'library_sets', + -values=>\@list_of_set_defs, + -default=> $library_selected). + CGI::br(). $view_problem_line; + if($list_of_set_defs[0] eq NO_LOCAL_SET_STRING) { + $popupetc = "there are no set definition files in this course to look at." + } + print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Browse from: ", + $popupetc + )); +} + +sub make_top_row { + my $self = shift; + my $r = $self->r; + my $ce = $r->ce; + my %data = @_; + + my $list_of_local_sets = $data{all_db_sets}; + my $have_local_sets = scalar(@$list_of_local_sets); + my $browse_which = $data{browse_which}; + 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'); + @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'); + + ## Make buttons for additional problem libraries + my $libs = ''; + foreach my $lib (sort(keys(%problib))) { + $libs .= ' '. CGI::submit(-name=>"browse_$lib", -value=>$problib{$lib}, + ($browse_which eq "browse_$lib")? (-disabled=>1): ()) + if (-d "$ce->{courseDirs}{templates}/$lib"); + } + $libs = CGI::br()."or Problems from".$libs if $libs ne ''; + + my $these_widths = "width: 23ex"; + + if($have_local_sets ==0) { + $list_of_local_sets = [NO_LOCAL_SET_STRING]; + } elsif (not defined($set_selected) or $set_selected eq "" + or $set_selected eq SELECT_SET_STRING) { + unshift @{$list_of_local_sets}, SELECT_SET_STRING; + $set_selected = SELECT_SET_STRING; + } + my $myjs = 'document.mainform.selfassign.value=confirm("Should I assign the new set to you now?\nUse OK for yes and Cancel for no.");true;'; + + print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Add problems to ", + CGI::b("Target Set: "), + CGI::popup_menu(-name=> 'local_sets', + -values=>$list_of_local_sets, + -default=> $set_selected, + -override=>1), + CGI::submit(-name=>"edit_local", -value=>"Edit Target Set"), + CGI::hidden(-name=>"selfassign", -default=>0,-override=>1). + CGI::br(), + CGI::br(), + CGI::submit(-name=>"new_local_set", -value=>"Create a New Set in This Course:", + -onclick=>$myjs + ), + " ", + CGI::textfield(-name=>"new_set_name", + -default=>"Name for new set here", + -override=>1, -size=>30), + )); + + print CGI::Tr(CGI::td({-bgcolor=>"black"})); + + # Tidy this list up since it is used in two different places + if ($list_of_local_sets->[0] eq SELECT_SET_STRING) { + shift @{$list_of_local_sets}; + } + + print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"}, + "Browse ", + CGI::submit(-name=>"browse_library", -value=>"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), + $libs, + )); + + #print CGI::Tr(CGI::td({-bgcolor=>"black"})); + print CGI::hr(); + + if ($browse_which eq 'browse_local') { + $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') { + $self->browse_library_panel(); + } elsif ($browse_which eq 'browse_setdefs') { + $self->browse_setdef_panel($library_selected); + } else { ## handle other problem libraries + $self->browse_local_panel($library_selected,$browse_which); + } + + print CGI::Tr(CGI::td({-bgcolor=>"black"})); + + print CGI::Tr({}, + CGI::td({-class=>"InfoPanel", -align=>"center"}, + CGI::start_table({-border=>"0"}), + CGI::Tr({}, CGI::td({ -align=>"center"}, + CGI::submit(-name=>"select_all", -style=>$these_widths, + -value=>"Mark All For Adding"), + CGI::submit(-name=>"select_none", -style=>$these_widths, + -value=>"Clear All Marks"), + )), + CGI::Tr({}, + CGI::td({}, + CGI::submit(-name=>"update", -style=>$these_widths. "; font-weight:bold", + -value=>"Update Set"), + CGI::submit(-name=>"rerandomize", + -style=>$these_widths, + -value=>"Rerandomize"), + CGI::submit(-name=>"cleardisplay", + -style=>$these_widths, + -value=>"Clear Problem Display") + )), + CGI::end_table())); +} + +sub make_data_row { + my $self = shift; + my $sourceFileName = shift; + my $pg = shift; + my $cnt = shift; + my $mark = shift || 0; + + $sourceFileName =~ s|^./||; # clean up top ugliness + + my $urlpath = $self->r->urlpath; + my $problem_output = $pg->{flags}->{error_flag} ? + CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error")) + : CGI::div({class=>"RenderSolo"}, $pg->{body_text}); + $problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment}); + + + #if($self->{r}->param('browse_which') ne 'browse_library') { + my $problem_seed = $self->{'problem_seed'} || 1234; + my $edit_link = CGI::a({href=>$self->systemLink( + $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", + courseID =>$urlpath->arg("courseID"), + setID=>"Undefined_Set", + problemID=>"1"), + params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed} + ), target=>"WW_Editor"}, "Edit it" ); + + my $displayMode = $self->r->param("mydisplayMode"); + $displayMode = $self->r->ce->{pg}->{options}->{displayMode} + if not defined $displayMode or $displayMode eq "None"; + my $try_link = CGI::a({href=>$self->systemLink( + $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", + courseID =>$urlpath->arg("courseID"), + setID=>"Undefined_Set", + problemID=>"1"), + params =>{ + effectiveUser => scalar($self->r->param('user')), + editMode => "SetMaker", + problemSeed=> $problem_seed, + sourceFilePath => "$sourceFileName", + displayMode => $displayMode, + } + ), target=>"WW_View"}, "Try it"); + + my %add_box_data = ( -name=>"trial$cnt",-value=>1,-label=>"Add this problem to the target set on the next update"); + if($mark & SUCCESS) { + $add_box_data{ -label } .= " (just added this problem)"; + } elsif($mark & ADDED) { + $add_box_data{ -checked } = 1; + } + + my $inSet = ($self->{isInSet}{$sourceFileName})? + CGI::span({-style=>"float:right; text-align: right"}, + CGI::i(CGI::b("(This problem is in the target set)"))) : ""; + + print CGI::Tr({-align=>"left"}, CGI::td( + CGI::div({-style=>"background-color: #DDDDDD; margin: 0px auto"}, + CGI::span({-style=>"float:left ; text-align: left"},"File name: $sourceFileName "), + CGI::span({-style=>"float:right ; text-align: right"}, $edit_link, " ", $try_link) + ), CGI::br(), + CGI::checkbox(-name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1), + CGI::br(), + $inSet, + CGI::checkbox((%add_box_data),-override=>1), + CGI::hidden(-name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1). + CGI::p($problem_output), + )); +} + +sub clear_default { + my $r = shift; + my $param = shift; + my $default = shift; + my $newvalue = $r->param($param) || ''; + $newvalue = '' if($newvalue eq $default); + $r->param($param, $newvalue); +} + sub pre_header_initialize { - my ($self) = @_; - my $r = $self->r; - ## For all cases, lets set some things - $self->{error}=0; - my $ce = $r->ce; - my $db = $r->db; - - - my $userName = $r->param('user'); - my $user = $db->getUser($userName); # checked - die "record for user $userName (real user) does not exist." - unless defined $user; - my $authz = $r->authz; - unless ($authz->hasPermissions($userName, "modify_problem_sets")) { - return(""); # Error message already produced in the body - } - - ## Now one action we have to deal with here - if ($r->param('edit_local')) { - my $urlpath = $r->urlpath; - my $db = $r->db; - my $checkset = $db->getGlobalSet($r->param('local_sets')); - if (not defined($checkset)) { - $self->{error} = 1; - $self->adderrmsg('You need to select a "Current Set" before you can edit it.'); - } else { - my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetEditor', setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID")); - my $url = $self->systemLink($page); - $self->reply_with_redirect($url); - } - } - - ## Next, lots of set up so that errors can be reported with message() - - ############# List of problems we have already printed - - $self->{past_problems} = get_past_problem_files($r); - my $none_shown = scalar(@{$self->{past_problems}})==0; - my @pg_files=(); - my $use_previous_problems = 1; - my $first_shown = $r->param('first_shown') || 0; - my $last_shown = $r->param('last_shown'); - if (not defined($last_shown)) { - $last_shown = -1; - } - my @all_past_list = (); # these are include requested, but not shown - my $j = 0; - while (defined($r->param("all_past_list$j"))) { - push @all_past_list, $r->param("all_past_list$j"); - $j++; - } - - ############# Default of which problem selector to display - - my $browse_which = $r->param('browse_which') || 'browse_local'; - - my $problem_seed = $r->param('problem_seed') || 0; - $r->param('problem_seed', $problem_seed); # if it wasn't defined before - - ########### Start the logic through if elsif elsif ... - - ##### Asked to browse certain problems - if ($r->param('browse_library')) { - $browse_which = 'browse_library'; - $r->param('library_sets', ""); - } elsif ($r->param('browse_local')) { - $browse_which = 'browse_local'; - $r->param('library_sets', ""); - } elsif ($r->param('browse_mysets')) { - $browse_which = 'browse_mysets'; - $r->param('library_sets', ""); - - ##### Change the seed value - - } elsif ($r->param('rerandomize')) { - $problem_seed++; - $r->param('problem_seed', $problem_seed); - $self->adderrmsg('Changing the problem seed for display, but there are no problems showing.') if $none_shown; - - ##### Clear the display - - } elsif ($r->param('cleardisplay')) { - @pg_files = (); - $use_previous_problems=0; - $self->adderrmsg('The display was already cleared.') if $none_shown; - - ##### View problems selected from the local list - - } elsif ($r->param('view_local_set')) { - - my $set_to_display = $r->param('library_sets'); - if (not defined($set_to_display) or $set_to_display eq "Select a Local Problem Collection" or $set_to_display eq "Found no directories containing problems") { - $self->adderrmsg('You need to select a set to view.'); - } else { - $set_to_display = '.' if $set_to_display eq ' -- Top -- '; - @pg_files = list_pg_files($ce->{courseDirs}->{templates}, + my ($self) = @_; + my $r = $self->r; + ## For all cases, lets set some things + $self->{error}=0; + my $ce = $r->ce; + my $db = $r->db; + my $maxShown = $r->param('max_shown') || MAX_SHOW_DEFAULT; + $maxShown = 10000000 if($maxShown eq 'All'); # let's hope there aren't more + my $library_basic = $r->param('library_is_basic') || 1; + $self->{problem_seed} = $r->param('problem_seed') || 1234; + ## Fix some parameters + for my $key (keys(%{ LIB2_DATA() })) { + clear_default($r, LIB2_DATA->{$key}->{name}, LIB2_DATA->{$key}->{all} ); + } + ## Grab library sets to display from parameters list. We will modify this + ## as we go through the if/else tree + $self->{current_library_set} = $r->param('library_sets'); + + ## These directories will have individual buttons + %problib = %{$ce->{courseFiles}{problibs}} if $ce->{courseFiles}{problibs}; + + my $userName = $r->param('user'); + my $user = $db->getUser($userName); # checked + die "record for user $userName (real user) does not exist." + unless defined $user; + my $authz = $r->authz; + unless ($authz->hasPermissions($userName, "modify_problem_sets")) { + return(""); # Error message already produced in the body + } + + ## Now one action we have to deal with here + if ($r->param('edit_local')) { + my $urlpath = $r->urlpath; + my $db = $r->db; + my $checkset = $db->getGlobalSet($r->param('local_sets')); + if (not defined($checkset)) { + $self->{error} = 1; + $self->addbadmessage('You need to select a "Target Set" before you can edit it.'); + } else { + my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetDetail', setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID")); + my $url = $self->systemLink($page); + $self->reply_with_redirect($url); + } + } + + ## Next, lots of set up so that errors can be reported with message() + + ############# List of problems we have already printed + + $self->{past_problems} = get_past_problem_files($r); + # if we don't end up reusing problems, this will be wiped out + # if we do redisplay the same problems, we must adjust this accordingly + my @past_marks = map {$_->[1]} @{$self->{past_problems}}; + my $none_shown = scalar(@{$self->{past_problems}})==0; + my @pg_files=(); + my $use_previous_problems = 1; + my $first_shown = $r->param('first_shown') || 0; + my $last_shown = $r->param('last_shown'); + if (not defined($last_shown)) { + $last_shown = -1; + } + my @all_past_list = (); # these are include requested, but not shown + my $j = 0; + while (defined($r->param("all_past_list$j"))) { + push @all_past_list, $r->param("all_past_list$j"); + $j++; + } + + ############# Default of which problem selector to display + + my $browse_which = $r->param('browse_which') || 'browse_local'; + + + + ## check for problem lib buttons + my $browse_lib = ''; + foreach my $lib (keys %problib) { + if ($r->param("browse_$lib")) { + $browse_lib = "browse_$lib"; + last; + } + } + + ########### Start the logic through if elsif elsif ... + debug("browse_lib", $r->param("$browse_lib")); + debug("browse_library", $r->param("browse_library")); + debug("browse_mysets", $r->param("browse_mysets")); + debug("browse_setdefs", $r->param("browse_setdefs")); + ##### Asked to browse certain problems + if ($browse_lib ne '') { + $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'; + $self->{current_library_set} = ""; + $use_previous_problems = 0; @pg_files = (); ## clear old problems + } elsif ($r->param('browse_local')) { + $browse_which = 'browse_local'; + #$self->{current_library_set} = ""; + $use_previous_problems = 0; @pg_files = (); ## clear old problems + } elsif ($r->param('browse_mysets')) { + $browse_which = 'browse_mysets'; + $self->{current_library_set} = ""; + $use_previous_problems = 0; @pg_files = (); ## clear old problems + } elsif ($r->param('browse_setdefs')) { + $browse_which = 'browse_setdefs'; + $self->{current_library_set} = ""; + $use_previous_problems = 0; @pg_files = (); ## clear old problems + + ##### Change the seed value + + } elsif ($r->param('rerandomize')) { + $self->{problem_seed}= 1+$self->{problem_seed}; + #$r->param('problem_seed', $problem_seed); + $self->addbadmessage('Changing the problem seed for display, but there are no problems showing.') if $none_shown; + + ##### Clear the display + + } elsif ($r->param('cleardisplay')) { + @pg_files = (); + $use_previous_problems=0; + $self->addbadmessage('The display was already cleared.') if $none_shown; + + ##### View problems selected from the local list + + } elsif ($r->param('view_local_set')) { + + my $set_to_display = $self->{current_library_set}; + if (not defined($set_to_display) or $set_to_display eq SELECT_LOCAL_STRING or $set_to_display eq "Found no directories containing problems") { + $self->addbadmessage('You need to select a set to view.'); + } else { + $set_to_display = '.' if $set_to_display eq MY_PROBLEMS; + $set_to_display = substr($browse_which,7) if $set_to_display eq MAIN_PROBLEMS; + @pg_files = list_pg_files($ce->{courseDirs}->{templates}, "$set_to_display"); - $use_previous_problems=0; - } + $use_previous_problems=0; + } - ##### View problems selected from the a set in this course + ##### View problems selected from the a set in this course - } elsif ($r->param('view_mysets_set')) { + } elsif ($r->param('view_mysets_set')) { - my $set_to_display = $r->param('library_sets'); - if (not defined($set_to_display) - or $set_to_display eq "Select a Problem Set" - or $set_to_display eq 'There are no local sets yet') { - $self->adderrmsg("You need to select a set from this course to view."); - } else { - my @problemList = $db->listGlobalProblems($set_to_display); - my $problem; - @pg_files=(); - for $problem (@problemList) { - my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked - die "global $problem for set $set_to_display not found." unless - $problemRecord; - push @pg_files, $problemRecord->source_file; - - } - $use_previous_problems=0; - } + my $set_to_display = $self->{current_library_set}; + debug("set_to_display is $set_to_display"); + if (not defined($set_to_display) + or $set_to_display eq "Select a Homework Set" + or $set_to_display eq NO_LOCAL_SET_STRING) { + $self->addbadmessage("You need to select a set from this course to view."); + } else { + # DBFIXME don't use ID list, use an iterator + my @problemList = $db->listGlobalProblems($set_to_display); + my $problem; + @pg_files=(); + for $problem (@problemList) { + my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked + die "global $problem for set $set_to_display not found." unless + $problemRecord; + push @pg_files, $problemRecord->source_file; + + } + @pg_files = sortByName(undef,@pg_files); + $use_previous_problems=0; + } - ##### View whole chapter from the library - ## This will change somewhat later + ##### View from the library database - } elsif ($r->param('lib_view')) { + } elsif ($r->param('lib_view')) { - @pg_files=(); - my $chap = $r->param('library_chapters') || ""; - $chap = "" if($chap eq "All Chapters"); - my $sect = $r->param('library_sections') || ""; - $sect = "" if($sect eq "All Sections"); - my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r->{ce}, "$chap", "$sect"); - my ($result, $tolibpath); - for $result (@dbsearch) { - $tolibpath = "Library/$result->{path}/$result->{filename}"; - - ## Too clunky!!!! - push @pg_files, $tolibpath; - } - $use_previous_problems=0; - - ##### Edit the current local problem set - - } elsif ($r->param('edit_local')) { ## Jump to set edit page - - ; # already handled - - - ##### Make a new local problem set - - } elsif ($r->param('new_local_set')) { - if ($r->param('new_set_name') !~ /^[\w.-]*$/) { - $self->adderrmsg("The name ".$r->param('new_set_name')." is not a valid set name. Use only letters, digits, -, _, and ."); - } else { - my $newSetName = $r->param('new_set_name'); - $newSetName =~ s/^set//; - $newSetName =~ s/\.def$//; - $r->param('local_sets',$newSetName); - my $newSetRecord = $db->getGlobalSet($newSetName); - if (defined($newSetRecord)) { - $self->adderrmsg("The set name $newSetName is already in use. Pick a different name if you would like to start a new set."); - } else { # Do it! - $newSetRecord = $db->{set}->{record}->new(); - $newSetRecord->set_id($newSetName); - $newSetRecord->set_header(""); - $newSetRecord->problem_header(""); - $newSetRecord->open_date(time()+60*60*24*7); # in one week - $newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks - $newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks - eval {$db->addGlobalSet($newSetRecord)}; - } - } - - ##### Add selected problems to the current local set - - } elsif ($r->param('update')) { - ## first handle problems to be added before we hide them - my($localSet, @selected); - - @pg_files = grep {($_->[1] & ADDED) != 0 } @{$self->{past_problems}}; - @selected = map {$_->[0]} @pg_files; - - my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}}; - if(scalar(@action_files) == 0) { - $self->adderrmsg('Act on marked problems requested, but no problems were marked.'); - } - - if (scalar(@selected)>0) { # if some are to be added, they need a place to go - $localSet = $r->param('local_sets'); - if (not defined($localSet)) { - $self->adderrmsg('You are trying to add problems to something, but you did not select a "Current Set" name as a target.'); - } else { - my $newSetRecord = $db->getGlobalSet($localSet); - if (not defined($newSetRecord)) { - $self->adderrmsg("You are trying to add problems to $localSet, but that set does not seem to exist! I bet you used your \"Back\" button."); + @pg_files=(); + my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r); + my ($result, $tolibpath); + for $result (@dbsearch) { + $tolibpath = "Library/$result->{path}/$result->{filename}"; + + ## Too clunky!!!! + push @pg_files, $tolibpath; + } + $use_previous_problems=0; + + ##### View a set from a set*.def + + } elsif ($r->param('view_setdef_set')) { + + my $set_to_display = $self->{current_library_set}; + debug("set_to_display is $set_to_display"); + if (not defined($set_to_display) + or $set_to_display eq "Select a Set Definition File" + or $set_to_display eq NO_LOCAL_SET_STRING) { + $self->addbadmessage("You need to select a set definition file to view."); + } else { + @pg_files= $self->read_set_def($set_to_display); + } + $use_previous_problems=0; + + ##### Edit the current local homework set + + } elsif ($r->param('edit_local')) { ## Jump to set edit page + + ; # already handled + + + ##### Make a new local homework set + + } elsif ($r->param('new_local_set')) { + if ($r->param('new_set_name') !~ /^[\w .-]*$/) { + $self->addbadmessage("The name ".$r->param('new_set_name')." is not a valid set name. Use only letters, digits, -, _, and ."); + } else { + my $newSetName = $r->param('new_set_name'); + # if we want to munge the input set name, do it here + $newSetName =~ s/\s/_/g; + debug("local_sets was ", $r->param('local_sets')); + $r->param('local_sets',$newSetName); ## use of two parameter param + debug("new value of local_sets is ", $r->param('local_sets')); + my $newSetRecord = $db->getGlobalSet($newSetName); + if (defined($newSetRecord)) { + $self->addbadmessage("The set name $newSetName is already in use. + Pick a different name if you would like to start a new set."); + } else { # Do it! + # DBFIXME use $db->newGlobalSet + $newSetRecord = $db->{set}->{record}->new(); + $newSetRecord->set_id($newSetName); + $newSetRecord->set_header(""); + $newSetRecord->hardcopy_header(""); + $newSetRecord->open_date(time()+60*60*24*7); # in one week + $newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks + $newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks + eval {$db->addGlobalSet($newSetRecord)}; + if ($@) { + $self->addbadmessage("Problem creating set $newSetName
$@"); + } else { + $self->addgoodmessage("Set $newSetName has been created."); + my $selfassign = $r->param('selfassign') || ""; + $selfassign = "" if($selfassign =~ /false/i); # deal with javascript false + if($selfassign) { + $self->assignSetToUser($userName, $newSetRecord); + $self->addgoodmessage("Set $newSetName was assigned to $userName."); + } + } + } + } + + ##### Add selected problems to the current local set + + } elsif ($r->param('update')) { + ## first handle problems to be added before we hide them + my($localSet, @selected); + + @pg_files = grep {($_->[1] & ADDED) != 0 } @{$self->{past_problems}}; + @selected = map {$_->[0]} @pg_files; + + my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}}; + # There are now good reasons to do an update without selecting anything. + #if(scalar(@action_files) == 0) { + # $self->addbadmessage('Update requested, but no problems were marked.'); + #} + + if (scalar(@selected)>0) { # if some are to be added, they need a place to go + $localSet = $r->param('local_sets'); + if (not defined($localSet) or + $localSet eq SELECT_SET_STRING or + $localSet eq NO_LOCAL_SET_STRING) { + $self->addbadmessage('You are trying to add problems to something, + but you did not select a "Target Set" name as a target.'); + } else { + my $newSetRecord = $db->getGlobalSet($localSet); + if (not defined($newSetRecord)) { + $self->addbadmessage("You are trying to add problems to $localSet, + but that set does not seem to exist! I bet you used your \"Back\" button."); + } else { + my $addcount = add_selected($self, $db, $localSet); + if($addcount > 0) { + $self->addgoodmessage("Added $addcount problem".(($addcount>1)?'s':''). + " to $localSet."); + } + } + } + } + ## now handle problems to be hidden + + ## only keep the ones which are not hidden + @pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}}; + @past_marks = map {$_->[1]} @pg_files; + @pg_files = map {$_->[0]} @pg_files; + @all_past_list = (@all_past_list[0..($first_shown-1)], + @pg_files, + @all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]); + $last_shown = $first_shown+$maxShown -1; debug("last_shown 3: ", $last_shown); + $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 4: ", $last_shown); + + } elsif ($r->param('next_page')) { + $first_shown = $last_shown+1; + $last_shown = $first_shown+$maxShown-1; debug("last_shown 5: ", $last_shown); + $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 6: ", $last_shown); + @past_marks = (); + } elsif ($r->param('prev_page')) { + $last_shown = $first_shown-1; + $first_shown = $last_shown - $maxShown+1; + + $first_shown = 0 if($first_shown<0); + @past_marks = (); + + } elsif ($r->param('select_all')) { + @past_marks = map {1} @past_marks; + } elsif ($r->param('library_basic')) { + $library_basic = 1; + for my $jj (qw(textchapter textsection textbook)) { + $r->param('library_'.$jj,''); + } + } elsif ($r->param('library_advanced')) { + $library_basic = 2; + } elsif ($r->param('library_reset')) { + for my $jj (qw(chapters sections subjects textbook keywords)) { + $r->param('library_'.$jj,''); + } + } elsif ($r->param('select_none')) { + @past_marks = (); } else { - my $addcount = add_selected($self, $db, $localSet); - if($addcount > 0) { - $self->adderrmsg("Successfully added $addcount problem".(($addcount>1)?'s':''). - " to $localSet."); - } - } - } - } - ## now handle problems to be hidden - - ## only keep the ones which are not hidden - @pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}}; - @pg_files = map {$_->[0]} @pg_files; - @all_past_list = (@all_past_list[0..($first_shown-1)], - @pg_files, - @all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]); - $last_shown = $first_shown+MAX_SHOW -1; - $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); - - ## FIXME: you should say something if no problems are selected - ## maybe the add button should be disabled if there are no problems - ## showing - - - } elsif ($r->param('next_page')) { - $first_shown = $last_shown+1; - $last_shown = $first_shown+MAX_SHOW-1; - $last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); - } elsif ($r->param('prev_page')) { - $last_shown = $first_shown-1; - $first_shown = $last_shown - MAX_SHOW+1; - - $first_shown = 0 if($first_shown<0); - - ##### No action requested, probably our first time here - - } else { - #my $c = $r->connection; - #print "Debug info: ". $r->get_remote_host ."

". $c->remote_ip ; - ; - } ##### end of the if elsif ... - - - ############# List of local sets - - my @all_set_defs = $db->listGlobalSets; - for ($j=0; $j{first_shown} = $first_shown; - $self->{last_shown} = $last_shown; - $self->{browse_which} = $browse_which; - $self->{problem_seed} = $problem_seed; - $self->{pg_files} = \@pg_files; - $self->{all_set_defs} = \@all_set_defs; + ##### No action requested, probably our first time here + } ##### end of the if elsif ... + + ############# List of local sets + + # DBFIXME sorting in database, please! + my @all_db_sets = $db->listGlobalSets; + @all_db_sets = sortByName(undef, @all_db_sets); + + if ($use_previous_problems) { + @pg_files = @all_past_list; + } else { + $first_shown = 0; + $last_shown = scalar(@pg_files)<$maxShown ? scalar(@pg_files) : $maxShown; + $last_shown--; # to make it an array index + @past_marks = (); + } + ############# Now store data in self for retreival by body + $self->{first_shown} = $first_shown; + $self->{last_shown} = $last_shown; + $self->{browse_which} = $browse_which; + #$self->{problem_seed} = $problem_seed; + $self->{pg_files} = \@pg_files; + $self->{past_marks} = \@past_marks; + $self->{all_db_sets} = \@all_db_sets; + $self->{library_basic} = $library_basic; + debug("past_marks is ", join(" ", @{$self->{past_marks}})); } sub title { - return "Problem Set Maker"; + return "Library Browser"; +} + +# hide view options panel since it distracts from SetMaker's built-in view options +sub options { + return ""; } sub body { - my ($self) = @_; + my ($self) = @_; - my $r = $self->r; - my $ce = $r->ce; # course environment - my $db = $r->db; # database - my $j; # garden variety counter - - my $userName = $r->param('user'); - - my $user = $db->getUser($userName); # checked - die "record for user $userName (real user) does not exist." - unless defined $user; - - ### Check that this is a professor - my $authz = $r->authz; - unless ($authz->hasPermissions($userName, "modify_problem_sets")) { - print "User $userName returned " . - $authz->hasPermissions($user, "modify_problem_sets") . + my $r = $self->r; + my $ce = $r->ce; # course environment + my $db = $r->db; # database + my $j; # garden variety counter + + my $userName = $r->param('user'); + + my $user = $db->getUser($userName); # checked + die "record for user $userName (real user) does not exist." + unless defined $user; + + ### Check that this is a professor + my $authz = $r->authz; + unless ($authz->hasPermissions($userName, "modify_problem_sets")) { + print "User $userName returned " . + $authz->hasPermissions($user, "modify_problem_sets") . " for permission"; - return(CGI::div({class=>'ResultsWithError'}, - CGI::em("You are not authorized to access the Instructor tools."))); - } - - ########## Extract information computed in pre_header_initialize - - my $first_shown = $self->{first_shown}; - my $last_shown = $self->{last_shown}; - my $browse_which = $self->{browse_which}; - my $problem_seed = $self->{problem_seed}; - my @pg_files = @{$self->{pg_files}}; - my @all_set_defs = @{$self->{all_set_defs}}; - - my @pg_html=($last_shown>=$first_shown) ? - renderProblems($r,$user, @pg_files[$first_shown..$last_shown]) : (); - - ########## Top part - print CGI::startform({-method=>"POST", -action=>$r->uri}), - $self->hidden_authen_fields, - '

', - CGI::start_table({-border=>2}); - $self->make_top_row('all_set_defs'=>\@all_set_defs, - 'browse_which'=> $browse_which); - print CGI::hidden(-name=>'browse_which', -default=>[$browse_which]), - CGI::hidden(-name=>'problem_seed', -default=>[$problem_seed]); - for ($j = 0 ; $j < scalar(@pg_files) ; $j++) { - print CGI::hidden(-name=>"all_past_list$j", -default=>$pg_files[$j]); - } - - print CGI::hidden(-name=>'first_shown', -default=>[$first_shown]); - print CGI::hidden(-name=>'last_shown', -default=>[$last_shown]); - - - ########## Now print problems - my $jj; - for ($jj=0; $jj{courseDirs}->{templates}/?||; - $self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1); - } - - ########## Finish things off - print CGI::end_table(); - print '
'; - # if($first_shown>0 or (1+$last_shown) 0) { - $prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex", - -value=>"Previous page"); - } - if ((1+$last_shown)"next_page", -style=>"width:15ex", - -value=>"Next page"); - } - if (scalar(@pg_files)>0) { - print CGI::p(($first_shown+1)."-".($last_shown+1)." of ".scalar(@pg_files). - " shown.", $prev_button, " ", $next_button); - } - # } - print CGI::endform(), "\n"; + return(CGI::div({class=>'ResultsWithError'}, + CGI::em("You are not authorized to access the Instructor tools."))); + } - return ""; -} + ########## Extract information computed in pre_header_initialize -############################################## End of Body + my $first_shown = $self->{first_shown}; + my $last_shown = $self->{last_shown}; + my $browse_which = $self->{browse_which}; + my $problem_seed = $self->{problem_seed}||1234; + my @pg_files = @{$self->{pg_files}}; + my @all_db_sets = @{$self->{all_db_sets}}; + + my @pg_html=($last_shown>=$first_shown) ? + renderProblems(r=> $r, + user => $user, + problem_list => [@pg_files[$first_shown..$last_shown]], + displayMode => $r->param('mydisplayMode')) : (); + + my %isInSet; + my $setName = $r->param("local_sets"); + if ($setName) { + # DBFIXME where clause, iterator + # DBFIXME maybe instead of hashing here, query when checking source files? + # DBFIXME definitely don't need to be making full record objects + # DBFIXME SELECT source_file FROM whatever_problem WHERE set_id=? GROUP BY source_file ORDER BY NULL; + # DBFIXME (and stick result directly into hash) + foreach my $problem ($db->listGlobalProblems($setName)) { + my $problemRecord = $db->getGlobalProblem($setName, $problem); + $isInSet{$problemRecord->source_file} = 1; + } + } + $self->{isInSet} = \%isInSet; -# SKEL: To emit your own HTTP header, uncomment this: -# -#sub header { -# my ($self) = @_; -# -# # Generate your HTTP header here. -# -# # If you return something, it will be used as the HTTP status code for this -# # request. The Apache::Constants module might be useful for gerating status -# # codes. If you don't return anything, the status code "OK" will be used. -# return ""; -#} - -# SKEL: If you need to do any processing after the HTTP header is sent, but before -# any template processing occurs, or you need to calculate values that will be -# used in multiple methods, do it in this method: -# -#sub initialize { -#my ($self) = @_; -#} + ########## Top part + print CGI::start_form({-method=>"POST", -action=>$r->uri, -name=>'mainform'}), + $self->hidden_authen_fields, + '
', + CGI::start_table({-border=>2}); + $self->make_top_row('all_db_sets'=>\@all_db_sets, + 'browse_which'=> $browse_which); + print CGI::hidden(-name=>'browse_which', -value=>$browse_which,-override=>1), + CGI::hidden(-name=>'problem_seed', -value=>$problem_seed, -override=>1); + for ($j = 0 ; $j < scalar(@pg_files) ; $j++) { + print CGI::hidden(-name=>"all_past_list$j", -value=>$pg_files[$j],-override=>1); + } -# SKEL: If you need to add tags to the document , uncomment this method: -# -#sub head { -# my ($self) = @_; -# -# # You can print head tags here, like ,