--- trunk/lib/Frey/CouchAPI.pm	2009/04/24 21:51:03	1061
+++ trunk/lib/Frey/CouchAPI.pm	2009/04/27 16:23:52	1062
@@ -198,14 +198,18 @@
 			my $by = $1;
 			my $offset = 0;
 			my $startkey = delete $arg->{startkey};
+			   $startkey ||= delete $arg->{startkey_docid}; # XXX key == id
 			my $endkey   = delete $arg->{endkey};
 			my $limit    = delete $arg->{limit};
 			my $skip     = delete $arg->{skip};
 			my $total_rows = 0;
+			my $collected_rows = 0;
 
 			my @docs = grep { length $_ } map {
 
-				if ( $limit > 0 && $total_rows == $limit ) {
+				$total_rows++;
+	
+				if ( $limit > 0 && $collected_rows == $limit ) {
 					'';
 				} else {
 	
@@ -215,14 +219,14 @@
 						'';
 					} elsif ( $startkey ) {
 						if ( $_ ge $startkey ) {
-							$total_rows++;
+							$collected_rows++;
 							$_;
 						} else {
 							$offset++;
 							'';
 						}
 					} else {
-						$total_rows++;
+						$collected_rows++;
 						$_;
 					}
 				}