version 1.372, 2006/12/11 01:07:07
|
version 1.434, 2008/11/10 11:44:54
|
Line 36 use Apache::File();
|
Line 36 use Apache::File();
|
use Apache::lonmenu; |
use Apache::lonmenu; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonxml; |
use Apache::lonxml; |
|
use Apache::londefdef; |
use Apache::lonenc(); |
use Apache::lonenc(); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use lib '/home/httpd/lib/perl/'; |
use lib '/home/httpd/lib/perl/'; |
use LONCAPA; |
use LONCAPA; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); |
} |
} |
|
|
sub start_web { |
sub start_web { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); |
if ($target ne 'edit' && $target ne 'modified') { |
if ($target eq 'web' || $target eq 'webgrade') { |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); |
return $bodytext; |
if ($target eq 'web' || $target eq 'webgrade') { |
|
return $bodytext; |
|
} |
|
} elsif ($target eq "edit" ) { |
|
my $bodytext = |
|
&Apache::lonxml::get_all_text_unbalanced("/web",$parser); |
|
my $result = &Apache::edit::tag_start($target,$token); |
|
$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1); |
|
return $result; |
|
} elsif ( $target eq "modified" ) { |
|
return $token->[4].&Apache::edit::modifiedfield("/web",$parser); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 61 sub end_web {
|
Line 72 sub end_web {
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); |
if ($target ne 'edit' && $target ne 'modified') { |
if ($target eq 'tex') { |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); |
return $bodytext.' '; |
if ($target eq 'tex') { |
|
|
|
# If inside a table, occurrences of \\ must be removed; |
|
# else the table blows up. |
|
|
|
if (&Apache::londefdef::is_inside_of($tagstack, "table")) { |
|
$bodytext =~ s/\\\\//g; |
|
} |
|
return $bodytext.'{}'; |
|
} |
|
} elsif ($target eq "edit" ) { |
|
my $bodytext = |
|
&Apache::lonxml::get_all_text_unbalanced("/tex",$parser); |
|
my $result = &Apache::edit::tag_start($target,$token); |
|
$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1); |
|
return $result; |
|
} elsif ( $target eq "modified" ) { |
|
return $token->[4].&Apache::edit::modifiedfield("/tex",$parser); |
} |
} |
return $result;; |
return $result;; |
} |
} |
Line 72 sub end_tex {
|
Line 100 sub end_tex {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub homework_js { |
|
return &Apache::loncommon::resize_textarea_js(). |
|
&setmode_javascript(). |
|
<<'JS'; |
|
<script type="text/javascript"> |
|
function setSubmittedPart (part) { |
|
this.document.lonhomework.submitted.value="part_"+part; |
|
} |
|
|
|
function image_response_click (which, e) { |
|
init_geometry(); |
|
if (!e) { e = window.event; } //IE |
|
var input_element = document.lonhomework.elements[which]; |
|
var token_element = document.lonhomework.elements[which+'_token']; |
|
var token = token_element.value; |
|
var img_element = document.getElementById(which+'_imageresponse'); |
|
var x= e.clientX-getX(img_element)+Geometry.getHorizontalScroll(); |
|
var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll(); |
|
var click = x+':'+y; |
|
input_element.value = click; |
|
img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click; |
|
} |
|
|
|
</script> |
|
JS |
|
} |
|
|
|
sub setmode_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
function setmode(form,probmode) { |
|
form.problemmode.value = probmode; |
|
form.submit(); |
|
} |
|
</script> |
|
ENDSCRIPT |
|
} |
|
|
sub page_start { |
sub page_start { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name, |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name, |
$extra_head)=@_; |
$extra_head)=@_; |
Line 88 sub page_start {
|
Line 154 sub page_start {
|
$parstack,$parser,$safeeval); |
$parstack,$parser,$safeeval); |
} |
} |
|
|
|
$extra_head .= &homework_js(); |
|
|
|
if ($env{'environment.wysiwygeditor'} eq 'on') { |
|
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup"); |
|
} else { |
|
$extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
|
} |
|
|
my %body_args; |
my %body_args; |
if (defined($found{'html'})) { |
if (defined($found{'html'})) { |
$body_args{'skip_phases'}{'head'}=1; |
$body_args{'skip_phases'}{'head'}=1; |
Line 95 sub page_start {
|
Line 169 sub page_start {
|
|
|
$extra_head .= &Apache::lonhtmlcommon::spellheader(); |
$extra_head .= &Apache::lonhtmlcommon::spellheader(); |
|
|
my $css_href = &Apache::lonnet::EXT('resource.0.cssfile'); |
$extra_head .= &Apache::londefdef::generate_css_links(); |
if ($css_href =~ /\S/) { |
|
&Apache::lonxml::extlink($css_href); |
if ($env{'request.state'} eq 'construct') { |
$extra_head .= |
|
'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />'; |
|
} |
|
if ($target eq 'edit') { |
|
$extra_head.=&Apache::edit::js_change_detection(). |
$extra_head.=&Apache::edit::js_change_detection(). |
"<script type=\"text/javascript\">\n". |
"<script type=\"text/javascript\">\n". |
"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n". |
"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n". |
Line 115 sub page_start {
|
Line 185 sub page_start {
|
} elsif (!defined($found{'body'}) |
} elsif (!defined($found{'body'}) |
&& $env{'request.state'} eq 'construct') { |
&& $env{'request.state'} eq 'construct') { |
if ($target eq 'web' || $target eq 'edit') { |
if ($target eq 'web' || $target eq 'edit') { |
# no extra args to bodytag |
if ($env{'environment.remote'} ne 'off') { |
|
$body_args{'only_body'} = 1; |
|
} |
} |
} |
} elsif (!defined($found{'body'})) { |
} elsif (!defined($found{'body'})) { |
my %add_entries; |
my %add_entries; |
Line 133 sub page_start {
|
Line 205 sub page_start {
|
$body_args{'no_title'} = 1; |
$body_args{'no_title'} = 1; |
$body_args{'force_register'} = 1; |
$body_args{'force_register'} = 1; |
$body_args{'add_entries'} = \%add_entries; |
$body_args{'add_entries'} = \%add_entries; |
|
if ($env{'environment.remote'} eq 'off' |
|
&& $env{'request.state'} eq 'construct') { |
|
$body_args{'only_body'} = 1; |
|
} |
} |
} |
$body_args{'no_auto_mt_title'} = 1; |
$body_args{'no_auto_mt_title'} = 1; |
my $page_start = &Apache::loncommon::start_page($name,$extra_head, |
my $page_start = &Apache::loncommon::start_page($name,$extra_head, |
Line 150 sub page_start {
|
Line 226 sub page_start {
|
} |
} |
} |
} |
|
|
if (!defined($found{'body'})) { |
if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') { |
$page_start .= &Apache::lonxml::message_location(); |
$page_start .= &Apache::lonxml::message_location(); |
} |
} |
|
|
Line 178 sub page_start {
|
Line 254 sub page_start {
|
#use Time::HiRes(); |
#use Time::HiRes(); |
sub get_resource_name { |
sub get_resource_name { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
|
my $name; |
if (defined($Apache::lonhomework::name)) { |
if (defined($Apache::lonhomework::name)) { |
return $Apache::lonhomework::name; |
$name = $Apache::lonhomework::name; |
} |
} else { |
my ($symb)=&Apache::lonnet::whichuser(); |
my ($symb)=&Apache::lonnet::whichuser(); |
my $name=&Apache::lonnet::gettitle($symb); |
$name=&Apache::lonnet::gettitle($symb); |
if ($name eq '') { |
if ($name eq '') { |
$name=&Apache::lonnet::EXT('resource.title'); |
$name=&Apache::lonnet::EXT('resource.title'); |
if ($name eq 'con_lost') { $name = ''; } |
if ($name eq 'con_lost') { $name = ''; } |
} |
} |
if ($name!~/\S+/) { |
if ($name!~/\S+/) { |
$name=$env{'request.uri'}; |
$name=$env{'request.uri'}; |
$name=~s-.*/([^/]+)$-$1-; |
$name=~s-.*/([^/]+)$-$1-; |
|
} |
|
# The name has had html tags escaped: |
|
|
|
$name=~s/</</gs; |
|
$name=~s/>/>/gs; |
|
|
|
$Apache::lonhomework::name=$name; |
} |
} |
$Apache::lonhomework::name=$name; |
|
return $name; |
return $name; |
} |
} |
|
|
Line 213 sub setup_rndseed {
|
Line 296 sub setup_rndseed {
|
} |
} |
$env{'form.rndseed'}=$rndseed; |
$env{'form.rndseed'}=$rndseed; |
} |
} |
if ($env{'form.resetdata'} eq &mt('New Problem Variation') || |
if ( ($env{'form.resetdata'} eq &mt('New Problem Variation') |
|
&& $env{'form.submitted'} eq 'yes') || |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
srand(time); |
srand(time); |
$rndseed=int(rand(2100000000)); |
$rndseed=int(rand(2100000000)); |
Line 242 sub remember_problem_state {
|
Line 326 sub remember_problem_state {
|
<input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />'; |
<input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />'; |
} |
} |
|
|
|
sub problem_edit_buttons { |
|
return ' |
|
<div class="LC_edit_problem_discards"> |
|
<input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '. |
|
' onclick="javscript:setmode(this.form,'."'discard'".')" /> |
|
<input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" /> |
|
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> |
|
</div> |
|
<div class="LC_edit_problem_saves"> |
|
<input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" /> |
|
<input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" /> |
|
</div>'; |
|
} |
|
|
sub problem_edit_header { |
sub problem_edit_header { |
return '<input type="hidden" name="submitted" value="edit" />'. |
return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'. |
&Apache::structuretags::remember_problem_state().' |
&Apache::structuretags::remember_problem_state().' |
<input type="hidden" name="problemmode" value="'.&mt('Edit').'" /> |
<div class="LC_edit_problem_header"> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<div class="LC_edit_problem_header_title"> |
<input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
'.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').' |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr /> |
</div>'. |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" /> |
&problem_edit_buttons().' |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'. |
<hr class="LC_edit_problem_divide" /> |
&Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help') |
'.&Apache::lonxml::message_location().' |
.'</td></tr></table>'. |
</div> |
|
'. |
'<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">'; |
'<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">'; |
} |
} |
|
|
sub problem_edit_footer { |
sub problem_edit_footer { |
return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" /> |
return '</td></tr></table><br /> |
<input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'. |
<div class="LC_edit_problem_footer"> |
|
<hr class="LC_edit_problem_divide" />'. |
|
&problem_edit_buttons().' |
|
<hr class="LC_edit_problem_divide" /> |
|
</div> |
|
'. |
|
|
&Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()). |
&Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()). |
"\n</form>\n".&Apache::loncommon::end_page(); |
"\n</form>\n".&Apache::loncommon::end_page(); |
} |
} |
Line 275 sub option {
|
Line 380 sub option {
|
|
|
sub problem_web_to_edit_header { |
sub problem_web_to_edit_header { |
my ($rndseed)=@_; |
my ($rndseed)=@_; |
my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />'; |
my $result .= '<div class="LC_edit_problem_header">'; |
|
|
if (!$Apache::lonhomework::parsing_a_task) { |
if (!$Apache::lonhomework::parsing_a_task) { |
$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />'; |
$result .= |
|
'<div class="LC_edit_problem_header_title">'. |
|
&mt('Problem Testing'). |
|
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area'). |
|
'</div>'; |
|
} else { |
|
$result .= |
|
'<div class="LC_edit_problem_header_title">'. |
|
&mt('Task Testing'). |
|
'</div>'; |
} |
} |
$result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
|
<input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" /> |
|
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" /> |
|
<nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" /> |
|
<input type="text" name="rndseed" size="10" value="'. |
|
$rndseed.'" |
|
onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr> |
|
<label><input type="checkbox" name="showallfoils" '; |
|
my $show_all_foils_text = |
my $show_all_foils_text = |
($Apache::lonhomework::parsing_a_task) ? |
($Apache::lonhomework::parsing_a_task) ? |
&mt(' Show All Instances') |
&mt(' Show All Instances') |
: &mt(' Show All Foils'); |
: &mt(' Show All Foils'); |
|
|
if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; } |
my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" '; |
$result.= ' />'.$show_all_foils_text.'</label>'. |
if (defined($env{'form.showallfoils'})) { $show_all.='checked="checked"'; } |
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems'). |
$show_all.= ' />'.$show_all_foils_text.'</label></span>'; |
'<hr />'; |
|
|
|
|
|
|
$result .= '<div class="LC_edit_problem_header_status_row">'; |
if (!$Apache::lonhomework::parsing_a_task) { |
if (!$Apache::lonhomework::parsing_a_task) { |
$result.=" |
$result.=" |
<nobr> |
<div class='LC_edit_problem_header_row1'> |
Problem Status: |
<span class=\"LC_nobreak\"> |
|
".&mt("Problem Status:")." |
<select name='problemstate'> |
<select name='problemstate'> |
<option value=''></option> |
<option value=''></option> |
".&option('CLOSED' ,'problemstate').&mt("Closed")."</option> |
".&option('CLOSED' ,'problemstate').&mt("Closed")."</option> |
Line 308 Problem Status:
|
Line 420 Problem Status:
|
".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option> |
".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option> |
".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Answer")."</option> |
".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Answer")."</option> |
</select> |
</select> |
</nobr> |
</span> |
<nobr> |
<span class=\"LC_nobreak\"> |
Problem Type: |
".&mt("Problem Type:")." |
<select name='problemtype'> |
<select name='problemtype'> |
<option value=''></option> |
<option value=''></option> |
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option> |
".&option('exam' ,'problemtype').&mt("Exam Problem")."</option> |
".&option('problem','problemtype').&mt("Homework problem")."</option> |
".&option('problem','problemtype').&mt("Homework Problem")."</option> |
".&option('survey' ,'problemtype').&mt("Survey Question")."</option> |
".&option('survey' ,'problemtype').&mt("Survey Question")."</option> |
|
".&option('practice' ,'problemtype').&mt("Practice Problem")."</option> |
</select> |
</select> |
</nobr> |
</span> |
<nobr> |
$show_all |
Feedback Mode: |
</div> |
|
<div class='LC_edit_problem_header_row2'> |
|
<span class=\"LC_nobreak\"> |
|
".&mt("Feedback Mode:")." |
<select name='problemstatus'> |
<select name='problemstatus'> |
<option value=''></option> |
<option value=''></option> |
".&option('yes','problemstatus').&mt("Show Feedback")."</option> |
".&option('yes','problemstatus').&mt("Show Feedback")."</option> |
".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option> |
".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option> |
|
".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option> |
|
</select> |
|
</span> |
|
"; |
|
|
|
} elsif ($Apache::lonhomework::parsing_a_task) { |
|
$result.=" |
|
<div class='LC_edit_problem_header_row1'> |
|
<span class=\"LC_nobreak\"> |
|
".&mt("Problem Status:")." |
|
<select name='problemstate'> |
|
<option value=''></option> |
|
".&option('CLOSED' ,'problemstate').&mt("Closed")."</option> |
|
".&option('CAN_ANSWER' ,'problemstate').&mt("Answerable")."</option> |
|
".&option('WEB_GRADE' ,'problemstate').&mt("Criteria Grading")."</option> |
|
".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Feedback")."</option> |
</select> |
</select> |
</nobr> |
</span> |
<input type='submit' name='changeproblemmode' value='".&mt("Change")."' /> |
$show_all |
<hr />"; |
"; |
|
} |
|
$result.=' |
|
<span class="LC_nobreak"> |
|
'.&mt('Apply style file: ').' |
|
<input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" /> |
|
<a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a> |
|
</span> |
|
</div> |
|
<div class="LC_edit_problem_header_row1">'. |
|
&Apache::lonxml::renderingoptions().' |
|
</div> |
|
<input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" /> |
|
<input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" /> |
|
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" /> |
|
</div> |
|
<hr class="LC_edit_problem_divide" /> |
|
<div class="LC_edit_problem_header_randomize_row"> |
|
<input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" /> |
|
<input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" /> |
|
<input type="text" name="rndseed" size="10" value="'. |
|
$rndseed.'" |
|
onchange="javascript:document.lonhomework.changerandseed.click()" />'; |
|
|
|
if (!$Apache::lonhomework::parsing_a_task) { |
my $numtoanalyze=$env{'form.numtoanalyze'}; |
my $numtoanalyze=$env{'form.numtoanalyze'}; |
if (!$numtoanalyze) { $numtoanalyze=20; } |
if (!$numtoanalyze) { $numtoanalyze=20; } |
$result.= '<input type="submit" name="problemmode" value='. |
$result .= '<span class="LC_nobreak">'. |
&mt('"Calculate answers').'" /> for |
&mt('[_1] for [_2] versions.', |
<input type="text" name="numtoanalyze" value="'. |
'<input type="button" name="submitmode" value="'.&mt('Calculate answers').'" '. |
$numtoanalyze.'" size="5" /> '.&mt('versions of this problem'). |
'onclick="javascript:setmode(this.form,'."'calcanswers'".')" />' |
'.'.&Apache::loncommon::help_open_topic("Analyze_Problem", |
,'<input type="text" name="numtoanalyze" value="'. |
'',undef,undef,300). |
$numtoanalyze.'" size="5" />'). |
'<hr />'; |
&Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300). |
} |
'</span>'; |
|
|
|
} |
|
|
|
$result.=' |
|
</div> |
|
<div class="LC_edit_problem_header_edit_row">'; |
|
$result.='<input type="hidden" name="problemmode" value="view" />'; |
|
$result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '. |
|
'onclick="javascript:setmode(this.form,'."'edit'".')" />'; |
|
$result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '. |
|
'onclick="javascript:setmode(this.form,'."'editxml'".')" />'; |
|
$result.=' |
|
</div> |
|
'.&Apache::lonxml::message_location().' |
|
</div>'; |
return $result; |
return $result; |
} |
} |
|
|
Line 360 sub initialize_storage {
|
Line 531 sub initialize_storage {
|
|
|
my $namespace = $symb || $env{'request.uri'}; |
my $namespace = $symb || $env{'request.uri'}; |
if ($env{'form.resetdata'} eq &mt('Reset Submissions') || |
if ($env{'form.resetdata'} eq &mt('Reset Submissions') || |
$env{'form.resetdata'} eq &mt('New Problem Variation') || |
($env{'form.resetdata'} eq &mt('New Problem Variation') |
|
&& $env{'form.submitted'} eq 'yes') || |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
&Apache::lonnet::tmpreset($namespace,'',$domain,$name); |
&Apache::lonnet::tmpreset($namespace,'',$domain,$name); |
&Apache::lonxml::debug("Attempt reset"); |
&Apache::lonxml::debug("Attempt reset"); |
Line 414 sub finalize_storage {
|
Line 586 sub finalize_storage {
|
} |
} |
return $result; |
return $result; |
} |
} |
use Data::Dumper; |
|
|
|
# -------------------------------------------------------------store_aggregates |
# -------------------------------------------------------------store_aggregates |
# Sends hash of values to be incremented in nohist_resourcetracker.db |
# Sends hash of values to be incremented in nohist_resourcetracker.db |
Line 479 ENDCHECKOUT
|
Line 650 ENDCHECKOUT
|
|
|
sub firstaccess_msg { |
sub firstaccess_msg { |
my ($time,$symb)=@_; |
my ($time,$symb)=@_; |
my ($map)=&Apache::lonnet::decode_symb($symb); |
my $result; |
my $foldertitle=&Apache::lonnet::gettitle($map); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
&Apache::lonxml::debug("map is $map title is $foldertitle"); |
if ($interval[1] eq 'map') { |
|
my ($map)=&Apache::lonnet::decode_symb($symb); |
|
my $foldertitle=&Apache::lonnet::gettitle($map); |
|
|
|
&Apache::lonxml::debug("map is $map title is $foldertitle"); |
|
$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.' |
|
.' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".' |
|
,$foldertitle,$time)."</h2>"; |
|
} elsif ($interval[1] eq 'course') { |
|
my $course = $env{'course.'.$env{'request.course.id'}.'.description'}; |
|
$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.' |
|
.' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".' |
|
,$course,$time)."</h2>"; |
|
} else { |
|
my $title=&Apache::lonnet::gettitle($symb); |
|
$result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.' |
|
.' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".' |
|
,$title,$time)."</h2>"; |
|
} |
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); |
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); |
return (<<ENDCHECKOUT); |
my $buttontext = &mt('Show Resource'); |
<h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2> |
my $timertext = &mt('Start Timer?'); |
|
$result .= (<<ENDCHECKOUT); |
<form name="markaccess" method="POST" action="$uri"> |
<form name="markaccess" method="POST" action="$uri"> |
<input type="hidden" name="markaccess" value="yes" /> |
<input type="hidden" name="markaccess" value="yes" /> |
<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" /> |
<input type="button" name="accessbutton" value="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" /> |
</form> |
</form> |
ENDCHECKOUT |
ENDCHECKOUT |
|
return $result; |
} |
} |
|
|
sub init_problem_globals { |
sub init_problem_globals { |
Line 501 sub init_problem_globals {
|
Line 692 sub init_problem_globals {
|
if ($type eq 'problem') { |
if ($type eq 'problem') { |
$Apache::inputtags::part='0'; |
$Apache::inputtags::part='0'; |
@Apache::inputtags::partlist=('0'); |
@Apache::inputtags::partlist=('0'); |
$Apache::lonhomework::problemstatus=&get_problem_status('0'); |
&Apache::lonhomework::set_show_problem_status(&get_problem_status('0')); |
$Apache::lonhomework::ignore_response_errors=0; |
$Apache::lonhomework::ignore_response_errors=0; |
|
|
} elsif ($type eq 'library') { |
} elsif ($type eq 'library') { |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
@Apache::inputtags::partlist=(); |
@Apache::inputtags::partlist=(); |
$Apache::lonhomework::problemstatus=''; |
&Apache::lonhomework::reset_show_problem_status(); |
$Apache::lonhomework::ignore_response_errors=1; |
$Apache::lonhomework::ignore_response_errors=1; |
|
|
} elsif ($type eq 'Task') { |
} elsif ($type eq 'Task') { |
$Apache::inputtags::part='0'; |
$Apache::inputtags::part='0'; |
@Apache::inputtags::partlist=('0'); |
@Apache::inputtags::partlist=('0'); |
$Apache::lonhomework::problemstatus=''; |
&Apache::lonhomework::reset_show_problem_status(); |
$Apache::lonhomework::ignore_response_errors=1; |
$Apache::lonhomework::ignore_response_errors=1; |
} |
} |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
Line 542 sub reset_problem_globals {
|
Line 733 sub reset_problem_globals {
|
undef($Apache::lonhomework::default_type); |
undef($Apache::lonhomework::default_type); |
undef($Apache::lonhomework::type); |
undef($Apache::lonhomework::type); |
undef($Apache::lonhomework::scantronmode); |
undef($Apache::lonhomework::scantronmode); |
undef($Apache::lonhomework::problemstatus); |
|
undef($Apache::lonhomework::ignore_response_errors); |
undef($Apache::lonhomework::ignore_response_errors); |
|
&Apache::lonhomework::reset_show_problem_status(); |
} |
} |
|
|
sub set_problem_state { |
sub set_problem_state { |
Line 594 sub start_problem {
|
Line 785 sub start_problem {
|
} |
} |
|
|
if ($target ne 'analyze') { |
if ($target ne 'analyze') { |
if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); } |
my $type = &Apache::lonnet::EXT('resource.0.type'); |
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
$Apache::lonhomework::type=$type; |
if (($env{'request.state'} eq 'construct') && |
if (($env{'request.state'} eq 'construct') && |
defined($env{'form.problemtype'})) { |
$env{'form.problemtype'} =~ /\S/) { |
$Apache::lonhomework::type=$env{'form.problemtype'}; |
$Apache::lonhomework::type=$env{'form.problemtype'}; |
} |
} |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
Line 615 sub start_problem {
|
Line 806 sub start_problem {
|
$Apache::lonhomework::default_type = $Apache::lonhomework::type; |
$Apache::lonhomework::default_type = $Apache::lonhomework::type; |
|
|
&initialize_storage(); |
&initialize_storage(); |
|
if ($target ne 'analyze' |
|
&& $env{'request.state'} eq 'construct') { |
|
&set_problem_state('0'); |
|
} |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
&Apache::lonxml::debug(" grading history "); |
&Apache::lonxml::debug(" grading history "); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
Line 653 sub start_problem {
|
Line 849 sub start_problem {
|
$result.=&Apache::lonxml::printtokenheader($target,$token); |
$result.=&Apache::lonxml::printtokenheader($target,$token); |
} |
} |
if ($env{'form.markaccess'}) { |
if ($env{'form.markaccess'}) { |
&Apache::lonnet::set_first_access('map'); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
|
&Apache::lonnet::set_first_access($interval[1]); |
} |
} |
#handle rand seed in construction space |
#handle rand seed in construction space |
my $rndseed=&setup_rndseed($safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
Line 678 sub start_problem {
|
Line 875 sub start_problem {
|
$form_tag_start.= ' />'.&mt(' Show All Foils'). |
$form_tag_start.= ' />'.&mt(' Show All Foils'). |
'</label>'; |
'</label>'; |
} |
} |
|
if ($Apache::lonhomework::type eq 'practice') { |
|
$form_tag_start.=&practice_problem_header(); |
|
} |
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} |
} |
|
|
Line 707 sub start_problem {
|
Line 907 sub start_problem {
|
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
} |
} |
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { |
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { |
$msg.='The problem '.$accessmsg; |
$msg.=&mt('The problem ').$accessmsg; |
} elsif ($status eq 'UNCHECKEDOUT') { |
} elsif ($status eq 'UNCHECKEDOUT') { |
$msg.=&checkout_msg(); |
$msg.=&checkout_msg(); |
} elsif ($status eq 'NOT_YET_VIEWED') { |
} elsif ($status eq 'NOT_YET_VIEWED') { |
Line 731 sub start_problem {
|
Line 931 sub start_problem {
|
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
$style); |
$style); |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result .= &Apache::bridgetask::proctor_validation_screen(); |
$result .= |
|
&Apache::bridgetask::proctor_validation_screen($slot); |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
&Apache::bridgetask::proctor_check_auth($slot_name,$slot, |
&Apache::bridgetask::proctor_check_auth($slot_name,$slot, |
'problem'); |
'problem'); |
Line 749 sub start_problem {
|
Line 950 sub start_problem {
|
# create a page header and exit |
# create a page header and exit |
if ($env{'request.state'} eq "construct") { |
if ($env{'request.state'} eq "construct") { |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
|
if ($Apache::lonhomework::type eq 'practice') { |
|
$result.= '<input type="submit" name="resetdata" '. |
|
'value="'.&mt('New Problem Variation').'" />'. |
|
&practice_problem_header().'<hr />'; |
|
} |
} |
} |
# if we are viewing someone else preserve that info |
# if we are viewing someone else preserve that info |
if (defined $env{'form.grade_symb'}) { |
if (defined $env{'form.grade_symb'}) { |
Line 769 sub start_problem {
|
Line 975 sub start_problem {
|
$result.=$temp; |
$result.=$temp; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result=$token->[4]; |
$result=$token->[4]; |
$result.=&Apache::edit::handle_insert(); |
|
} else { |
} else { |
# page_start returned a starting result, delete it if we don't need it |
# page_start returned a starting result, delete it if we don't need it |
$result = ''; |
$result = ''; |
Line 787 sub end_problem {
|
Line 992 sub end_problem {
|
} |
} |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
|
|
# Figure out the front matter and replace the |
# Figure out the front matter and replace the |
# INSERTTEXFRONTMATTERHERE in result with it. note that we do |
# INSERTTEXFRONTMATTERHERE in result with it. note that we do |
# this in end_problem because whether or not we display due |
# this in end_problem because whether or not we display due |
Line 863 sub end_problem {
|
Line 1067 sub end_problem {
|
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} |
} |
} |
} else { |
} else { |
$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; |
$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage; |
} |
} |
} else { |
} else { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
$frontmatter .= $begin_doc.$toc_line; |
$frontmatter .= $begin_doc.$toc_line; |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} |
} else { |
} else { |
$frontmatter .= '\vskip 1mm \\\\\\\\'; |
$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage; |
} |
} |
} |
} |
$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/; |
$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/; |
Line 920 sub end_problem {
|
Line 1124 sub end_problem {
|
if (not $env{'request.symb'} =~ m/\.page_/) { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
$result .= $endminipage.'\end{document} '; |
$result .= $endminipage.'\end{document} '; |
} else { |
} else { |
$result .= ''; |
$result .= $endminipage; |
} |
} |
} |
} |
} |
} |
Line 947 sub end_problem {
|
Line 1151 sub end_problem {
|
$result .= &problem_edit_footer(); |
$result .= &problem_edit_footer(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result .= $token->[2]; |
$result .= $token->[2]; |
$result.=&Apache::edit::handle_insertafter($token->[1]); |
|
} |
} |
|
|
if ($env{'request.state'} eq 'construct' && $target eq 'web') { |
if ($env{'request.state'} eq 'construct' && $target eq 'web') { |
Line 976 sub start_library {
|
Line 1179 sub start_library {
|
$result.=$temp; |
$result.=$temp; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result=$token->[4]; |
$result=$token->[4]; |
$result.=&Apache::edit::handle_insert(); |
|
} elsif (($target eq 'web' || $target eq 'webgrade') |
} elsif (($target eq 'web' || $target eq 'webgrade') |
&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library') |
&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library') |
&& $env{'request.state'} eq "construct" ) { |
&& $env{'request.state'} eq "construct" ) { |
Line 988 sub start_library {
|
Line 1190 sub start_library {
|
$result.=" \n $form_tag_start". |
$result.=" \n $form_tag_start". |
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
$result.=&problem_web_to_edit_header($rndseed); |
$result.=&problem_web_to_edit_header($rndseed); |
|
if ($Apache::lonhomework::type eq 'practice') { |
|
$result.= '<input type="submit" name="resetdata" '. |
|
'value="'.&mt('New Problem Variation').'" />'. |
|
&practice_problem_header().'<hr />'; |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 1015 sub start_definetag {
|
Line 1222 sub start_definetag {
|
|
|
my $name = $token->[2]->{'name'}; |
my $name = $token->[2]->{'name'}; |
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style); |
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style); |
if ($name=~/^\//) { |
if ($target eq 'web') { |
$result= |
if ($name=~/^\//) { |
'<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>'; |
$result= |
} else { |
'<br /><table class="LC_sty_end"><tr><th>'. |
$result= |
&mt('END [_1]'.'<tt>'.$name.'</tt>').'</th></tr>'; |
'<br /><table bgcolor="#BBFFBB"><tr><th>BEGIN <tt>'.$name.'</tt></th></tr>'; |
} else { |
|
$result= |
|
'<br /><table class="LC_sty_begin"><tr><th>'. |
|
&mt('BEGIN [_1]'.'<tt>'.$name.'</tt>').'</th></tr>'; |
|
} |
|
$skip = &HTML::Entities::encode($skip, '<>&"'); |
|
$result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>'; |
} |
} |
$skip=~s/\</\<\;/gs; |
|
$skip=~s/\>/\>\;/gs; |
|
$result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>'; |
|
return $result; |
return $result; |
} |
} |
|
|
Line 1040 sub start_block {
|
Line 1250 sub start_block {
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
if (defined($code)) { |
if (defined($code) && $code ne '') { |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
Line 1085 sub start_languageblock {
|
Line 1295 sub start_languageblock {
|
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $include = $token->[2]->{'include'}; |
my $include = $token->[2]->{'include'}; |
my $exclude = $token->[2]->{'exclude'}; |
my $exclude = $token->[2]->{'exclude'}; |
my %languages=&Apache::loncommon::display_languages(); |
my @preferred_languages=&Apache::loncommon::preferred_languages(); |
$result='1'; |
# This should not even happen, since we should at least have the server language |
if ($include) { |
if (!$preferred_languages[0]) { $preferred_languages[0]='en'; } |
$result=''; |
# Now loop over all languages in order of preference |
foreach (split(/\,/,$include)) { |
foreach my $preferred_language (@preferred_languages) { |
if ($languages{$_}) { $result='1'; } |
# If the languageblock has no arguments, show the contents |
} |
$result=1; |
} |
my $found=0; |
if ($exclude) { |
# Do we have an include argument? |
foreach (split(/\,/,$exclude)) { |
if ($include) { |
if ($languages{$_}) { $result='0'; } |
# If include is specified, by default, don't render the block |
} |
$result=0; |
} |
foreach my $included_language (split(/\,/,$include)) { |
|
# ... but if my preferred language is included, render it |
|
if ($included_language eq $preferred_language) { |
|
$result=1; |
|
$found=1; |
|
} |
|
} |
|
} |
|
# Do we have an exclude argument? |
|
if ($exclude) { |
|
$result=1; |
|
foreach my $excluded_language (split(/\,/,$exclude)) { |
|
if ($excluded_language eq $preferred_language) { |
|
$result=0; |
|
$found=1; |
|
} |
|
} |
|
} |
|
if ($found) { last; } |
|
} |
if ( ! $result ) { |
if ( ! $result ) { |
my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser, |
my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser, |
$style); |
$style); |
Line 1129 sub end_languageblock {
|
Line 1358 sub end_languageblock {
|
return $result; |
return $result; |
} |
} |
|
|
|
{ |
|
my %available_texts; |
|
sub start_translated { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
&Apache::lonxml::register('Apache::structuretags',('lang')); |
|
undef(%available_texts); |
|
} |
|
|
|
sub end_translated { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result; |
|
#show the translation on viewable targets |
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'webgrade'|| |
|
# or non-viewable targets, if it's embedded in something that |
|
# wants the output |
|
(($target eq 'answer' || $target eq 'analyze'|| $target eq 'grade') |
|
&& &Apache::lonxml::in_redirection() ) ) { |
|
my @possibilities = keys(%available_texts); |
|
my $which = |
|
&Apache::loncommon::languages(\@possibilities) || 'default'; |
|
$result = $available_texts{$which}; |
|
} |
|
undef(%available_texts); |
|
&Apache::lonxml::deregister('Apache::structuretags',('lang')); |
|
return $result; |
|
} |
|
|
|
|
|
sub start_lang { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
|
&Apache::lonxml::startredirection(); |
|
} |
|
return ''; |
|
} |
|
|
|
sub end_lang { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
|
my $result = &Apache::lonxml::endredirection(); |
|
my $which = &Apache::lonxml::get_param('which',$parstack, |
|
$safeeval); |
|
if ($which=~/\w/) { |
|
$available_texts{$which} = $result; |
|
} |
|
my $otherlangs = &Apache::lonxml::get_param('other',$parstack, |
|
$safeeval); |
|
foreach my $language (split(/\s*\,\s*/,$otherlangs)) { |
|
if ($language=~/\w/) { |
|
$available_texts{$language} = $result; |
|
} |
|
} |
|
|
|
} |
|
return ''; |
|
} |
|
} |
|
|
sub start_instructorcomment { |
sub start_instructorcomment { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
Line 1207 sub end_while {
|
Line 1496 sub end_while {
|
while ($return) { |
while ($return) { |
if (time-$starttime > |
if (time-$starttime > |
$Apache::lonnet::perlvar{'lonScriptTimeout'}) { |
$Apache::lonnet::perlvar{'lonScriptTimeout'}) { |
#$return = 0; $error=1; next; |
$return = 0; $error=1; next; |
} |
} |
$result.=&Apache::scripttag::xmlparse($bodytext); |
$result.=&Apache::scripttag::xmlparse($bodytext); |
|
if ($target eq 'grade' || $target eq 'answer' || |
|
$target eq 'analyze') { |
|
# grade/answer/analyze should produce no output but if we |
|
# are redirecting, the redirecter should know what to do |
|
# with the output |
|
if (!$Apache::lonxml::redirection) { undef($result); } |
|
} |
$return = &Apache::run::run($code,$safeeval); |
$return = &Apache::run::run($code,$safeeval); |
} |
} |
if ($error) { |
if ($error) { |
&Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while> on line').' '.$line.'</pre>'); |
&Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running <while> on line').' '.$line.'</pre>'); |
} |
} |
} elsif ($target eq "edit") { |
} elsif ($target eq "edit") { |
$result.= &Apache::edit::tag_end($target,$token,''); |
$result.= &Apache::edit::tag_end($target,$token,''); |
Line 1327 sub start_part {
|
Line 1623 sub start_part {
|
# duedates. |
# duedates. |
} |
} |
my $result=''; |
my $result=''; |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id= &Apache::lonxml::get_id($parstack,$safeeval); |
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } |
|
$Apache::inputtags::part=$id; |
$Apache::inputtags::part=$id; |
push(@Apache::inputtags::partlist,$id); |
push(@Apache::inputtags::partlist,$id); |
@Apache::inputtags::response=(); |
@Apache::inputtags::response=(); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous_version=(); |
@Apache::inputtags::previous_version=(); |
$Apache::lonhomework::problemstatus=&get_problem_status($id); |
&Apache::lonhomework::set_show_problem_status(&get_problem_status($id)); |
|
&Apache::response::reset_params(); |
|
|
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
my $newtype=&Apache::lonnet::EXT("resource.$id.type"); |
my $newtype=&Apache::lonnet::EXT("resource.$id.type"); |
if ($newtype) { $Apache::lonhomework::type=$newtype; } |
if ($newtype) { $Apache::lonhomework::type=$newtype; } |
Line 1381 sub start_part {
|
Line 1678 sub start_part {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
if (not $env{'form.problem_split'}=~/yes/) { |
if (not $env{'form.problem_split'}=~/yes/) { |
if ($$tagstack[-2] eq 'td') { |
if ($$tagstack[-2] eq 'td') { |
$result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; |
$result.='\noindent \begin{minipage}{\textwidth}\noindent'; |
} else { |
} else { |
$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; |
$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; |
} |
} |
Line 1423 sub start_part {
|
Line 1720 sub start_part {
|
#limiting ids to only letters numbers, and space |
#limiting ids to only letters numbers, and space |
$token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs; |
$token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs; |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::handle_insert(); |
|
} |
} |
} |
} |
return $result; |
return $result; |
Line 1461 sub end_part {
|
Line 1757 sub end_part {
|
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result .= $token->[2]; |
$result .= $token->[2]; |
$result.=&Apache::edit::handle_insertafter($token->[1]); |
|
} |
} |
pop @Apache::inputtags::status; |
pop @Apache::inputtags::status; |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
Line 1574 sub start_problemtype {
|
Line 1869 sub start_problemtype {
|
$result .=&Apache::edit::checked_arg('When used as type(s):','for', |
$result .=&Apache::edit::checked_arg('When used as type(s):','for', |
[ ['exam','Exam/Quiz Problem'], |
[ ['exam','Exam/Quiz Problem'], |
['survey','Survey'], |
['survey','Survey'], |
['problem','Homework Problem'] ] |
['problem','Homework Problem'], |
|
['practice','Practice Problem'] ] |
,$token); |
,$token); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
Line 1593 sub start_startouttext {
|
Line 1889 sub start_startouttext {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my @result=(''.''); |
my @result=(''.''); |
if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); } |
if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); } |
|
|
|
my $nesting = |
|
&Apache::lonxml::set_state('outtext', |
|
&Apache::lonxml::get_state('outtext')+1); |
|
if ($nesting > 1 && $env{'request.state'} eq 'construct') { |
|
&Apache::lonxml::error("Nesting of <startouttext /> not allowed, on line ".$token->[5]); |
|
} |
return (@result); |
return (@result); |
} |
} |
|
|
Line 1600 sub end_startouttext {
|
Line 1903 sub end_startouttext {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $text=''; |
my $text=''; |
|
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
|
my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth; |
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
|
|
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
<td>".&mt('Delete:'). |
<td>".&mt('Delete:'). |
&Apache::edit::deletelist($target,$token) |
&Apache::edit::deletelist($target,$token) |
."</td> |
."</td>"; |
<td>". |
unless ($env{'environment.wysiwygeditor'} eq 'on') { |
&Apache::edit::insertlist($target,$token). |
$result .= '<td align="left">' |
'</td><td align="right" valign="top">' . |
.&Apache::lonhtmlcommon::dragmath_button($areaid,1) |
&Apache::loncommon::helpLatexCheatsheet(). |
.'</td>' |
|
.'<td>' |
|
.&Apache::edit::insertlist($target,$token) |
|
.'</td>'; |
|
} |
|
$result.='<td align="right" valign="top">' . |
|
&Apache::loncommon::helpLatexCheatsheet(). |
&Apache::edit::end_row(). |
&Apache::edit::end_row(). |
&Apache::edit::start_spanning_row()."\n". |
&Apache::edit::start_spanning_row()."\n". |
&Apache::edit::editfield($token->[1],$text,"",80,8,1); |
&Apache::edit::editfield($token->[1],$text,"",80,8,1); |
Line 1630 sub start_endouttext {
|
Line 1940 sub start_endouttext {
|
if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; } |
if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; } |
if ($target eq "modified") { |
if ($target eq "modified") { |
$result='<endouttext />'. |
$result='<endouttext />'. |
&Apache::edit::handle_insertafter('startouttext'); } |
&Apache::edit::handle_insertafter('startouttext'); |
|
} |
|
|
|
my $nesting = |
|
&Apache::lonxml::set_state('outtext', |
|
&Apache::lonxml::get_state('outtext')-1); |
|
if ($nesting < 0 && $env{'request.state'} eq 'construct') { |
|
&Apache::lonxml::error(" Extraneous <endouttext /> not allowed on line ".$token->[5]); |
|
&Apache::lonxml::set_state('outtext', 0); |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 1675 sub end_simpleeditbutton {
|
Line 1994 sub end_simpleeditbutton {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub practice_problem_header { |
|
return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'. |
|
'<span class="LC_info">'.&mt('Submissions are not permanently recorded'). |
|
'</span>'; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |