X-Git-Url: http://git.shiar.net/perl/list-index.git/blobdiff_plain/0f46a9fa54c9ecca0f0c3180b51f7c3079d048a8..12c2437bb737f40da7d7514fc31c641ef0110cf3:/lib/List/Index.pm?ds=inline
diff --git a/lib/List/Index.pm b/lib/List/Index.pm
index ea7b433..f703d97 100644
--- a/lib/List/Index.pm
+++ b/lib/List/Index.pm
@@ -22,43 +22,59 @@ sub ranges {
my $length = $options->{length } || 4;
my $pages = $options->{pages } || 1 + int $#$self / $pagesize;
- $pagesize = @$self / $pages;
- my $offset = $pagesize;
+ $pagesize = $pages >= $#$self ? 1 : @$self / $pages;
+ my $lookbehind = -$context;
+ my $lookahead = $context;
+
my @links = ('');
- while ($offset < @$self) {
+ for (my $offset = $pagesize + .5; $offset < @$self; $offset += $pagesize) {
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 + $lookbehind) > 0) {
# 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
- 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];
+ $lookbehind = -$context;
+
+ # take a value after the current offset
+ if ((my $after = $offset + $lookahead) < $#$self) {
# 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) {
- $link = substr $after, 0, $trim;
+ $link = substr $self->[$after], 0, $trim;
+ # advance lookbehind offset on the next page
+ $penalty = 0;
+ for ($offset .. $after) {
+ last if $self->[$_] =~ /^\Q$link/;
+ $lookbehind++;
+ }
}
}
+
+ $lookahead = $context - $penalty;
}
push @links, $link;
- $offset += $pagesize;
}
use List::MoreUtils 'uniq';
@@ -78,6 +94,7 @@ sub rangematch {
my ($link) = @_;
my ($s1, $s2) = $link =~ /([^-]*) - ([^-]*)/x
or return qr/^\Q$link/i;
+ $s1 =~ s/\.$//;
my @allow;
if (length $s1) {
@@ -88,10 +105,14 @@ sub rangematch {
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;
- $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) {
if ($s2 =~ /^\Q$prefix/) {
$last = substr $s2, $i, 1;
@@ -100,10 +121,23 @@ sub rangematch {
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 {
- $prefix .= $char;
+ $prefix .= $char eq '.' ? '[^a-z]' : $char;
}
}
@@ -119,11 +153,16 @@ sub rangematch {
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 {
- $prefix .= $char;
+ $prefix .= $char eq '.' ? '[^a-z]' : $char;
}
push @allow, $prefix
@@ -141,18 +180,18 @@ __END__
=head1 NAME
-List::Index - Paginate alphabetic entries by finding minimal prefixes
+List::Index - Find and apply prefix ranges to paginate keywords
=head1 SYNOPSIS
use List::Index;
my $index = List::Index->new(\@values);
my @pages = $index->ranges({pagesize => 50});
- printf '%1$s ', @$_ for @pages;
+ say "$_" for @pages;
use List::Index 'rangematch';
- my $limit = rangematch('b-bmq'); # matches prefix like 'baa'..'bmq'
- @results = grep { $limit } @results;
+ my $limit = rangematch('b-bmq'); # ge 'b' && le 'bmq'
+ @request = grep { $limit } @values;
=head1 DESCRIPTION