--- loncom/xml/lonxml.pm 2002/05/21 02:26:53 1.171
+++ loncom/xml/lonxml.pm 2002/07/01 15:29:23 1.179
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.171 2002/05/21 02:26:53 albertel Exp $
+# $Id: lonxml.pm,v 1.179 2002/07/01 15:29:23 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -135,6 +135,9 @@ $prevent_entity_encode=0;
# has the dynamic menu been updated to know about this resource
$Apache::lonxml::registered=0;
+# a pointer the the Apache request object
+$Apache::lonxml::request='';
+
sub xmlbegin {
my $output='';
if ($ENV{'browser.mathml'}) {
@@ -328,15 +331,22 @@ sub registerurl {
my $forcereg=shift;
my $target = shift;
my $result = '';
- if (($ENV{'request.publicaccess'}) ||
- ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html')) {
- return
+ if ($target eq 'edit') {
+ $result .="<script>\n menu.currentURL=null;\n".
+ &Apache::loncommon::browser_and_searcher_javascript().
+ "\n</script>\n";
+ }
+ if ((($ENV{'request.publicaccess'}) ||
+ (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
+ (!$forcereg)) {
+ return $result.
'<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';
}
if ($Apache::lonxml::registered && !$forcereg) { return ''; }
$Apache::lonxml::registered=1;
my $nothing='';
if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+ my $timesync='menu.clock.setTime(1000*'.time.');';
if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
my $hwkadd='';
if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
@@ -364,7 +374,9 @@ ENDPARM
function LONCAPAreg() {
menu=window.open("$nothing","LONCAPAmenu","",false);
menu.clearTimeout(menu.menucltim);
+ $timesync
menu.currentURL=window.location.pathname;
+ menu.reloadURL=window.location.pathname;
menu.currentStale=0;
menu.clearbut(3,1);
menu.switchbutton
@@ -391,8 +403,10 @@ ENDPARM
function LONCAPAstale() {
menu=window.open("$nothing","LONCAPAmenu","",false);
menu.currentStale=1;
- menu.switchbutton
- (3,1,'reload.gif','return','location','go(currentURL)');
+ if (menu.reloadURL!='' && menu.reloadURL!= null) {
+ menu.switchbutton
+ (3,1,'reload.gif','return','location','go(reloadURL)');
+ }
menu.clearbut(7,1);
menu.clearbut(7,2);
menu.clearbut(7,3);
@@ -415,6 +429,7 @@ ENDREGTHIS
function LONCAPAreg() {
menu=window.open("$nothing","LONCAPAmenu","",false);
+ $timesync
menu.currentStale=1;
menu.clearbut(2,1);
menu.clearbut(2,3);
@@ -436,61 +451,6 @@ ENDREGTHIS
</script>
ENDDONOTREGTHIS
}
- if ($target eq 'edit') {
- # Javascript routines for construction space:
- # openbrowser and opensearcher will start the file browser
- # (lonindexer) and searcher (lonsearchcat) respectively.
- # Inputs are the name of the html form being used
- # and the name of the element the selected URL should
- # be placed in.
- # openbrowser also takes arguments only and omit, which are
- # comma deliminated lists of file extensions to (only) show
- # or omit.
- # Here we also set currentURL=null.
- $result .=<<"ENDBROWSERSCRIPT";
-<script>
- menu.currentURL=null;
- var editbrowser;
- function openbrowser(formname,elementname,only,omit) {
- var url = '/res/?';
- if (editbrowser == null) {
- url += 'launch=1&';
- }
- url += 'catalogmode=interactive&';
- url += 'mode=edit&';
- url += 'form=' + formname + '&';
- if (only != null) {
- url += 'only=' + only + '&';
- }
- if (omit != null) {
- url += 'omit=' + omit + '&';
- }
- url += 'element=' + elementname + '';
- var title = 'Browser';
- var options = 'scrollbars=1,resizable=1,menubar=0';
- options += ',width=700,height=600';
- editbrowser = open(url,title,options,'1');
- editbrowser.focus();
- }
- var editsearcher;
- function opensearcher(formname,elementname) {
- var url = '/adm/searchcat?';
- if (editsearcher == null) {
- url += 'launch=1&';
- }
- url += 'catalogmode=interactive&';
- url += 'mode=edit&';
- url += 'form=' + formname + '&';
- url += 'element=' + elementname + '';
- var title = 'Search';
- var options = 'scrollbars=1,resizable=1,menubar=0';
- options += ',width=700,height=600';
- editsearcher = open(url,title,options,'1');
- editsearcher.focus();
- }
-</script>
-ENDBROWSERSCRIPT
- }
return $result;
}
@@ -511,9 +471,26 @@ sub printalltags {
}
sub xmlparse {
- my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
+ my ($request,$target,$content_file_string,$safeinit,%style_for_target) = @_;
+
+ &setup_globals($request,$target);
+#
+# do we have a course style file?
+#
+
+ if ($ENV{'request.course.id'}) {
+ my $bodytext=
+ $ENV{'course.'.$ENV{'request.course.id'}.'.default_xml_style'};
+ if ($bodytext) {
+ my $location=&Apache::lonnet::filelocation('',$bodytext);
+ my $styletext=&Apache::lonnet::getfile($location);
+ if ($styletext ne '-1') {
+ %style_for_target = (%style_for_target,
+ &Apache::style::styleparser($target,$styletext));
+ }
+ }
+ }
- &setup_globals($target);
#&printalltags();
my @pars = ();
my $pwd=$ENV{'request.filename'};
@@ -798,7 +775,8 @@ sub callsub {
}
sub setup_globals {
- my ($target)=@_;
+ my ($request,$target)=@_;
+ $Apache::lonxml::request=$request;
$Apache::lonxml::registered = 0;
@Apache::lonxml::pwd=();
@Apache::lonxml::extlinks=();
@@ -1219,7 +1197,8 @@ ENDNOTFOUND
}
}
if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
- $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
+ $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
+ '',%mystyle);
}
}
@@ -1228,7 +1207,10 @@ ENDNOTFOUND
#
unless ($ENV{'request.state'} eq 'published') {
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
- $result='<html><body bgcolor="#FFFFFF"></body></html>';
+ my $displayfile=$request->uri;
+ $displayfile=~s/^\/[^\/]*//;
+ $result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile.
+ '</h3></body></html>';
$result=&inserteditinfo($result,$filecontents);
}
}