loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.435 and 1.437

version 1.435, 2006/04/06 22:32:07	version 1.437, 2006/04/18 10:03:45
Line 1119 ENDPART	Line 1119 ENDPART
$selectionmade = 1;	$selectionmade = 1;
if ($cleanURL!~m\|^/adm/\|	if ($cleanURL!~m\|^/adm/\|
&& $cleanURL=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {	&& $cleanURL=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {
	if ($cleanURL =~/\.page/) {
	}
my $rndseed=time;	my $rndseed=time;
my $texversion='';	my $texversion='';
if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {	if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
Line 1319 ENDPART	Line 1321 ENDPART
my $texversion='';	my $texversion='';
if ($urlp!~m\|^/adm/\|	if ($urlp!~m\|^/adm/\|
&& $urlp=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {	&& $urlp=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {
	if ($urlp =!/\.page/) {
	}
$resources_printed .= $urlp.':';	$resources_printed .= $urlp.':';

&Apache::lonxml::remember_problem_counter();	&Apache::lonxml::remember_problem_counter();
Line 1824 sub print_resources {	Line 1828 sub print_resources {
if (&Apache::lonnet::allowed('bre',$res_url)) {	if (&Apache::lonnet::allowed('bre',$res_url)) {
if ($res_url!~m\|^ext/\|	if ($res_url!~m\|^ext/\|
&& $res_url=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {	&& $res_url=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page\|xml\|html\|htm\|xhtml\|xhtm)$/) {
	if ($res_url =~ /\.page/) {
	}
$printed .= $curresline.':';	$printed .= $curresline.':';

&Apache::lonxml::remember_problem_counter();	&Apache::lonxml::remember_problem_counter();
Line 2260 RESOURCE_SELECTOR	Line 2266 RESOURCE_SELECTOR
<choice computer='0'>Sort by section then student</choice>	<choice computer='0'>Sort by section then student</choice>
<choice computer='1'>Sort by students across sections.</choice>	<choice computer='1'>Sort by students across sections.</choice>
</choices>	</choices>
	<message><br /><hr /><br /> </message>
<student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>	<student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
</state>	</state>
$resource_selector	$resource_selector
Line 2293 CHOOSE_STUDENTS	Line 2300 CHOOSE_STUDENTS
}	}
push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);	push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
}	}
$code_selection .=	if (%codes_to_print) {
'	$code_selection .='
<exec>	<exec>
push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});	push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
</exec>	</exec>
'.$/;	'.$/;
	}


open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
Line 2418 RESOURCE_SELECTOR	Line 2426 RESOURCE_SELECTOR
<choice computer='0'>Sort by section then student</choice>	<choice computer='0'>Sort by section then student</choice>
<choice computer='1'>Sort by students across sections.</choice>	<choice computer='1'>Sort by students across sections.</choice>
</choices>	</choices>
	<message><br /><hr /><br /></message>
<student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />	<student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />

</state>	</state>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.435
changed lines
	Added in v.1.437