version 1.68.6.4, 2013/01/08 03:51:06
|
version 1.68.6.6, 2013/08/08 12:08:01
|
Line 152 sub readfromfile {
|
Line 152 sub readfromfile {
|
&Apache::lonnet::filelocation('',$env{'form.readfile'})); |
&Apache::lonnet::filelocation('',$env{'form.readfile'})); |
} else { |
} else { |
my $parser = HTML::TokeParser->new(\$cont); |
my $parser = HTML::TokeParser->new(\$cont); |
my ($token,$donechk,%allmaps); |
my ($token,$donechk,$allmaps); |
|
$allmaps = {}; |
while ($token = $parser->get_token) { |
while ($token = $parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
if ($env{'form.recover'}) { |
if ($env{'form.recover'}) { |
if ($token->[2]->{'type'} ne 'zombie') { next; } |
if ($token->[2]->{'type'} ne 'zombie') { next; } |
if ($token->[2]->{'src'} =~ /\.(page|sequence)$/) { |
if ($token->[2]->{'src'} =~ /\.(page|sequence)$/) { |
unless ($donechk) { |
if (($env{'request.course.id'}) && |
$donechk = &get_allmaps(\%allmaps); |
($env{'form.readfile'} =~ m{/default(|_\d+)\.(page|sequence)$})) { |
|
unless ($donechk) { |
|
$allmaps = &Apache::loncommon::allmaps_incourse(); |
|
$donechk = 1; |
|
} |
} |
} |
if ($allmaps{$token->[2]->{'src'}}) { next; } |
if ($allmaps->{$token->[2]->{'src'}}) { next; } |
} |
} |
} else { |
} else { |
if ($token->[2]->{'type'} eq 'zombie') { next; } |
if ($token->[2]->{'type'} eq 'zombie') { next; } |
Line 187 sub readfromfile {
|
Line 192 sub readfromfile {
|
} |
} |
} |
} |
|
|
sub get_allmaps { |
|
my ($allmaps) = @_; |
|
return unless (ref($allmaps) eq 'HASH'); |
|
if (($env{'form.recover'}) && |
|
($env{'request.course.id'}) && |
|
($env{'form.readfile'} =~ m{/default(|_\d+)\.(page|sequence)$})) { |
|
my $cid = $env{'request.course.id'}; |
|
my $cdom = $env{'course.'.$cid.'.domain'}; |
|
my $cnum = $env{'course.'.$cid.'.num'}; |
|
my $chome = $env{'course.'.$cid.'.home'}; |
|
my $lastchange = |
|
&Apache::lonnet::get_coursechange($cdom,$cnum); |
|
if ($lastchange > $env{'request.course.tied'}) { |
|
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); |
|
unless ($ferr) { |
|
&Apache::loncommon::update_content_constraints($cdom,$cnum, |
|
$chome,$cid); |
|
} |
|
} |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (defined($navmap)) { |
|
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { |
|
$allmaps->{$res->src()} = 1; |
|
} |
|
} |
|
} |
|
return 1; |
|
} |
|
|
|
# ---------------------------------------------------------------- Main Handler |
# ---------------------------------------------------------------- Main Handler |
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
Line 363 END
|
Line 339 END
|
if ($env{'form.recover'}) { |
if ($env{'form.recover'}) { |
$r->print(<<END); |
$r->print(<<END); |
<input type="button" name="alter" value="$buttontext" |
<input type="button" name="alter" value="$buttontext" |
onClick="finish_import()" /> |
onclick="finish_import()" /> |
<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" /> |
<input type="button" name="alter" value="$lt{'ca'}" onclick="self.close()" /> |
END |
END |
} else { |
} else { |
# --- Continue Buttons |
# --- Continue Buttons |
Line 374 END
|
Line 350 END
|
<h2>$lt{'fin'}</h2> |
<h2>$lt{'fin'}</h2> |
<div> |
<div> |
<input type="button" name="alter" value="$lt{'ci'}" |
<input type="button" name="alter" value="$lt{'ci'}" |
onClick="window.location='$resurl?inhibitmenu=yes&catalogmode=import'" /> |
onclick="window.location='$resurl?inhibitmenu=yes&catalogmode=import'" /> |
<input type="button" name="altersearch" value="$lt{'cs'}" |
<input type="button" name="altersearch" value="$lt{'cs'}" |
onClick="window.location='/adm/searchcat?inhibitmenu=yes&catalogmode=import'" /> |
onclick="window.location='/adm/searchcat?inhibitmenu=yes&catalogmode=import'" /> |
<input type="button" name="alter" value="$lt{'fi'}" |
<input type="button" name="alter" value="$lt{'fi'}" |
onClick="finish_import()" /> |
onclick="finish_import()" /> |
<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" /> |
<input type="button" name="alter" value="$lt{'ca'}" onclick="self.close()" /> |
</div> |
</div> |
<br /> |
<br /> |
END |
END |
Line 452 END
|
Line 428 END
|
} else { |
} else { |
$r->print($resource->{'title'}); |
$r->print($resource->{'title'}); |
} |
} |
$r->print($resource->{'notes'}."</td><td>\n"); |
$r->print($resource->{'notes'}."</td><td>\n"); |
$r->print($resource->{'url'}."</td>" |
$r->print($resource->{'url'}."</td>" |
.&Apache::loncommon::end_data_table_row() |
.&Apache::loncommon::end_data_table_row() |
."\n"); |
."\n"); |
Line 512 sub select_box {
|
Line 488 sub select_box {
|
my ($total,$sel) = @_; |
my ($total,$sel) = @_; |
my $string; |
my $string; |
$string = '<select name="alt'.$sel.'"'; |
$string = '<select name="alt'.$sel.'"'; |
$string .= " onChange='selectchange($sel)'>"; |
$string .= " onchange='selectchange($sel)'>"; |
$string .= "<option name='o0' value='0'>".&mt('discard')."</option>"; |
$string .= "<option name='o0' value='0'>".&mt('discard')."</option>"; |
for my $cur (1..$total) { |
for my $cur (1..$total) { |
$string .= "<option name='o$cur' value='$cur'"; |
$string .= "<option name='o$cur' value='$cur'"; |