--- loncom/homework/structuretags.pm 2003/06/23 19:55:18 1.189 +++ loncom/homework/structuretags.pm 2003/07/07 07:32:16 1.193 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.189 2003/06/23 19:55:18 sakharuk Exp $ +# $Id: structuretags.pm,v 1.193 2003/07/07 07:32:16 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,8 @@ use Apache::File(); use Apache::lonmenu; BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', +'simpleeditbutton')); } sub start_web { @@ -149,11 +150,8 @@ sub setup_rndseed { } if ($ENV{'form.resetdata'} eq 'New Problem Variation' || $ENV{'form.newrandomization'} eq 'New Randomization') { - $rndseed=time; - if ($rndseed eq $ENV{'form.rndseed'}) { - srand($rndseed); - $rndseed=int(rand(1000000000)); - } + srand(time); + $rndseed=int(rand(2100000000)); $ENV{'form.rndseed'}=$rndseed; delete($ENV{'form.resetdata'}); delete($ENV{'form.newrandomization'}); @@ -409,7 +407,7 @@ sub start_problem { } } elsif ($target eq 'tex') { my $startminipage = ''; - if ($ENV{'form.problem_split'} ne 'yes') { + if (not $ENV{'form.problem_split'}=~/yes/) { $startminipage = '\begin{minipage}{\textwidth}'; } my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); @@ -516,7 +514,7 @@ sub end_problem { $result.=&Apache::lonxml::xmlend(); } elsif ($target eq 'tex') { my $endminipage = ''; - if ($ENV{'form.problem_split'} ne 'yes') { + if (not $ENV{'form.problem_split'}=~/yes/) { $endminipage = '\end{minipage}'; } $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; @@ -1085,5 +1083,21 @@ sub delete_startouttext { return 1; } +sub start_simpleeditbutton { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + if (($target eq 'web') && + (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { + my $url=$ENV{'REQUEST_URI'}; + $url=~s/\?.*$//; + $result='Edit
'; + } + return $result; +} + +sub end_simpleeditbutton { + return ''; +} + 1; __END__