From 5d2ebf1e13b4164fb3c36d62ae1f18ff8864e4ce Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 15 Sep 2007 12:35:50 +0000
Subject: [PATCH] basic array reset support - unclear if needed, iteration is
 usually one-time only

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5947 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiDB.php               | 17 ++++++++++++++---
 lib/WikiDB/backend/ADODB.php | 10 +++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/WikiDB.php b/lib/WikiDB.php
index 4552a3259..8eb3ce336 100644
--- a/lib/WikiDB.php
+++ b/lib/WikiDB.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiDB.php,v 1.156 2007-09-12 19:38:05 rurban Exp $');
+rcs_id('$Id: WikiDB.php,v 1.157 2007-09-15 12:35:50 rurban Exp $');
 
 require_once('lib/PageType.php');
 
@@ -1844,12 +1844,14 @@ class WikiDB_PageIterator
     function free() {
         $this->_iter->free();
     }
-    
+    function reset() {
+        $this->_iter->reset();
+    }
     function asArray() {
     	$result = array();
     	while ($page = $this->next())
             $result[] = $page;
-        //$this->reset();
+        $this->reset();
         return $result;
     }
     
@@ -2002,6 +2004,9 @@ class WikiDB_Array_PageIterator
     function count() {
         return count($this->_pages);
     }
+    function reset() {
+    	reset($this->_pages);
+    }
     function free() {}
     function asArray() {
         reset($this->_pages);
@@ -2031,6 +2036,9 @@ class WikiDB_Array_generic_iter
     function count() {
         return count($this->_array);
     }
+    function reset() {
+    	reset($this->_array);
+    }
     function free() {}
     function asArray() {
         if (!empty($this->_array))
@@ -2226,6 +2234,9 @@ function _sql_debuglog_shutdown_function() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.156  2007/09/12 19:38:05  rurban
+// fix wrong ref &current
+//
 // Revision 1.155  2007/07/15 17:39:33  rurban
 // stabilize rename updateWikiLinks to check only words
 //
diff --git a/lib/WikiDB/backend/ADODB.php b/lib/WikiDB/backend/ADODB.php
index 715e94c70..3fba297fc 100644
--- a/lib/WikiDB/backend/ADODB.php
+++ b/lib/WikiDB/backend/ADODB.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: ADODB.php,v 1.99 2007-06-07 21:37:39 rurban Exp $');
+rcs_id('$Id: ADODB.php,v 1.100 2007-09-15 12:35:50 rurban Exp $');
 
 /*
  Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
@@ -1342,6 +1342,11 @@ extends WikiDB_backend_iterator
         return $rec_assoc;
     }
 
+    function reset () {
+        if ($this->_result) {
+            $this->_result->MoveFirst();
+        }
+    }
     function asArray () {
     	$result = array();
     	while ($page = $this->next())
@@ -1555,6 +1560,9 @@ class WikiDB_backend_ADODB_search extends WikiDB_backend_search_sql
     }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.99  2007/06/07 21:37:39  rurban
+// add native asArray methods to generic iters (for DebugInfo)
+//
 // Revision 1.98  2007/05/28 20:13:46  rurban
 // Overwrite all attributes at once at page->save to delete dangling meta
 //
-- 
2.45.0