--- loncom/xml/lonxml.pm 2010/09/29 16:12:17 1.505.2.4
+++ loncom/xml/lonxml.pm 2012/12/06 13:54:47 1.536
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.505.2.4 2010/09/29 16:12:17 raeburn Exp $
+# $Id: lonxml.pm,v 1.536 2012/12/06 13:54:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -112,6 +112,8 @@ use Apache::lonmaxima();
use Apache::lonr();
use Apache::lonlocal;
use Apache::lonhtmlcommon();
+use Apache::functionplotresponse();
+use Apache::lonnavmaps();
#==================================== Main subroutine: xmlparse
@@ -209,8 +211,12 @@ sub xmlend {
my $discussion;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['LONCAPA_INTERNAL_no_discussion']);
- if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) ||
- $env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
+ if (
+ ( (!exists($env{'form.LONCAPA_INTERNAL_no_discussion'}))
+ || ($env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true')
+ )
+ && ($env{'form.inhibitmenu'} ne 'yes')
+ ) {
$discussion=&Apache::lonfeedback::list_discussion($mode,$status);
}
if ($target eq 'tex') {
@@ -222,101 +228,6 @@ sub xmlend {
return $discussion;
}
-sub tokeninputfield {
- my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
- $defhost=~tr/a-z/A-Z/;
- return (<<ENDINPUTFIELD)
-<script type="text/javascript">
- function updatetoken() {
- var comp=new Array;
- var barcode=unescape(document.tokeninput.barcode.value);
- comp=barcode.split('*');
- if (typeof(comp[0])!="undefined") {
- document.tokeninput.codeone.value=comp[0];
- }
- if (typeof(comp[1])!="undefined") {
- document.tokeninput.codetwo.value=comp[1];
- }
- if (typeof(comp[2])!="undefined") {
- comp[2]=comp[2].toUpperCase();
- document.tokeninput.codethree.value=comp[2];
- }
- document.tokeninput.barcode.value='';
- }
-</script>
-<form method="post" name="tokeninput" action="">
-<table border="2" bgcolor="#FFFFBB">
-<tr><th>DocID Checkin</th></tr>
-<tr><td>
-<table>
-<tr>
-<td>Scan in Barcode</td>
-<td><input type="text" size="22" name="barcode"
-onchange="updatetoken()"/></td>
-</tr>
-<tr><td><i>or</i> Type in DocID</td>
-<td>
-<input type="text" size="5" name="codeone" />
-<b><font size="+2">*</font></b>
-<input type="text" size="5" name="codetwo" />
-<b><font size="+2">*</font></b>
-<input type="text" size="10" name="codethree" value="$defhost"
-onchange="this.value=this.value.toUpperCase()" />
-</td></tr>
-</table>
-</td></tr>
-<tr><td><input type="submit" value="Check in DocID" /></td></tr>
-</table>
-</form>
-ENDINPUTFIELD
-}
-
-sub maketoken {
- my ($symb,$tuname,$tudom,$tcrsid)=@_;
- unless ($symb) {
- $symb=&Apache::lonnet::symbread();
- }
- unless ($tuname) {
- $tuname=$env{'user.name'};
- $tudom=$env{'user.domain'};
- $tcrsid=$env{'request.course.id'};
- }
-
- return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
-}
-
-sub printtokenheader {
- my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
- unless ($token) { return ''; }
-
- my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
- unless ($tsymb) {
- $tsymb=$symb;
- }
- unless ($tuname) {
- $tuname=$name;
- $tudom=$domain;
- $tcrsid=$courseid;
- }
-
- my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
-
- if ($target eq 'web') {
- my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
- return
- '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
- &mt('Checked out for').' '.$plainname.
- '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
- '<br />'.&mt('ID').': '.$idhash{$tuname}.
- '<br />'.&mt('CourseID').': '.$tcrsid.
- '<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
- '<br />'.&mt('DocID').': '.$token.
- '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
- } else {
- return $token;
- }
-}
-
sub printalltags {
my $temp;
foreach $temp (sort keys %Apache::lonxml::alltags) {
@@ -395,7 +306,8 @@ sub xmlparse {
&clean_safespace($safeeval);
if (@script_var_displays) {
- $finaloutput .= join('',@script_var_displays);
+ my $scriptoutput = join('',@script_var_displays);
+ $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
undef(@script_var_displays);
}
&init_state();
@@ -571,11 +483,11 @@ sub inner_xmlparse {
}
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
$finaloutput=&afterburn($finaloutput);
- }
+ }
if ($target eq 'modified') {
# if modfied, handle startpart and endpart
$finaloutput=~s/\<startpartmarker[^\>]*\>(.*)\<endpartmarker[^\>]*\>/<part>$1<\/part>/gs;
- }
+ }
return $finaloutput;
}
@@ -737,6 +649,7 @@ sub setup_globals {
sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;
+ $safeeval->reval('use LaTeX::Table;');
$safeeval->deny_only(':dangerous');
$safeeval->reval('use Math::Complex;');
$safeeval->permit_only(":default");
@@ -881,6 +794,15 @@ sub init_safespace {
$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');
$safehole->wrap(\&Apache::inputtags::finalizeawards,$safeeval,'&LONCAPA_INTERNAL_FINALIZEAWARDS');
$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_val,$safeeval,'&fpr_val');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_f,$safeeval,'&fpr_f');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_dfdx,$safeeval,'&fpr_dfdx');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_d2fdx2,$safeeval,'&fpr_d2fdx2');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorcoords,$safeeval,'&fpr_vectorcoords');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_objectcoords,$safeeval,'&fpr_objectcoords');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength');
+ $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle');
+
# use Data::Dumper;
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');
#need to inspect this class of ops
@@ -932,7 +854,8 @@ sub initialize_rndseed {
sub default_homework_load {
my ($safeeval)=@_;
&Apache::lonxml::debug('Loading default_homework');
- my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
+ my $default=&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonIncludes'}.
+ '/default_homework.lcpm');
if ($default eq -1) {
&Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
} else {
@@ -1102,7 +1025,7 @@ the current 'bubble line number' is stor
The value of it is stored in $Apache:lonxml::counter when live and
stored back to env after done.
-=item &increment_counter($increment);
+=item &increment_counter($increment, $part_response);
Increments the internal counter environment variable a specified amount
@@ -1579,28 +1502,29 @@ sub renderingoptions {
{&Apache::lonlocal::texthash
('' => '',
'tth' => 'tth (TeX to HTML)',
- 'jsMath' => 'jsMath',
+ 'MathJax' => 'MathJax',
+ 'jsMath' => 'jsMath',
'mimetex' => 'mimetex (Convert to Images)')}).
'</span>';
return $output;
}
sub inserteditinfo {
- my ($filecontents, $filetype, $filename)=@_;
+ my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri) = @_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
my $xml_help = '';
my $initialize='';
my $textarea_id = 'filecont';
- my $dragmath_button;
+ my ($dragmath_button,$deps_button);
my ($add_to_onload, $add_to_onresize);
$initialize=&Apache::lonhtmlcommon::spellheader();
if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) {
- my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
+ my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
my %textarea_args = (
fullpage => 'true',
dragmath => 'math',
);
- $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+ $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
}
$initialize .= (<<FULLPAGE);
<script type="text/javascript">
@@ -1612,6 +1536,12 @@ sub inserteditinfo {
</script>
FULLPAGE
if ($filetype eq 'html') {
+ if ($symb || $folderpath) {
+ $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+ $initialize .=
+ &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
+ undef,$folderpath,$uri)."\n";
+ }
$dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>';
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
}
@@ -1656,7 +1586,7 @@ $initialize
<div class="LC_edit_problem_discards">
<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
- $htmlerror $dragmath_button
+ $htmlerror $deps_button $dragmath_button
</div>
<div class="LC_edit_problem_saves">
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
@@ -1737,8 +1667,10 @@ sub handler {
my ($filetype,$breadcrumbtext);
if ($file =~ /\.(sty|css|js|txt|tex)$/) {
$filetype=$1;
+ $env{'request.uri'}=$request->uri;
} else {
$filetype='html';
+ $env{'request.uri'}=$request->uri;
}
if ($filetype eq 'sty') {
$breadcrumbtext = 'Style File Editor';
@@ -1839,26 +1771,22 @@ ENDNOTFOUND
'<tr><td><b><pre>'.$result.
'</pre></b></td></tr></table>';
}
- if ($env{'environment.remote'} eq 'off') {
- my $brcrum;
- if ($env{'request.state'} eq 'construct') {
- $brcrum = [{'href' => &Apache::loncommon::authorspace(),
- 'text' => 'Construction Space'},
- {'href' => '',
- 'text' => $breadcrumbtext}];
- } else {
- $brcrum = ''; # FIXME: Where are we?
- }
- my %options = ('bread_crumbs' => $brcrum,
- 'bgcolor' => '#FFFFFF');
- $result =
- &Apache::loncommon::start_page(undef,undef,\%options)
- .$controls
- .$result
- .&Apache::loncommon::end_page();
+ my $brcrum;
+ if ($env{'request.state'} eq 'construct') {
+ $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
+ 'text' => 'Construction Space'},
+ {'href' => '',
+ 'text' => $breadcrumbtext}];
} else {
- $result = $controls.$result;
+ $brcrum = ''; # FIXME: Where are we?
}
+ my %options = ('bread_crumbs' => $brcrum,
+ 'bgcolor' => '#FFFFFF');
+ $result =
+ &Apache::loncommon::start_page(undef,undef,\%options)
+ .$controls
+ .$result
+ .&Apache::loncommon::end_page();
}
}
}
@@ -1869,11 +1797,27 @@ ENDNOTFOUND
unless ($env{'request.state'} eq 'published') {
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
{
- my $displayfile=$request->uri;
- $displayfile=~s/^\/[^\/]*//;
+ my ($displayfile,$url,$symb,$itemtitle);
+ $displayfile=$request->uri;
+ if ($request->uri =~ m{^/uploaded/}) {
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\Esupplemental/}) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['folderpath','title']);
+ }
+ }
+ ($symb,$itemtitle,$displayfile) =
+ &get_courseupload_hierarchy($request->uri,
+ $env{'form.folderpath'},$env{'form.title'});
+ } else {
+ $displayfile=~s/^\/[^\/]*//;
+ }
my ($edit_info, $add_to_onload, $add_to_onresize)=
- &inserteditinfo($filecontents,$filetype,$displayfile);
+ &inserteditinfo($filecontents,$filetype,$displayfile,$symb,
+ $itemtitle,$env{'form.folderpath'},$request->uri);
my %options =
('add_entries' =>
@@ -1882,17 +1826,13 @@ ENDNOTFOUND
my $header;
if ($env{'request.state'} eq 'construct') {
$options{'bread_crumbs'} = [{
- 'href' => &Apache::loncommon::authorspace(),
+ 'href' => &Apache::loncommon::authorspace($request->uri),
'text' => 'Construction Space'},
{'href' => '',
'text' => $breadcrumbtext}];
$header = &Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());
}
- if ($env{'environment.remote'} ne 'off') {
- $options{'bgcolor'} = '#FFFFFF';
- $options{'only_body'} = 1;
- }
my $js =
&Apache::edit::js_change_detection().
&Apache::loncommon::resize_textarea_js();
@@ -1927,6 +1867,41 @@ sub display_title {
return $result;
}
+sub get_courseupload_hierarchy {
+ my ($url,$folderpath,$title) = @_;
+ my ($symb,$itemtitle,$displaypath);
+ if ($env{'request.course.id'}) {
+ if ($folderpath =~ /^supplemental/) {
+ my @folders = split(/\&/,$folderpath);
+ my @pathitems;
+ while (@folders) {
+ my $folder=shift(@folders);
+ my $foldername=shift(@folders);
+ push(@pathitems,&unescape($foldername));
+ }
+ if ($title) {
+ push(@pathitems,&unescape($title));
+ }
+ $displaypath = join(' » ',@pathitems);
+ } else {
+ $symb = &Apache::lonnet::symbread($url);
+ my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb);
+ my $navmap=Apache::lonnavmaps::navmap->new;
+ if (ref($navmap)) {
+ my $res = $navmap->getBySymb($symb);
+ if (ref($res)) {
+ my @pathitems =
+ &Apache::loncommon::get_folder_hierarchy($navmap,$map,1);
+ $itemtitle = $res->compTitle();
+ push(@pathitems,$itemtitle);
+ $displaypath = join(' » ',@pathitems);
+ }
+ }
+ }
+ }
+ return ($symb,$itemtitle,$displaypath);
+}
+
sub debug {
if ($Apache::lonxml::debug eq "1") {
$|=1;
@@ -1943,8 +1918,9 @@ sub debug {
}
sub show_error_warn_msg {
- if ($env{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' &&
- &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+ if (($env{'request.filename'} eq
+ $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/lib/templates/simpleproblem.problem') &&
+ (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
return 1;
}
return (($Apache::lonxml::debug eq 1) ||
@@ -2008,7 +1984,7 @@ sub error {
my @userlist;
foreach (keys %users) {
my ($user,$domain) = split(/:/, $_);
- push(@userlist,"$user\@$domain");
+ push(@userlist,"$user:$domain");
my $key=$declutter.'_'.$user.'_'.$domain;
my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications',
[$key],
@@ -2031,7 +2007,7 @@ sub error {
$errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
}
}
- push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
+ push(@Apache::lonxml::error_messages,"<span class=\"LC_warning\">$errormsg</span><br />");
}
}
@@ -2076,16 +2052,25 @@ sub add_messages {
}
sub get_param {
- my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
+ my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_;
+
if ( ! $context ) { $context = -1; }
my $args ='';
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
if ( ! $Apache::lonxml::usestyle ) {
$args=$Apache::lonxml::style_values.$args;
}
+
+
+ if ($noelide) {
+# $args =~ s/\\'/'/g;
+ $args =~ s/'\$/'\\\$/g;
+ }
+
if ( ! $args ) { return undef; }
if ( $case_insensitive ) {
if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {
@@ -2093,6 +2078,7 @@ sub get_param {
}
} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {
@@ -2139,11 +2125,13 @@ sub register_insert_xml {
while (my $token = $parser->get_token()) {
if ($token->[0] eq 'S') {
my $key;
- if ($token->[1] eq 'tag') {
+ if ($token->[1] eq 'tag') {
$tag = $token->[2]{'name'};
- $insertlist{"$tagnum.tag"} = $tag;
- $insertlist{"$tag.num"} = $tagnum;
- push(@alltags,$tag);
+ if (defined($tag)) {
+ $insertlist{$tagnum.'.tag'} = $tag;
+ $insertlist{$tag.'.num'} = $tagnum;
+ push(@alltags,$tag);
+ }
} elsif ($in_help && $token->[1] eq 'file') {
$key = $tag.'.helpfile';
} elsif ($in_help && $token->[1] eq 'description') {
@@ -2175,12 +2163,12 @@ sub register_insert_xml {
# parse the allows and ignore tags set to <show>no</show>
foreach my $tag (@alltags) {
- next if (!exists($insertlist{"$tag.allow"}));
- my $allow = $insertlist{"$tag.allow"};
+ next if (!exists($insertlist{$tag.'.allow'}));
+ my $allow = $insertlist{$tag.'.allow'};
foreach my $element (split(',',$allow)) {
$element =~ s/(^\s*|\s*$ )//gx;
- if (!exists($insertlist{"$element.show"})
- || $insertlist{"$element.show"} ne 'no') {
+ if (!exists($insertlist{$element.'.show'})
+ || $insertlist{$element.'.show'} ne 'no') {
push(@{ $insertlist{$tag.'.which'} },$element);
}
}
@@ -2278,7 +2266,7 @@ sub get_tag {
=item &print_pdf_radiobutton(fieldname, value)
Returns a latexline to generate a PDF-Form-Radiobutton.
-Note: Radiobuttons with equal names are automaticly grouped
+Note: Radiobuttons with equal names are automaticly grouped
in a selection-group.
$fieldname: PDF internalname of the radiobutton(group)