git.shiar.nl
/
perl
/
list-index.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test modulo
[perl/list-index.git]
/
lib
/
List
/
Index.pm
diff --git
a/lib/List/Index.pm
b/lib/List/Index.pm
index 3663c2459422638225058204dbc9854f667f315f..4ce9c25b8dacb38693302421c1f2692220ed669d 100644
(file)
--- a/
lib/List/Index.pm
+++ b/
lib/List/Index.pm
@@
-23,38
+23,53
@@
sub ranges {
my $pages = $options->{pages } || 1 + int $#$self / $pagesize;
$pagesize = @$self / $pages;
my $pages = $options->{pages } || 1 + int $#$self / $pagesize;
$pagesize = @$self / $pages;
- my $offset = $pagesize;
+ my $offset = $pagesize + .5;
+ my $shrunk = 0;
+ my $enlarged = 0;
my @links = ('');
while ($offset < @$self) {
my $link = substr $self->[$offset], 0, $length;
if ($context) {
my @links = ('');
while ($offset < @$self) {
my $link = substr $self->[$offset], 0, $length;
if ($context) {
- {
-
# take a value slightly before the current offset
- my $before = $offset > $context ? $self->[$offset - $context] : '.';
+ my $penalty = 0;
+ # take a value slightly before the current offset
+ if ((my $before = $offset - $context + $shrunk) > 0) {
# see how much of it matches the current link
my $trim = 1;
# see how much of it matches the current link
my $trim = 1;
- for my $match (split //, $
before
) {
+ for my $match (split //, $
self->[$before - 1]
) {
scalar $link =~ /\G\Q$match/g or last;
$trim++;
}
# truncate link upto where the earlier value starts to differ
scalar $link =~ /\G\Q$match/g or last;
$trim++;
}
# truncate link upto where the earlier value starts to differ
- substr($link, $trim) = '' unless $trim > length $link;
+ if ($trim < length $link) {
+ substr($link, $trim) = '';
+ for (reverse $before .. $offset) {
+ $self->[$offset - $penalty] =~ /^\Q$link/ or last;
+ $penalty++;
+ }
+ }
}
}
- if ($offset + $context < $#$self) {
-
# take a value after the current offset
- my $after = $self->[$offset + $context];
+ $shrunk = 0;
+ # take a value after the current offset
+ if ((my $after = $offset + $context - $enlarged) < $#$self) {
# see how much of it matches the current link
my $trim = 1;
# see how much of it matches the current link
my $trim = 1;
- for my $match (split //, $
after
) {
+ for my $match (split //, $
self->[$after]
) {
scalar $link =~ /\G\Q$match/g or last;
$trim++;
}
# use this link if it's shorter
if ($trim < length $link) {
scalar $link =~ /\G\Q$match/g or last;
$trim++;
}
# use this link if it's shorter
if ($trim < length $link) {
- $link = substr $after, 0, $trim;
+ $link = substr $self->[$after], 0, $trim;
+ # advance lookbehind offset on the next page
+ $penalty = 0;
+ for ($offset .. $#$self) {
+ last if $self->[$offset + $shrunk] =~ /^\Q$link/;
+ $shrunk++;
+ }
}
}
}
}
+ $enlarged = $penalty;
}
push @links, $link;
}
push @links, $link;
@@
-78,6
+93,7
@@
sub rangematch {
my ($link) = @_;
my ($s1, $s2) = $link =~ /([^-]*) - ([^-]*)/x
or return qr/^\Q$link/i;
my ($link) = @_;
my ($s1, $s2) = $link =~ /([^-]*) - ([^-]*)/x
or return qr/^\Q$link/i;
+ $s1 =~ s/\.$//;
my @allow;
if (length $s1) {
my @allow;
if (length $s1) {
@@
-88,9
+104,12
@@
sub rangematch {
my $prefix = '';
my $char;
for my $i (0 .. length($s1) - 1) {
my $prefix = '';
my $char;
for my $i (0 .. length($s1) - 1) {
+ my $lasti = $i == length($s1) - 1;
$char = substr $s1, $i, 1;
my $next = $char;
$char = substr $s1, $i, 1;
my $next = $char;
- $next = chr( ord($char) + 1 ) if length $s1 > $i + 1;
+ # do not include prefix character in final range
+ $next = chr( ord($char) + 1 ) unless $lasti;
+
my $last = 'z';
next if $next gt $last;
if (length $s2 > $i) {
my $last = 'z';
next if $next gt $last;
if (length $s2 > $i) {
@@
-101,10
+120,23
@@
sub rangematch {
next if $next gt $last;
}
}
next if $next gt $last;
}
}
+
+ if ($char eq '.') {
+ if ($last eq 'z') {
+# push @allow, $prefix if $i and $lasti;
+# next;
+ }
+# if ($last eq 'z') {
+# push @allow, $prefix if $i and $lasti;
+# next;
+# }
+ $next = 'a';
+ }
+
push @allow, $prefix."[$next-$last]";
}
continue {
push @allow, $prefix."[$next-$last]";
}
continue {
- $prefix .= $char;
+ $prefix .= $char
eq '.' ? '[^a-z]' : $char
;
}
}
}
}
@@
-120,11
+152,16
@@
sub rangematch {
next if $c1 le $char;
}
}
next if $c1 le $char;
}
}
- push @allow, $prefix."(?![$char-$last])"
+
+ if ($char eq '.') {
+ next if $i < length($s2) - 1;
+ }
+
+ push @allow, $prefix.'(?!['.($char eq '.' ? 'a' : $char)."-$last])"
if $i or $s1 eq '';
}
continue {
if $i or $s1 eq '';
}
continue {
- $prefix .= $char;
+ $prefix .= $char
eq '.' ? '[^a-z]' : $char
;
}
push @allow, $prefix
}
push @allow, $prefix
@@
-142,18
+179,18
@@
__END__
=head1 NAME
=head1 NAME
-List::Index -
Paginate alphabetic entries by finding minimal prefixe
s
+List::Index -
Find and apply prefix ranges to paginate keyword
s
=head1 SYNOPSIS
use List::Index;
my $index = List::Index->new(\@values);
my @pages = $index->ranges({pagesize => 50});
=head1 SYNOPSIS
use List::Index;
my $index = List::Index->new(\@values);
my @pages = $index->ranges({pagesize => 50});
-
printf '<a href="?q=%s-%s">%1$s</a> ', @$_
for @pages;
+
say "<a href='?q=$_'>$_</a>"
for @pages;
use List::Index 'rangematch';
use List::Index 'rangematch';
- my $limit = rangematch('b-bmq'); #
matches prefix like 'baa'..
'bmq'
- @re
sults = grep { $limit } @result
s;
+ my $limit = rangematch('b-bmq'); #
ge 'b' && le
'bmq'
+ @re
quest = grep { $limit } @value
s;
=head1 DESCRIPTION
=head1 DESCRIPTION