version 1.6, 2007/01/26 23:37:51
|
version 1.9, 2007/12/01 01:59:54
|
Line 145 sub mapread {
|
Line 145 sub mapread {
|
# Call lonsequence::attemptread to read from resource space |
# Call lonsequence::attemptread to read from resource space |
# |
# |
sub attemptread { |
sub attemptread { |
my $fn=shift; |
my ($fn,$unsorted)=@_; |
|
|
my @links; |
my @links; |
my @theseres; |
my @theseres; |
Line 166 sub attemptread {
|
Line 166 sub attemptread {
|
$links[$number]=$content; |
$links[$number]=$content; |
} |
} |
} |
} |
|
if ($unsorted) { |
|
return @theseres; |
|
} |
|
|
# --------------------------------------------------------------- Sort, sort of |
# --------------------------------------------------------------- Sort, sort of |
|
|
Line 245 sub attemptread {
|
Line 248 sub attemptread {
|
# ------------------------------------- Revive zombie idx or get unused number |
# ------------------------------------- Revive zombie idx or get unused number |
|
|
sub getresidx { |
sub getresidx { |
my $url=shift; |
my ($url,$residx)= @_; |
my $max=1+($#resources>$#zombies?$#resources:$#zombies); |
my $max=1+($#resources>$#zombies?$#resources:$#zombies); |
unless ($url) { return $max; } |
unless ($url) { return $max; } |
for (my $i=0; $i<=$#zombies; $i++) { |
for (my $i=0; $i<=$#zombies; $i++) { |
my ($title,$src,$ext,$type)=split(/\:/,$zombies[$i]); |
my ($title,$src,$ext,$type)=split(/\:/,$zombies[$i]); |
if ($src eq $url) { |
if ($src eq $url) { |
undef($zombies[$i]); |
if ($residx) { |
return $i; |
if ($i == $residx) { |
|
undef($zombies[$i]); |
|
return $i; |
|
} |
|
} else { |
|
undef($zombies[$i]); |
|
return $i; |
|
} |
} |
} |
} |
} |
return $max; |
return $max; |
Line 277 sub pastetarget {
|
Line 287 sub pastetarget {
|
my @insertorder=(); |
my @insertorder=(); |
foreach (@which) { |
foreach (@which) { |
if (defined($_)) { |
if (defined($_)) { |
my ($name,$url)=split(/\=/,$_); |
my ($name,$url,$residx)=split(/\=/,$_); |
$name=&unescape($name); |
$name=&unescape($name); |
$url=&unescape($url); |
$url=&unescape($url); |
if ($url) { |
if ($url) { |
my $idx=&getresidx($url); |
my $idx=&getresidx($url,$residx); |
$insertorder[$#insertorder+1]=$idx; |
$insertorder[$#insertorder+1]=$idx; |
my $ext='false'; |
my $ext='false'; |
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~/^http\:\/\//) { $ext='true'; } |