--- loncom/homework/structuretags.pm 2003/06/30 20:21:43 1.191
+++ loncom/homework/structuretags.pm 2003/08/13 17:54:12 1.203
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.191 2003/06/30 20:21:43 sakharuk Exp $
+# $Id: structuretags.pm,v 1.203 2003/08/13 17:54:12 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,14 +38,15 @@ use Apache::File();
use Apache::lonmenu;
BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
+'simpleeditbutton','definetag'));
}
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
- $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
- my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ if ($target eq 'web') {
+ return $bodytext;
}
return '';
}
@@ -56,12 +57,12 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' ||
- $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
- &Apache::lonxml::debug("tex 1");
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ my $result='';
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ if ($target eq 'tex') {
+ return $bodytext.' ';
}
- return '';
+ return $result;;
}
sub end_tex {
@@ -90,6 +91,7 @@ sub page_start {
'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
my $background=&Apache::lonxml::get_param('background',$parstack,
$safeeval);
+ if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
if ($background) {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$background;
@@ -97,12 +99,15 @@ sub page_start {
} else {
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
$safeeval);
- if ($bgcolor) {
+ if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
$body_tag_start.='bgcolor="'.$bgcolor.'" ';
} else {
$body_tag_start.='bgcolor="#ffffff"';
}
}
+ if ($ENV{'browser.fontenhance'} eq 'on') {
+ $body_tag_start.=' style="font-size: x-large;" ';
+ }
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
my ($symb,undef,undef,undef,$publicuser)=
@@ -405,9 +410,9 @@ sub start_problem {
"
$name\n$body_tag_start\n";
}
} elsif ($target eq 'tex') {
- my $startminipage = ' SSS '.$ENV{'form.problem_split'}.' FFF ';
+ my $startminipage = '';
if (not $ENV{'form.problem_split'}=~/yes/) {
- $startminipage .= '\begin{minipage}{\textwidth}';
+ $startminipage = '\begin{minipage}{\textwidth}';
}
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq '') {
@@ -438,14 +443,19 @@ sub start_problem {
my $due_file_content = $due_file_content[$#due_file_content];
chomp $due_file_content;
my $name_of_resourse= &get_resource_name($parstack,$safeeval);
+ if (not $name_of_resourse=~/\S+/) {
+ $name_of_resourse=$ENV{'request.uri'};
+ $name_of_resourse=~/\/([^\/]+)$/;
+ $name_of_resourse=$1;
+ }
if ($due_file_content ne $duedate) {
$temp_file = Apache::File->new('>'.$filename);
print $temp_file "$duedate\n";
if (not $ENV{'request.symb'} =~ m/\.page_/) {
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;
} else {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage;
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm \noindent'.$startminipage;
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
@@ -453,7 +463,7 @@ sub start_problem {
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage;
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm\noindent'.$startminipage;
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -595,15 +605,39 @@ sub end_library {
return $result;
}
-sub start_block {
+sub start_definetag {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
+ my $name = $token->[2]->{'name'};
+ my $skip=&Apache::lonxml::get_all_text("/definetag",$parser);
+ if ($name=~/^\//) {
+ $result=
+ '
END '.$name.' |
';
+ } else {
+ $result=
+ '
BEGIN '.$name.' |
';
+ }
+ $skip=~s/\\<\;/gs;
+ $skip=~s/\>/\>\;/gs;
+ $result.=''.$skip.' |
';
+ return $result;
+}
+
+sub end_definetag {
+ return '';
+}
+
+sub start_block {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+ my $result;
+
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
my $code = $token->[2]->{'condition'};
- if ($code) {
+ if (defined($code)) {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -613,7 +647,7 @@ sub start_block {
$result='1';
}
if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/block",$parser);
+ my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
}
$result='';
@@ -640,13 +674,33 @@ sub end_block {
}
sub start_languageblock {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::startredirection();
+ my $include = $token->[2]->{'include'};
+ my $exclude = $token->[2]->{'exclude'};
+ my %languages=&Apache::loncommon::display_languages();
+ $result='1';
+ if ($include) {
+ $result='';
+ foreach (split(/\,/,$include)) {
+ if ($languages{$_}) { $result='1'; }
+ }
+ }
+ if ($exclude) {
+ foreach (split(/\,/,$exclude)) {
+ if ($languages{$_}) { $result='0'; }
+ }
+ }
+ if ( ! $result ) {
+ my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
+ $style);
+ &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+ }
+ $result='';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Include Language:','include',
@@ -666,38 +720,14 @@ sub start_languageblock {
sub end_languageblock {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
- $target eq 'tex' || $target eq 'analyze') {
- my $text=&Apache::lonxml::endredirection();
- my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval);
- my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval);
- my %languages=&Apache::loncommon::display_languages();
- $result='1';
- if ($include) {
- $result='';
- foreach (split(/\,/,$include)) {
- if ($languages{$_}) { $result='1'; }
- }
- }
- if ($exclude) {
- foreach (split(/\,/,$exclude)) {
- if ($languages{$_}) { $result='0'; }
- }
- }
- if ( ! $result ) {
- $result='';
- } else {
- $result=$text;
- }
- } elsif ($target eq "edit") {
+ if ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
}
return $result;
}
sub start_instructorcomment {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -705,7 +735,8 @@ sub start_instructorcomment {
$target eq 'tex' || $target eq 'analyze') {
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);
+ my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
+ $parser,$style);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
}
$result='';
@@ -901,11 +932,17 @@ sub start_part {
if ( $target eq "web" ) {
$result="
Part is not open to be viewed. It $accessmsg
";
} elsif ( $target eq 'tex' ) {
- $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
+ if (not $ENV{'form.problem_split'}=~/yes/) {
+ $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
+ } else {
+ $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+ }
}
} else {
if ($target eq 'tex') {
- $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ if (not $ENV{'form.problem_split'}=~/yes/) {
+ $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ }
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
@@ -1082,5 +1119,23 @@ sub delete_startouttext {
return 1;
}
+sub start_simpleeditbutton {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result='';
+ if (($target eq 'web') &&
+ (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+ my $url=$ENV{'REQUEST_URI'};
+ $url=~s/\?.*$//;
+ $result=''.
+ 'Simple Problem Editor - Note: it can take up to 10 minutes for changes to take effect for all users.'.
+&Apache::loncommon::help_open_topic('Caching').' |
';
+ }
+ return $result;
+}
+
+sub end_simpleeditbutton {
+ return '';
+}
+
1;
__END__