loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.344.2.10.4.6 and 1.379

version 1.344.2.10.4.6, 2024/02/21 19:57:06	version 1.379, 2023/11/07 12:26:00
Line 49 use Apache::matchresponse();	Line 49 use Apache::matchresponse();
use Apache::chemresponse();	use Apache::chemresponse();
use Apache::functionplotresponse();	use Apache::functionplotresponse();
use Apache::drawimage();	use Apache::drawimage();
	use Apache::loncapamath();
use Apache::loncourseuser();	use Apache::loncourseuser();
use Apache::grades();	use Apache::grades();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
Line 225 sub check_slot_access {	Line 226 sub check_slot_access {
return ($status,$datemsg);	return ($status,$datemsg);
}	}

if ($status eq 'SHOW_ANSWER' \|\|	my $checkin = 'resource.0.checkedin';
$status eq 'CLOSED' \|\|	my $version;
	if ($type eq 'Task') {
	$version=$Apache::lonhomework::history{'resource.version'};
	$checkin = "resource.$version.0.checkedin";
	}
	my $checkedin = $Apache::lonhomework::history{$checkin};
	my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip,
	$consumed_uniq);
	$now = time;
	$ip=$ENV{'REMOTE_ADDR'} \|\| $env{'request.host'};

	if ($checkedin) {
	$checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
	my %slot=&Apache::lonnet::get_slot($checkinslot);
	$consumed_uniq = $slot{'uniqueperiod'};
	if ($slot{'iptied'}) {
	$ipused = $Apache::lonhomework::history{"$checkin.ip"};
	unless (($ip ne '') &&
	(($ipused eq $ip) \|\| ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) {
	$blockip = $slot{'iptied'};
	$slot_name = $checkinslot;
	$returned_slot = \%slot;
	}
	}
	}

	if ($status eq 'SHOW_ANSWER') {
	if ($blockip eq 'answer') {
	return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
	} else {
	return ($status,$datemsg);
	}
	}

	if ($status eq 'CLOSED' \|\|
$status eq 'INVALID_ACCESS' \|\|	$status eq 'INVALID_ACCESS' \|\|
$status eq 'UNAVAILABLE') {	$status eq 'UNAVAILABLE') {
return ($status,$datemsg);	return ($status,$datemsg);
Line 234 sub check_slot_access {	Line 269 sub check_slot_access {
if ($env{'request.state'} eq "construct") {	if ($env{'request.state'} eq "construct") {
return ($status,$datemsg);	return ($status,$datemsg);
}	}

if ($type eq 'Task') {	if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.version'};	if ($checkedin &&
if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {	$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
return ('SHOW_ANSWER');	if ($blockip eq 'answer') {
}	return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
	} else {
	return ('SHOW_ANSWER');
	}
	}
} elsif (($type eq 'problem') &&	} elsif (($type eq 'problem') &&
($Apache::lonhomework::browse eq 'F') &&	($Apache::lonhomework::browse eq 'F') &&
($ENV{'REMOTE_ADDR'} eq '127.0.0.1') &&	($ENV{'REMOTE_ADDR'} eq '127.0.0.1') &&
Line 256 sub check_slot_access {	Line 294 sub check_slot_access {
# if (!@slots) {	# if (!@slots) {
# return ($status,$datemsg);	# return ($status,$datemsg);
# }	# }
	undef($returned_slot);
	undef($slot_name);
my $slotstatus='NOT_IN_A_SLOT';	my $slotstatus='NOT_IN_A_SLOT';
my ($returned_slot,$slot_name);
my $now = time;
my $num_usable_slots = 0;	my $num_usable_slots = 0;
unless ($symb) {	if (!$symb) {
($symb) = &Apache::lonnet::whichuser();	($symb) = &Apache::lonnet::whichuser();
}	}
foreach my $slot (@slots) {	foreach my $slot (@slots) {
Line 273 sub check_slot_access {	Line 311 sub check_slot_access {
if ($slot{'starttime'} < $now &&	if ($slot{'starttime'} < $now &&
$slot{'endtime'} > $now &&	$slot{'endtime'} > $now &&
&Apache::loncommon::check_ip_acc($slot{'ip'})) {	&Apache::loncommon::check_ip_acc($slot{'ip'})) {
&Apache::lonxml::debug("$slot is good");	if ($slot{'iptied'}) {
$slotstatus='NEEDS_CHECKIN';	if ($env{'request.course.id'}) {
$returned_slot=\%slot;	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$slot_name=$slot;	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
last;	if ($slot eq $checkinslot) {
}	if ($ip eq $ipused) {
	&Apache::lonxml::debug("$slot is good");
	$slotstatus ='NEEDS_CHECKIN';
	} else {
	$slotstatus = 'NEED_DIFFERENT_IP';
	$slot_name = $slot;
	$returned_slot = \%slot;
	last;
	}
	} elsif ($ip) {
	my $uniqkey = "$slot\0$symb\0$ip";
	my %used_ip = &Apache::lonnet::get('slot_uniqueips',[$uniqkey],$cdom,$cnum);
	if ($used_ip{$uniqkey}) {
	$slotstatus = 'NEED_DIFFERENT_IP';
	} else {
	&Apache::lonxml::debug("$slot is good");
	$slotstatus ='NEEDS_CHECKIN';
	}
	}
	}
	} else {
	&Apache::lonxml::debug("$slot is good");
	$slotstatus='NEEDS_CHECKIN';
	}
	if ($slotstatus eq 'NEEDS_CHECKIN') {
	$returned_slot=\%slot;
	$slot_name=$slot;
	last;
	}
	}
}	}
if ($slotstatus eq 'NEEDS_CHECKIN' &&	if ($slotstatus eq 'NEEDS_CHECKIN' &&
&proctor_checked_in($slot_name,$returned_slot,$type)) {	&proctor_checked_in($slot_name,$returned_slot,$type)) {
Line 286 sub check_slot_access {	Line 353 sub check_slot_access {
$slotstatus=$status;	$slotstatus=$status;
}	}

my ($is_correct,$got_grade,$checkin,$checkinslot,$checkedin,$consumed_uniq);	my ($is_correct,$got_grade);
if ($type eq 'Task') {	if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.0.version'};	my $version=$Apache::lonhomework::history{'resource.0.version'};
$checkin = "resource.$version.0.checkedin";
$got_grade =	$got_grade =
($Apache::lonhomework::history{"resource.$version.0.status"}	($Apache::lonhomework::history{"resource.$version.0.status"}
=~ /^(?:pass\|fail)$/);	=~ /^(?:pass\|fail)$/);
$is_correct =	$is_correct =
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'	($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
\|\| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );	\|\| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
$checkedin =
$Apache::lonhomework::history{"resource.$version.0.checkedin"};
} elsif (($type eq 'problem') \|\| ($type eq 'tool')) {	} elsif (($type eq 'problem') \|\| ($type eq 'tool')) {
$checkin = 'resource.0.checkedin';
$checkedin = $Apache::lonhomework::history{$checkin};
}
if ($checkedin) {
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
my %slot=&Apache::lonnet::get_slot($checkinslot);
$consumed_uniq = $slot{'uniqueperiod'};
}
if (($type eq 'problem') \|\| ($type eq 'tool')) {
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {	if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
my ($numcorrect,$numgraded) = (0,0);	my ($numcorrect,$numgraded) = (0,0);
foreach my $part (@{$partlist}) {	foreach my $part (@{$partlist}) {
Line 371 sub check_slot_access {	Line 426 sub check_slot_access {
if (!defined($slot_name) && (($type eq 'problem') \|\| ($type eq 'tool'))) {	if (!defined($slot_name) && (($type eq 'problem') \|\| ($type eq 'tool'))) {
if ($slotstatus eq 'NOT_IN_A_SLOT') {	if ($slotstatus eq 'NOT_IN_A_SLOT') {
if (!$num_usable_slots) {	if (!$num_usable_slots) {
if ($env{'request.course.id'}) {	($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin,
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$consumed_uniq);
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
$slotstatus = 'NOTRESERVABLE';
my ($reservable_now_order,$reservable_now,$reservable_future_order,
$reservable_future) =
&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
if (@{$reservable_now_order} > 0) {
if ((!$checkedin) \|\| (ref($consumed_uniq) ne 'ARRAY')) {
$slotstatus = 'RESERVABLE';
$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
} else {
my ($uniqstart,$uniqend,$useslot);
if (ref($consumed_uniq) eq 'ARRAY') {
($uniqstart,$uniqend)=@{$consumed_uniq};
}
foreach my $slot (reverse(@{$reservable_now_order})) {
if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
my ($new_uniq_start,$new_uniq_end) = ($1,$2);
next if (!
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) \|\|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
}
$useslot = $slot;
last;
}
if ($useslot) {
$slotstatus = 'RESERVABLE';
$datemsg = $reservable_now->{$useslot}{'endreserve'};
}
}
}
}
unless ($slotstatus eq 'RESERVABLE') {
if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
if (@{$reservable_future_order} > 0) {
if ((!$checkedin) \|\| (ref($consumed_uniq) ne 'ARRAY')) {
$slotstatus = 'RESERVABLE_LATER';
$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
} else {
my ($uniqstart,$uniqend,$useslot);
if (ref($consumed_uniq) eq 'ARRAY') {
($uniqstart,$uniqend)=@{$consumed_uniq};
}
foreach my $slot (@{$reservable_future_order}) {
if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
my ($new_uniq_start,$new_uniq_end) = ($1,$2);
next if (!
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) \|\|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
}
$useslot = $slot;
last;
}
if ($useslot) {
$slotstatus = 'RESERVABLE_LATER';
$datemsg = $reservable_future->{$useslot}{'startreserve'};
}
}
}
}
}
}
}	}
}	}
return ($slotstatus,$datemsg);	return ($slotstatus,$datemsg);
Line 444 sub check_slot_access {	Line 437 sub check_slot_access {
&& $checkedin ) {	&& $checkedin ) {

if ($got_grade) {	if ($got_grade) {
return ('SHOW_ANSWER');	if ($blockip eq 'answer') {
	return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused);
	} else {
	return ('SHOW_ANSWER');
	}
} else {	} else {
return ('WAITING_FOR_GRADE');	return ('WAITING_FOR_GRADE');
}	}

}	}

if ( $is_correct) {	if (($is_correct) && ($blockip ne 'answer')) {
if (($type eq 'problem') \|\| ($type eq 'tool')) {	if (($type eq 'problem') \|\| ($type eq 'tool')) {
return ($status);	return ($status);
}	}
Line 459 sub check_slot_access {	Line 456 sub check_slot_access {
}	}

if ( $status eq 'CANNOT_ANSWER' &&	if ( $status eq 'CANNOT_ANSWER' &&
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {	($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT' &&
	$slotstatus ne 'NEED_DIFFERENT_IP') ) {
return ($status,$datemsg);	return ($status,$datemsg);
}	}
	return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
	}

return ($slotstatus,$datemsg,$slot_name,$returned_slot);	sub check_reservable_slot {
	my ($slotstatus,$symb,$now,$checkedin,$consumed_uniq) = @_;
	my $datemsg;
	if ($slotstatus eq 'NOT_IN_A_SLOT') {
	if ($env{'request.course.id'}) {
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	unless ($symb) {
	($symb)=&Apache::lonnet::whichuser();
	}
	$slotstatus = 'NOTRESERVABLE';
	my ($reservable_now_order,$reservable_now,$reservable_future_order,
	$reservable_future) =
	&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
	if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
	if (@{$reservable_now_order} > 0) {
	if ((!$checkedin) \|\| (ref($consumed_uniq) ne 'ARRAY')) {
	$slotstatus = 'RESERVABLE';
	$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
	} else {
	my ($uniqstart,$uniqend,$useslot);
	if (ref($consumed_uniq) eq 'ARRAY') {
	($uniqstart,$uniqend)=@{$consumed_uniq};
	}
	foreach my $slot (reverse(@{$reservable_now_order})) {
	if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
	my ($new_uniq_start,$new_uniq_end) = ($1,$2);
	next if (!
	($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) \|\|
	($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
	}
	$useslot = $slot;
	last;
	}
	if ($useslot) {
	$slotstatus = 'RESERVABLE';
	$datemsg = $reservable_now->{$useslot}{'endreserve'};
	}
	}
	}
	}
	unless ($slotstatus eq 'RESERVABLE') {
	if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
	if (@{$reservable_future_order} > 0) {
	if ((!$checkedin) \|\| (ref($consumed_uniq) ne 'ARRAY')) {
	$slotstatus = 'RESERVABLE_LATER';
	$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
	} else {
	my ($uniqstart,$uniqend,$useslot);
	if (ref($consumed_uniq) eq 'ARRAY') {
	($uniqstart,$uniqend)=@{$consumed_uniq};
	}
	foreach my $slot (@{$reservable_future_order}) {
	if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
	my ($new_uniq_start,$new_uniq_end) = ($1,$2);
	next if (!
	($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) \|\|
	($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end ));
	}
	$useslot = $slot;
	last;
	}
	if ($useslot) {
	$slotstatus = 'RESERVABLE_LATER';
	$datemsg = $reservable_future->{$useslot}{'startreserve'};
	}
	}
	}
	}
	}
	}
	}
	return ($slotstatus,$datemsg);
}	}

# JB, 9/24/2002: Any changes in this function may require a change	# JB, 9/24/2002: Any changes in this function may require a change
Line 595 sub check_access {	Line 667 sub check_access {
if ($status eq 'CAN_ANSWER' \|\| $status eq 'CANNOT_ANSWER') {	if ($status eq 'CAN_ANSWER' \|\| $status eq 'CANNOT_ANSWER') {
my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);	my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);
&Apache::lonxml::debug("looking for interval @interval");	&Apache::lonxml::debug("looking for interval @interval");
if ($interval[0]) {	if ($interval[0]=~ /^\d+/) {
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);	my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
&Apache::lonxml::debug("looking for accesstime $first_access");	&Apache::lonxml::debug("looking for accesstime $first_access");
if (!$first_access) {	if (!$first_access) {
$status='NOT_YET_VIEWED';	$status='NOT_YET_VIEWED';
my $due_date = &due_date($id,$symb);	my $due_date = &due_date($id,$symb);
my $seconds_left = $due_date - time;	my $seconds_left = $due_date - time;
if ($seconds_left > $interval[0] \|\| $due_date eq '') {	my ($timelimit) = ($interval[0] =~ /^(\d+)/);
$seconds_left = $interval[0];	if ($seconds_left > $timelimit \|\| $due_date eq '') {
	$seconds_left = $timelimit;
}	}
$datemsg=&seconds_to_human_length($seconds_left);	$datemsg=&seconds_to_human_length($seconds_left);
}	}
Line 638 sub due_date {	Line 711 sub due_date {
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);	my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");	&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
if (defined($first_access)) {	if (defined($first_access)) {
my $interval = $first_access+$interval[0];	my ($timelimit) = ($interval[0] =~ /^(\d+)/);
	my $interval = $first_access+$timelimit;
$date = (!$due_date \|\| $interval < $due_date) ? $interval	$date = (!$due_date \|\| $interval < $due_date) ? $interval
: $due_date;	: $due_date;
} else {	} else {
Line 865 STATE	Line 939 STATE

sub analyze_header {	sub analyze_header {
my ($request) = @_;	my ($request) = @_;
my $js = &Apache::lonxml::setmode_javascript();	my $js = &Apache::structuretags::setmode_javascript();

# Breadcrumbs	# Breadcrumbs
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),	my $text = 'Authoring Space';
'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';
	}
	}
	my $brcrum = [{'href' => $href,
	'text' => $text},
{'href' => '',	{'href' => '',
'text' => 'Problem Testing'},	'text' => 'Problem Testing'},
{'href' => '',	{'href' => '',
Line 882 sub analyze_header {	Line 965 sub analyze_header {
.&Apache::loncommon::head_subbox(	.&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());	&Apache::loncommon::CSTR_pageheader());
$result .=	$result .=
'<form name="lonhomework" method="post" action="'.	'<form name="lonhomework" method="post" action="'.
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.	&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
'<input type="hidden" name="problemmode" value="'.	'<input type="hidden" name="problemmode" value="'.
$env{'form.problemmode'}.'" />'.	$env{'form.problemmode'}.'" />'.
Line 897 sub analyze_header {	Line 980 sub analyze_header {
'onclick="javascript:setmode(this.form,'."'view'".')" />	'onclick="javascript:setmode(this.form,'."'view'".')" />
<hr />	<hr />
</div>'	</div>'
.&Apache::lonxml::message_location().'	.&Apache::lonxml::message_location().
</form>';	'</form>';
&Apache::lonxml::add_messages(\$result);	&Apache::lonxml::add_messages(\$result);
$request->print($result);	$request->print($result);
$request->rflush();	$request->rflush();
Line 1097 sub editxmlmode {	Line 1180 sub editxmlmode {
my $js =	my $js =
&Apache::edit::js_change_detection().	&Apache::edit::js_change_detection().
&Apache::loncommon::resize_textarea_js().	&Apache::loncommon::resize_textarea_js().
&Apache::lonxml::setmode_javascript().	&Apache::structuretags::setmode_javascript().
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");	&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");

# Breadcrumbs	# Breadcrumbs
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),	my $text = 'Authoring Space';
'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';
	}
	}
	my $brcrum = [{'href' => $href,
	'text' => $text},
{'href' => '',	{'href' => '',
'text' => 'Problem Editing'}];	'text' => 'Problem Editing'}];

Line 1127 sub editxmlmode {	Line 1219 sub editxmlmode {
<div class="LC_edit_problem_header">	<div class="LC_edit_problem_header">
<div class="LC_edit_problem_header_title">'.	<div class="LC_edit_problem_header_title">'.
&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').	&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').
'</div><div class="LC_edit_actionbar" id="actionbar">';	'</div><div class="LC_edit_actionbar" id="actionbar">';

$result.='<input type="hidden" name="problemmode" value="saveedit" />'.	$result.='<input type="hidden" name="problemmode" value="saveedit" />'.
&Apache::structuretags::problem_edit_buttons('editxml');	&Apache::structuretags::problem_edit_buttons('editxml');
Line 1135 sub editxmlmode {	Line 1227 sub editxmlmode {

$result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">';	$result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">';

unless ($env{'environment.nocodemirror'}) {	my $nocodemirror = &Apache::loncommon::nocodemirror();
	unless ($nocodemirror) {
# dropdown menus	# dropdown menus
$result .= Apache::lonmenu::create_submenu("#", "",	$result .= Apache::lonmenu::create_submenu("#", "",
&mt("Problem Templates"), template_dropdown_datastructure());	&mt("Problem Templates"), template_dropdown_datastructure());
Line 1167 sub editxmlmode {	Line 1260 sub editxmlmode {
'</textarea> <div id="LC_aftertextarea"> </div> </form>';	'</textarea> <div id="LC_aftertextarea"> </div> </form>';

my $resource = $env{'request.ambiguous'};	my $resource = $env{'request.ambiguous'};
unless($env{'environment.nocodemirror'}){	unless ($nocodemirror) {
$result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">	$result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">
<script src="/adm/codemirror/codemirror-compressed-xml.js"></script>	<script src="/adm/codemirror/codemirror-compressed-xml.js"></script>
<script>	<script>
Line 1240 sub renderpage {	Line 1333 sub renderpage {
$problem='';	$problem='';
my $filename=(split('/',$file))[-1];	my $filename=(split('/',$file))[-1];
my $error =	my $error =
&mt('Unable to find [_1]',	'<p class="LC_error">'
'<span class="LC_filename">'.$filename.'</span>');	.&mt('Unable to find [_1]',
	'<span class="LC_filename">'.$filename.'</span>')
	."</p>";
$result.=	$result.=
&Apache::loncommon::simple_error_page($request,'Not available',	&Apache::loncommon::simple_error_page($request,'Not available',
$error,{'no_auto_mt_msg' => 1});	$error,{'no_auto_mt_msg' => 1});
Line 1269 sub renderpage {	Line 1364 sub renderpage {
if ($target eq 'analyze') {	if ($target eq 'analyze') {
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);	$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
undef(%Apache::lonhomework::analyze);	undef(%Apache::lonhomework::analyze);
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
if ($donebuttonmsg) {	if ($donebuttonmsg) {
$result =~ s{</body>}{};	$result =~ s{</body>}{};
$result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</body>";	$result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</body>";
}	}
}	}
#my $td=&tv_interval($t0);	#my $td=&tv_interval($t0);
#if ( $Apache::lonxml::debug) {	#if ( $Apache::lonxml::debug) {
#$result =~ s:</body>::;	#$result =~ s:</body>::;
Line 1297 sub renderpage {	Line 1392 sub renderpage {
}	}
if (!$return_string) {	if (!$return_string) {
&Apache::lonxml::add_messages(\$overall_result);	&Apache::lonxml::add_messages(\$overall_result);
$request->print($overall_result);	$request->print($overall_result);
$request->rflush();	$request->rflush();
} else {	} else {
return $overall_result;	return $overall_result;
Line 1315 sub finished_parsing {	Line 1410 sub finished_parsing {
# value 1: title	# value 1: title
# value 2: category	# value 2: category
# value 3: name of help topic ???	# value 3: name of help topic ???
sub get_template_list {	sub get_template_list{
my ($extension) = @_;	my ($extension) = @_;

my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.	my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
'/templates/*.'.$extension);	'/templates/*.'.$extension);
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),	@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),	(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);	&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);	@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
return @files;	return @files;
}	}
Line 1334 sub get_template_html {	Line 1429 sub get_template_html {
&Apache::lonxml::debug("Looking for :$extension:");	&Apache::lonxml::debug("Looking for :$extension:");
my $glob_extension = $extension;	my $glob_extension = $extension;
if ($extension eq 'survey' \|\| $extension eq 'exam') {	if ($extension eq 'survey' \|\| $extension eq 'exam') {
$glob_extension = 'problem';	$glob_extension = 'problem';
}	}
my @files = &get_template_list($extension);	my @files = &get_template_list($extension);
my ($midpoint,$seconddiv,$numfiles);	my ($midpoint,$seconddiv,$numfiles);
Line 1421 sub newproblem {	Line 1516 sub newproblem {
}	}
}	}
if ($file) {	if ($file) {
my $dest = &Apache::lonnet::filelocation("",$request->uri);	my $dest = &Apache::lonnet::filelocation("",$request->uri);
&File::Copy::copy($file,$dest);	&File::Copy::copy($file,$dest);
&renderpage($request,$dest);	&renderpage($request,$dest);
return;	return;
} else {	} else {
$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>';	$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>';
}	}
Line 1448 sub newproblem {	Line 1543 sub newproblem {
my $url=&HTML::Entities::encode($request->uri,'<>&"');	my $url=&HTML::Entities::encode($request->uri,'<>&"');
my $dest = &Apache::lonnet::filelocation("",$request->uri);	my $dest = &Apache::lonnet::filelocation("",$request->uri);
my $instructions;	my $instructions;
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),	my $text = 'Authoring Space';
'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';
	}
	}
	my $brcrum = [{'href' => $href,
	'text' => $text},
{'href' => '',	{'href' => '',
'text' => "Create New $extension"}];	'text' => "Create New $extension"}];
my $start_page =	my $start_page =
Line 1564 sub zero_timer {	Line 1668 sub zero_timer {
sub handler {	sub handler {
#my $t0 = [&gettimeofday()];	#my $t0 = [&gettimeofday()];
my $request=$_[0];	my $request=$_[0];

$Apache::lonxml::request=$request;	$Apache::lonxml::request=$request;
$Apache::lonxml::debug=$env{'user.debug'};	$Apache::lonxml::debug=$env{'user.debug'};
$env{'request.uri'}=$request->uri;	$env{'request.uri'}=$request->uri;
Line 1611 sub handler {	Line 1716 sub handler {
&renderpage($request,$file);	&renderpage($request,$file);
}	}
} else {	} else {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['mode']);	['mode']);
# requested file doesn't exist in contruction space	# requested file doesn't exist in contruction space
&newproblem($request);	&newproblem($request);
}	}
Line 1620 sub handler {	Line 1725 sub handler {
# Set the event timer to zero if the "done button" was clicked. The button is	# Set the event timer to zero if the "done button" was clicked. The button is
# part of the doneButton form created in lonmenu.pm	# part of the doneButton form created in lonmenu.pm
my ($donebuttonresult,$donemsg,$viewasuser);	my ($donebuttonresult,$donemsg,$viewasuser);
if ($symb && $env{'form.LC_interval_done'} eq 'true') {	if ($symb && $env{'form.LC_interval_done'} eq 'true') {
($donebuttonresult,$donemsg) = &zero_timer($symb);	($donebuttonresult,$donemsg) = &zero_timer($symb);
undef($env{'form.LC_interval_done'});	undef($env{'form.LC_interval_done'});
undef($env{'form.LC_interval_done_proctorpass'});	undef($env{'form.LC_interval_done_proctorpass'});
Line 1677 sub template_dropdown_datastructure {	Line 1782 sub template_dropdown_datastructure {
my %tmplthash = ();	my %tmplthash = ();
# template title => path	# template title => path
my %tmpltcontent = ();	my %tmpltcontent = ();

foreach my $template (@templates){	foreach my $template (@templates){
# put in hash if the template is not empty	# put in hash if the template is not empty
unless ($template->[1] eq ''){	unless ($template->[1] eq ''){
Line 1686 sub template_dropdown_datastructure {	Line 1791 sub template_dropdown_datastructure {
}	}
}	}

my $catList = [];	my $catList = [];
foreach my $cat (sort keys %tmplthash) {	foreach my $cat (sort keys %tmplthash) {
my $catItems = [];	my $catItems = [];
foreach my $title (sort @{$tmplthash{$cat}}) {	foreach my $title (sort @{$tmplthash{$cat}}) {
my $path = $tmpltcontent{$title}->[0];	my $path = $tmpltcontent{$title}->[0];
my $code;	my $code;
Line 1698 sub template_dropdown_datastructure {	Line 1803 sub template_dropdown_datastructure {
}	}
close(FH);	close(FH);

if ($code ne '') {	if ($code ne '') {
my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';	my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';
my $currItem = [$href, $title, undef];	my $currItem = [$href, $title, undef];
push @{$catItems}, $currItem;	push @{$catItems}, $currItem;
}	}
}	}
push @{$catList}, [$catItems, $cat, undef];	push @{$catList}, [$catItems, $cat, undef];
}	}

return $catList;	return $catList;
}	}

sub responseblock_dropdown_datastructure {	sub responseblock_dropdown_datastructure {

	my $mathCat = [
	[
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
	],
	&mt("Math"),
	undef
	];

my $mathCat = [	my $miscCat = [
[	[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
],
&mt("Math"),
undef
];

my $miscCat = [
[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
],	],
&mt("Miscellaneous"),	&mt("Miscellaneous"),
undef	undef
];	];

my $chemCat = [	my $chemCat = [
[	[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef]
],	],
&mt("Chemistry"),	&mt("Chemistry"),
undef	undef
];	];

my $textCat = [	my $textCat = [
[	[
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
],	],
&mt("Text"),	&mt("Text"),
undef	undef
];	];

return [$mathCat, $miscCat, $chemCat, $textCat];	return [$mathCat, $miscCat, $chemCat, $textCat];
}	}
Line 1768 sub conditional_scripting_datastructure	Line 1873 sub conditional_scripting_datastructure
#TODO translated is currently temporarily here, another solution should be found where the	#TODO translated is currently temporarily here, another solution should be found where the
# needed string can be retrieved	# needed string can be retrieved

my $translatedTag = '	my $translatedTag = '
<translated>	<translated>
<lang which="en"></lang>	<lang which="en"></lang>
<lang which="default"></lang>	<lang which="default"></lang>
</translated>';	</translated>';
return [	return [
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]	["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
];	];
}	}

Line 1798 sub misc_datastructure {	Line 1903 sub misc_datastructure {

# helper routine for the datastructure building subroutines	# helper routine for the datastructure building subroutines
sub default_xml_tag {	sub default_xml_tag {
my ($tag) = @_;	my ($tag) = @_;
return "\n<$tag></$tag>";	return "\n<$tag></$tag>";
}	}


sub helpmenu_datastructure {	sub helpmenu_datastructure {

# filename, title, width, height	# filename, title, width, height
my $helpers = [	my $helpers = [
['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],	['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600],
['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],	['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600],
['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],	['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600],
['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],	['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600],
['Authoring_Multilingual_Problems.hlp', &mt('Languages'), 800, 600],	['Authoring_Multilingual_Problems.hlp',
];	&mt('How to create problems in different languages'), 800, 600],
	['loncapa.html', &mt('Language reference'), 800, 600],
my $help_structure = [];	];

foreach my $count (0..(scalar(@{$helpers})-1)) {	my $help_structure = [];
my $filename = $helpers->[$count]->[0];
my $title = $helpers->[$count]->[1];	foreach my $count (0..(scalar(@{$helpers})-1)) {
my $width = $helpers->[$count]->[2];	my $filename = $helpers->[$count]->[0];
my $height = $helpers->[$count]->[3];	my $title = $helpers->[$count]->[1];
if ($width eq '') {	my $width = $helpers->[$count]->[2];
$width = 500;	my $height = $helpers->[$count]->[3];
}	if ($width eq '') {
if ($height eq '') {	$width = 500;
$height = 600;	}
}	if ($height eq '') {
my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");	$height = 600;
push @{$help_structure}, [$href, $title, undef];	}
}	my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');");
	push @{$help_structure}, [$href, $title, undef];
	}

return $help_structure;	return $help_structure;
}	}

# we need substitution to not break javascript code	# we need substitution to not break javascript code
sub convert_for_js {	sub convert_for_js {
my $return = shift;	my $return = shift;
$return =~ s\|script\|ESCAPEDSCRIPT\|g;	$return =~ s\|script\|ESCAPEDSCRIPT\|g;
$return =~ s\|\\\|\\\\\|g;	$return =~ s\|\\\|\\\\\|g;
$return =~ s\|\n\|\\r\\n\|g;	$return =~ s\|\n\|\\r\\n\|g;
$return =~ s\|'\|\\'\|g;	$return =~ s\|'\|\\'\|g;
$return =~ s\|'\|\\'\|g;	$return =~ s\|'\|\\'\|g;
return $return;	return $return;
}	}

Line 1857 sub do_ltipassback {	Line 1965 sub do_ltipassback {
my $url = $item->{'pburl'};	my $url = $item->{'pburl'};
my $type = $item->{'pbtype'};	my $type = $item->{'pbtype'};
my $scope = $item->{'scope'};	my $scope = $item->{'scope'};
my $map = $item->{'pbmap'};	my $map = $item->{'ltimap'};
my $symb = $item->{'pbsymb'};	my $symb = $item->{'ltisymb'};
my $uname = $item->{'uname'};	my $uname = $item->{'uname'};
my $udom = $item->{'udom'};	my $udom = $item->{'udom'};
my $keynum = $item->{'lti'}->{'cipher'};	my $keynum = $item->{'lti'}->{'cipher'};
Line 1868 sub do_ltipassback {	Line 1976 sub do_ltipassback {
if ($scope eq 'resource') {	if ($scope eq 'resource') {
$total = $item->{'total'};	$total = $item->{'total'};
$possible = $item->{'possible'};	$possible = $item->{'possible'};
} elsif (($scope eq 'map') \|\| ($scope eq 'nonrec')) {	} elsif ($scope eq 'map') {
($total,$possible) = &get_lti_score($uname,$udom,$map,$scope);	($total,$possible) = &get_lti_score($uname,$udom,$map);
} elsif ($scope eq 'course') {	} elsif ($scope eq 'course') {
($total,$possible) = &get_lti_score($uname,$udom);	($total,$possible) = &get_lti_score($uname,$udom);
}	}
Line 1884 sub do_ltipassback {	Line 1992 sub do_ltipassback {
}	}

sub get_lti_score {	sub get_lti_score {
my ($uname,$udom,$mapurl,$scope) = @_;	my ($uname,$udom,$mapurl) = @_;
my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);	my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
if (ref($navmap)) {	if (ref($navmap)) {
my $iterator;	my $iterator;
Line 1892 sub get_lti_score {	Line 2000 sub get_lti_score {
my $map = $navmap->getResourceByUrl($mapurl);	my $map = $navmap->getResourceByUrl($mapurl);
my $firstres = $map->map_start();	my $firstres = $map->map_start();
my $finishres = $map->map_finish();	my $finishres = $map->map_finish();
my $recursive = 1;	$iterator = $navmap->getIterator($firstres,$finishres,undef,1);
if ($scope eq 'nonrec') {
$recursive = 0;
}
$iterator = $navmap->getIterator($firstres,$finishres,undef,$recursive);
} else {	} else {
$iterator = $navmap->getIterator(undef,undef,undef,1);	$iterator = $navmap->getIterator(undef,undef,undef,1);
}	}

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

Removed from v.1.344.2.10.4.6
changed lines
	Added in v.1.379