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 ranges distribution
[perl/list-index.git]
/
lib
/
List
/
Index.pm
diff --git
a/lib/List/Index.pm
b/lib/List/Index.pm
index 57027fa685656c8608c2bcd0a54a21fb93f264f9..4a2118910cf3708c11ada4bc07644930a33f3486 100644
(file)
--- a/
lib/List/Index.pm
+++ b/
lib/List/Index.pm
@@
-23,14
+23,14
@@
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 @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) {
- {
+
if ($offset > $context - 1)
{
# take a value slightly before the current offset
# take a value slightly before the current offset
- my $before = $
offset > $context ? $self->[$offset - $context] : '.'
;
+ my $before = $
self->[$offset - $context - 1]
;
# see how much of it matches the current link
my $trim = 1;
for my $match (split //, $before) {
# see how much of it matches the current link
my $trim = 1;
for my $match (split //, $before) {
@@
-62,14
+62,14
@@
sub ranges {
}
use List::MoreUtils 'uniq';
}
use List::MoreUtils 'uniq';
- @links =
map { [$_] }
uniq @links;
+ @links = uniq @links;
for my $i (0 .. $#links - 1) {
for my $i (0 .. $#links - 1) {
- my ($link, $lastchar) = $links[$i + 1]
->[0]
=~ /(.*)(.)/;
+ my ($link, $lastchar) = $links[$i + 1] =~ /(.*)(.)/;
$link .= $lastchar le 'a' ? '.' : chr( ord($lastchar) - 1 );
$link .= $lastchar le 'a' ? '.' : chr( ord($lastchar) - 1 );
- next if $link eq $links[$i]
->[0]
and $i;
- $links[$i]
->[1] =
$link;
+ next if $link eq $links[$i] and $i;
+ $links[$i]
.= '-'.
$link;
}
}
- $links[-1]
->[1] = '
';
+ $links[-1]
.= '-
';
return \@links;
}
return \@links;
}
@@
-78,6
+78,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,10
+89,14
@@
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';
my $last = 'z';
+ next if $next gt $last;
if (length $s2 > $i) {
if ($s2 =~ /^\Q$prefix/) {
$last = substr $s2, $i, 1;
if (length $s2 > $i) {
if ($s2 =~ /^\Q$prefix/) {
$last = substr $s2, $i, 1;
@@
-100,10
+105,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
;
}
}
}
}
@@
-119,11
+137,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
@@
-141,18
+164,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