version 1.113, 2004/08/04 18:04:57
|
version 1.114, 2004/08/10 18:01:25
|
Line 65 sub discussion_visible {
|
Line 65 sub discussion_visible {
|
} |
} |
|
|
sub list_discussion { |
sub list_discussion { |
my ($mode,$status,$symb)=@_; |
my ($mode,$status,$symb,$ttarget,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $outputtarget=$ENV{'form.grade_target'}; |
my $outputtarget=$ENV{'form.grade_target'}; |
if (not &discussion_visible($status)) { return ''; } |
if (not &discussion_visible($status)) { return ''; } |
my @bgcols = ("#cccccc","#eeeeee"); |
my @bgcols = ("#cccccc","#eeeeee"); |
Line 682 sub list_discussion {
|
Line 682 sub list_discussion {
|
} |
} |
$discussion .= '</tr></table></td></tr>'; |
$discussion .= '</tr></table></td></tr>'; |
} else { |
} else { |
$discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'. |
$discussion.='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'. |
'\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'. |
'\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'. |
'\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'. |
'\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'. |
'\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'. |
'\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'. |
'\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}'; |
'\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}</tex>'; |
} |
} |
my $numhidden = keys %notshown; |
my $numhidden = keys %notshown; |
if ($numhidden > 0) { |
if ($numhidden > 0) { |
Line 739 sub list_discussion {
|
Line 739 sub list_discussion {
|
unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) { |
unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) { |
if ($outputtarget ne 'tex') { |
if ($outputtarget ne 'tex') { |
$discussion.="\n<tr>"; |
$discussion.="\n<tr>"; |
} else { |
|
$discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'; |
|
} |
} |
my $thisdepth=$depth[$alldiscussion{$_}]; |
my $thisdepth=$depth[$alldiscussion{$_}]; |
if ($outputtarget ne 'tex') { |
if ($outputtarget ne 'tex') { |
Line 764 sub list_discussion {
|
Line 762 sub list_discussion {
|
$discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/; |
$discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/; |
$discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g; |
$discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g; |
$discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g; |
$discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g; |
|
|
#FIXME xmlparse can't be safely called from inside xmlparse |
$discussionitems[$alldiscussion{$_}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$_}]; |
# due to the global variables that are use, the safe |
if ($_ eq $showposts[-1]) { |
# space etc. I expect this has unforseen issues that |
$discussionitems[$alldiscussion{$_}].='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>'; |
# need resolving. |
} |
|
$discussion.=$discussionitems[$alldiscussion{$_}]; |
$discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]); |
|
} |
} |
} |
} |
} |
} |
Line 829 END
|
Line 826 END
|
</table> |
</table> |
<br /><br /></form> |
<br /><br /></form> |
END |
END |
} |
} |
} |
} |
if ($discussiononly) { |
if ($discussiononly) { |
my $now = time; |
my $now = time; |
Line 901 ENDDISCUSS
|
Line 898 ENDDISCUSS
|
} |
} |
} |
} |
} |
} |
return $discussion; |
return $discussion; |
} |
} |
|
|
sub mail_screen { |
sub mail_screen { |