--- loncom/xml/lonxml.pm 2011/10/14 00:40:32 1.521
+++ loncom/xml/lonxml.pm 2012/05/08 15:13:58 1.531
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.521 2011/10/14 00:40:32 www Exp $
+# $Id: lonxml.pm,v 1.531 2012/05/08 15:13:58 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -113,6 +113,7 @@ use Apache::lonr();
use Apache::lonlocal;
use Apache::lonhtmlcommon();
use Apache::functionplotresponse();
+use Apache::lonnavmaps();
#==================================== Main subroutine: xmlparse
@@ -210,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') {
@@ -301,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();
@@ -792,6 +798,10 @@ sub init_safespace {
$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');
@@ -844,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 {
@@ -1014,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
@@ -1491,19 +1502,20 @@ 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) = @_;
$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())) {
@@ -1524,6 +1536,11 @@ sub inserteditinfo {
</script>
FULLPAGE
if ($filetype eq 'html') {
+ if ($symb) {
+ $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+ $initialize .=
+ &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle)."\n";
+ }
$dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>';
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
}
@@ -1568,7 +1585,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'}" />
@@ -1753,7 +1770,7 @@ ENDNOTFOUND
}
my $brcrum;
if ($env{'request.state'} eq 'construct') {
- $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+ $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
'text' => 'Construction Space'},
{'href' => '',
'text' => $breadcrumbtext}];
@@ -1777,11 +1794,17 @@ 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/}) {
+ ($symb,$itemtitle,$displayfile) =
+ &get_courseupload_hierarchy($request->uri);
+ } else {
+ $displayfile=~s/^\/[^\/]*//;
+ }
my ($edit_info, $add_to_onload, $add_to_onresize)=
- &inserteditinfo($filecontents,$filetype,$displayfile);
+ &inserteditinfo($filecontents,$filetype,$displayfile,$symb,$itemtitle);
my %options =
('add_entries' =>
@@ -1790,7 +1813,7 @@ 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}];
@@ -1831,6 +1854,27 @@ sub display_title {
return $result;
}
+sub get_courseupload_hierarchy {
+ my ($url) = @_;
+ my ($symb,$itemtitle,$displaypath);
+ if ($env{'request.course.id'}) {
+ $symb = &Apache::lonnet::symbread();
+ 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;
@@ -1847,8 +1891,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) ||
@@ -1912,7 +1957,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],
@@ -1935,7 +1980,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 />");
}
}
@@ -2043,11 +2088,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') {