--- loncom/xml/lonxml.pm 2017/09/24 01:52:53 1.558
+++ loncom/xml/lonxml.pm 2024/04/14 17:12:28 1.570
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.558 2017/09/24 01:52:53 raeburn Exp $
+# $Id: lonxml.pm,v 1.570 2024/04/14 17:12:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,6 +70,7 @@ use Safe::Hole();
use Math::Cephes();
use Math::Random();
use Math::Calculus::Expression();
+use Number::FormatEng();
use Opcode();
use POSIX qw(strftime);
use Time::HiRes qw( gettimeofday tv_interval );
@@ -821,6 +822,8 @@ sub init_safespace {
$safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength');
$safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle');
$safehole->wrap(\&Math::Calculus::Expression::math_calculus_expression,$safeeval,'&math_calculus_expression');
+ $safehole->wrap(\&Number::FormatEng::format_eng,$safeeval,'&number_format_eng');
+ $safehole->wrap(\&Number::FormatEng::format_pref,$safeeval,'&number_format_pref');
# use Data::Dumper;
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');
@@ -1610,8 +1613,9 @@ FULLPAGE
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
- 'un' => 'undo',
- 'ed' => 'Edit');
+ 'un' => 'Undo',
+ 'ed' => 'Edit',
+ 'ew' => 'Edit with Daxe');
my $spelllink = &Apache::lonhtmlcommon::spelllink('xmledit','filecont');
my $textarea_events = &Apache::edit::element_change_detection();
my $form_events = &Apache::edit::form_change_detection();
@@ -1619,7 +1623,7 @@ FULLPAGE
if ($filetype eq 'html') {
$htmlerror=&verify_html($filecontents);
if ($htmlerror) {
- $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
+ $htmlerror=(' 'x3).' <span class="LC_error">'.$htmlerror.'</span>';
}
if (&Apache::lonhtmlcommon::htmlareabrowser()) {
unless ($textareaclass) {
@@ -1627,14 +1631,30 @@ FULLPAGE
}
}
}
- my $undo;
+ my ($undo,$daxebutton,%onclick);
+ foreach my $item ('discard','undo','daxe') {
+ $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"';
+ }
+ foreach my $item ('saveedit','saveview') {
+ $onclick{$item} = 'onclick="is_submit=true;setmode(this.form,'."'$item'".')"';
+ }
unless ($uri =~ m{^/uploaded/}) {
- $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" />'."\n";
+ $undo = '<input type="button" name="Undo" accesskey="u" value="'.$lt{'un'}.'" '.
+ $onclick{'undo'}.' />'."\n";
+ }
+ $initialize .= &setmode_javascript();
+ if ($filetype eq 'html') {
+ my %editors = &Apache::loncommon::permitted_editors();
+ if ($editors{'daxe'}) {
+ $daxebutton = '<input type="button" name="editwithdaxe" accesskey="w" value="'.$lt{'ew'}.'" '.
+ $onclick{'daxe'}.' />'."\n";
+ }
}
my $editfooter=(<<ENDFOOTER);
$initialize
<a name="editsection" />
<form $form_events method="post" name="xmledit" action="$action">
+ <input type="hidden" name="problemmode" value="edit" />
<div class="LC_edit_problem_editxml_header">
<table class="LC_edit_problem_header_title"><tr><td>
$filename
@@ -1642,13 +1662,13 @@ $initialize
$xml_help
</td></tr>
</table>
- <div>
- <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
- $undo $htmlerror $deps_button $dragmath_button
- </div>
<div style="float:right">
- <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
- <input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
+ <input type="button" name="savethisfile" accesskey="s" value="$lt{'st'}" $onclick{'saveedit'} />
+ <input type="button" name="viewmode" accesskey="v" value="$lt{'vi'}" $onclick{'saveview'} />
+ </div>
+ <div>
+ <input type="button" name="discardview" accesskey="d" value="$lt{'dv'}" $onclick{'discard'} />
+ $undo $deps_button $daxebutton $dragmath_button $htmlerror
</div>
</div>
<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
@@ -1658,7 +1678,95 @@ $initialize
</div>
</form>
ENDFOOTER
- return ($editfooter,$add_to_onload,$add_to_onresize);;
+ return ($editfooter,$add_to_onload,$add_to_onresize);
+}
+
+sub setmode_javascript {
+ return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function setmode(form,probmode) {
+ if (probmode == 'daxe') {
+ var url = new URL(document.location.href);
+ window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+ } else {
+ var initial = form.problemmode.value;
+ form.problemmode.value = probmode;
+ form.submit();
+ form.problemmode.value = initial;
+ }
+}
+// ]]>
+</script>
+ENDSCRIPT
+}
+
+sub seteditor_javascript {
+ my ($is_course_doc,$is_supp,$supp_path,$supp_title) = @_;
+ my $symb;
+ if ($is_course_doc) {
+ if (!$is_supp) {
+ ($symb) = &Apache::lonnet::whichuser();
+ if ($symb) {
+ $symb = &escape($symb);
+ }
+ }
+ }
+ return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function seteditmode(form,editor) {
+ var querystr = '';
+ var supplemental = '$is_supp';
+ var coursedoc = '$is_course_doc';
+ if (coursedoc) {
+ if (supplemental) {
+ var supppath = '$supp_path';
+ var supptitle = '$supp_title';
+ if (supppath) {
+ querystr = 'folderpath='+supppath;
+ }
+ if (supptitle) {
+ if (querystr) {
+ querystr += '&';
+ }
+ querystr += 'title='+supptitle;
+ }
+ }
+ }
+ if (editor == 'daxe') {
+ var url = new URL(document.location.href);
+ var newloc = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+ if (querystr) {
+ if (/\\?/.test(url.pathname)) {
+ newloc += '&';
+ } else {
+ newloc += '?';
+ }
+ newloc += querystr;
+ }
+ window.location = newloc;
+ } else {
+ if (coursedoc) {
+ form.action += '?forceedit=1';
+ if (!supplemental) {
+ form.action += '®ister=1';
+ }
+ if (querystr) {
+ form.action += '&'+querystr;
+ }
+ }
+ if (editor == 'edit') {
+ form.editmode.value = editor;
+ } else {
+ form.editmode.value = '';
+ }
+ form.submit();
+ }
+}
+// ]]>
+</script>
+ENDSCRIPT
}
sub get_target {
@@ -1763,11 +1871,13 @@ sub handler {
# Edit action? Save file.
#
if (!($env{'request.state'} eq 'published')) {
- if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) {
+ if (($env{'form.problemmode'} eq 'saveedit') ||
+ ($env{'form.problemmode'} eq 'saveview') ||
+ ($env{'form.problemmode'} eq 'undo')) {
my $html_file=&Apache::lonnet::getfile($file);
my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'});
- if ($env{'form.savethisfile'}) {
- $env{'form.editmode'}='Edit'; #force edit mode
+ if ($env{'form.problemmode'} eq 'saveedit') {
+ $env{'form.editmode'}='edit'; #force edit mode
}
}
}
@@ -1796,7 +1906,7 @@ ENDNOTFOUND
} elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') {
$filecontents=&createnewhtml();
}
- $env{'form.editmode'}='Edit'; #force edit mode
+ $env{'form.editmode'}='edit'; #force edit mode
}
} else {
unless ($env{'request.state'} eq 'published') {
@@ -1808,7 +1918,9 @@ ENDNOTFOUND
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['editmode']);
}
- if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
+ if ((!$env{'form.editmode'}) ||
+ ($env{'form.problemmode'} eq 'saveview') ||
+ ($env{'form.problemmode'} eq 'discard')) {
if ($filetype eq 'html' || $filetype eq 'sty') {
&Apache::structuretags::reset_problem_globals();
$result = &Apache::lonxml::xmlparse($request,$target,
@@ -1854,8 +1966,17 @@ ENDNOTFOUND
}
my $brcrum;
if ($env{'request.state'} eq 'construct') {
- $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
+ $brcrum = [{'href' => $href,
+ 'text' => $text,},
{'href' => '',
'text' => $breadcrumbtext}];
} else {
@@ -1876,8 +1997,9 @@ ENDNOTFOUND
# Edit action? Insert editing commands
#
unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) {
- if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
- {
+ if (($env{'form.editmode'}) &&
+ (!($env{'form.problemmode'} eq 'saveview')) &&
+ (!($env{'form.problemmode'} eq 'discard'))) {
my ($displayfile,$url,$symb,$itemtitle,$action);
$displayfile=$request->uri;
if ($request->uri =~ m{^/uploaded/}) {
@@ -1885,6 +2007,10 @@ ENDNOTFOUND
if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','title']);
+ if (($env{'request.state'} eq 'edit') && ($env{'form.editmode'} eq 'edit') &&
+ ($filetype eq 'html')) {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ }
} elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
my $filename = $1;
if ($1 eq 'loncapa.html') {
@@ -1916,9 +2042,18 @@ ENDNOTFOUND
'onload' => $add_to_onload, });
my $header;
if ($env{'request.state'} eq 'construct') {
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
$options{'bread_crumbs'} = [{
- 'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ 'href' => $href,
+ 'text' => $text},
{'href' => '',
'text' => $breadcrumbtext}];
$header = &Apache::loncommon::head_subbox(
@@ -1973,6 +2108,7 @@ sub get_courseupload_hierarchy {
}
if ($title) {
push(@pathitems,&unescape($title));
+ $itemtitle = $title;
}
$displaypath = join(' » ',@pathitems);
} else {
@@ -2274,7 +2410,7 @@ sub register_insert {
sub dump_insertlist {
my ($ext) = @_;
- open(XML,">/tmp/insertlist.xml.$ext");
+ open(XML,">","/tmp/insertlist.xml.$ext");
print XML ("<insertlist>");
my $i=0;