X-Git-Url: http://git.shiar.nl/perl/list-index.git/blobdiff_plain/1c331324738bb8ca05889f1a7baa5e1b40595d38..9d8572d98bcc078f2946094bacc6a47dfbbd934b:/lib/List/Index.pm

diff --git a/lib/List/Index.pm b/lib/List/Index.pm
index 4a21189..e67e5ae 100644
--- a/lib/List/Index.pm
+++ b/lib/List/Index.pm
@@ -22,39 +22,56 @@ sub ranges {
 	my $length   = $options->{length  } || 4;
 	my $pages    = $options->{pages   } || 1 + int $#$self / $pagesize;
 
-	$pagesize = @$self / $pages;
+	$pagesize = $pages >= $#$self ? 1 : @$self / $pages;
 	my $offset = $pagesize + .5;
+	my $lookbehind = -$context;
+	my $lookahead  =  $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
-				my $before = $self->[$offset - $context - 1];
+			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;