From 345ad28d5fccec8dcb9a2c631124c5a7d5944b34 Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Thu, 3 Dec 2009 10:41:54 +0000
Subject: [PATCH] bplustree: making a message more explicit (walker) fpdb:     
 fixed problem with single post navigation (new method)

---
 fp-includes/core/core.bplustree.class.php |  6 +-
 fp-includes/core/core.fpdb.class.php      | 83 +++++++++++++++--------
 2 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/fp-includes/core/core.bplustree.class.php b/fp-includes/core/core.bplustree.class.php
index d2fbc0a..8fb93ce 100755
--- a/fp-includes/core/core.bplustree.class.php
+++ b/fp-includes/core/core.bplustree.class.php
@@ -2455,12 +2455,12 @@ class BPlusWalker {
 
 	function current_key() {
 		if ($this->valid) return $this->node->keys[$this->node_index];
-		else trigger_error("Not a valid index ({$this->node_index})");
+		else trigger_error("WALKER: Not a valid index ({$this->node_index})");
 	}
 
 	function current_value() {
 		if ($this->valid) return $this->node->indices[$this->node_index];
-		else trigger_error("Not a valid index ({$this->node_index})");
+		else trigger_error("WALKER: Not a valid index ({$this->node_index})");
 	}
 
 	function current() {
@@ -2470,7 +2470,7 @@ class BPlusWalker {
 				$this->node->indices[$this->node_index]
 			);
 		} else {
-		       	trigger_error("Not a valid index ({$this->node_index})"); 
+		       	trigger_error("WALKER: Not a valid index ({$this->node_index})"); 
 		}
 	}
 
diff --git a/fp-includes/core/core.fpdb.class.php b/fp-includes/core/core.fpdb.class.php
index aadc56a..5b9fe14 100644
--- a/fp-includes/core/core.fpdb.class.php
+++ b/fp-includes/core/core.fpdb.class.php
@@ -246,14 +246,28 @@
 			// in the sequence, if $prevkey becomes equal to $key then it means 
 			// $key is the first post (the last in time)
 
-			if ($prevkey == $key) 
-				$qp->start = 0;
-			else 
-				$qp->start = 1;
-
+			$qp->start = 0;
 			$qp->count = 1;
-		
 			$this->pointer = 0;
+			
+			if ($prevkey == $key) { 
+				$this->prevkey = null;
+				if ($this->walker->valid) { 
+					$this->walker->next(); 
+					$this->nextkey = $this->walker->current_key(); 
+				} 
+			} else { 
+				$this->prevkey = $prevkey;
+				if ($this->walker->valid) {
+					$this->walker->next();
+					if ($this->walker->valid) {
+						$this->walker->next();
+						$this->nextkey = $this->walker->valid? $this->walker->current_key() : null;
+					}
+				}
+			}
+			
+			
 
 		}
 		
@@ -348,16 +362,29 @@
 		
 			global $post;
 
-			/*if (!$this->hasMore()) {
-				$false = array(false, false);
-				return $false;
-			}*/
-			
 			$qp =& $this->params;
-			
+			$return = array(false, false);
 			
 			if ($this->counter < 0)
 				$this->prepare();
+			
+			
+			if ($qp->id) {
+				$idx = $this->main_idx;
+				$key = entry_idtokey($qp->id);
+				
+				$v = $idx->getitem($key);
+				if ($qp->fullparse) {
+					$entry = entry_parse($qp->id);
+					if (!$entry)  return $return;
+				} else {
+				 	$entry = array('subject' => $v);
+				}
+				
+				$return = array($this->params->id, $entry);
+				return $return;
+			}
+			
 
 			if (!$this->walker) {
 				$false = array(false, false);
@@ -504,17 +531,15 @@
 		function getNextPage() {
 			
 			if ($this->single){
-				#return false;
-				#$id = $this->_getOffsetId(1, $this->params->start);
-				$id = $this->walker->valid ? entry_keytoid($this->walker->current_key()) : false;
-				
-				if ($id) {
-					$label = $this->walker->current_value();
-				} else {
-					return false;
+				$key = $this->nextkey;
+				if (!$key)
+					return array(null, null);
+				else {
+					$val = $this->main_idx->getitem($key); 
+					return array($val, entry_keytoid($key));
 				}
-
-				return array($label, $id);
+				
+				
 				 
 			}
 			
@@ -530,12 +555,14 @@
 		
 		function getPrevPage() {
 		
-			if ($this->single) {
-
-				$id = $this->previd;
-				$label = $this->preventry['subject'];
-				
-				return array($label, $id);
+			if ($this->single){
+				$key = $this->prevkey;
+				if (!$key)
+					return array(null, null);
+				else {
+					$val = $this->main_idx->getitem($key); 
+					return array($val, entry_keytoid($key));
+				}
 				
 			}