From b866305a858769ef59a1bdad5e98096d108886a0 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 8 Jul 2004 17:31:43 +0000
Subject: [PATCH] improve numPages for file (fixing AllPagesTest)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3881 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiDB.php              | 10 +++++++---
 lib/WikiDB/backend/file.php | 10 +++++++++-
 lib/plugin/AllPages.php     | 16 +++++++++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/WikiDB.php b/lib/WikiDB.php
index 0b208bbcf..9e443b478 100644
--- a/lib/WikiDB.php
+++ b/lib/WikiDB.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiDB.php,v 1.75 2004-07-05 13:56:22 rurban Exp $');
+rcs_id('$Id: WikiDB.php,v 1.76 2004-07-08 17:31:43 rurban Exp $');
 
 //require_once('lib/stdlib.php');
 require_once('lib/PageType.php');
@@ -262,11 +262,12 @@ class WikiDB {
     //}
     // Yes, for paging. Renamed.
     function numPages($filter=false, $exclude='') {
-    	if (method_exists($this->_backend,'numPages'))
-            $count = $this->_backend->numPages($filter,$exclude);
+    	if (method_exists($this->_backend, 'numPages'))
+            $count = $this->_backend->numPages($filter, $exclude);
         else {
             $iter = $this->getAllPages();
             $count = $iter->count();
+            $iter->free();
         }
         return (int)$count;
     }
@@ -1891,6 +1892,9 @@ class WikiDB_cache
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.75  2004/07/05 13:56:22  rurban
+// sqlite autoincrement fix
+//
 // Revision 1.74  2004/07/03 16:51:05  rurban
 // optional DBADMIN_USER:DBADMIN_PASSWD for action=upgrade (if no ALTER permission)
 // added atomic mysql REPLACE for PearDB as in ADODB
diff --git a/lib/WikiDB/backend/file.php b/lib/WikiDB/backend/file.php
index ea671ce50..183d84948 100644
--- a/lib/WikiDB/backend/file.php
+++ b/lib/WikiDB/backend/file.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: file.php,v 1.13 2004-07-08 15:23:59 rurban Exp $');
+rcs_id('$Id: file.php,v 1.14 2004-07-08 17:31:43 rurban Exp $');
 
 /**
  Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
@@ -567,6 +567,11 @@ extends WikiDB_backend
 
         return new WikiDB_backend_file_iter($this, $a);
     }
+
+    function numPages($filter=false, $exclude='') {
+        $this->_loadLatestVersions();
+        return count($this->_latest_versions);
+    }
         
     /**
      * Title or full text search.
@@ -781,6 +786,9 @@ class WikiDB_backend_file_iter extends WikiDB_backend_iterator
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.13  2004/07/08 15:23:59  rurban
+// less verbose for tests
+//
 // Revision 1.12  2004/07/08 13:50:32  rurban
 // various unit test fixes: print error backtrace on _DEBUG_TRACE; allusers fix; new PHPWIKI_NOMAIN constant for omitting the mainloop
 //
diff --git a/lib/plugin/AllPages.php b/lib/plugin/AllPages.php
index 2ce79d00a..cab3be7a4 100644
--- a/lib/plugin/AllPages.php
+++ b/lib/plugin/AllPages.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: AllPages.php,v 1.26 2004-06-21 16:22:32 rurban Exp $');
+rcs_id('$Id: AllPages.php,v 1.27 2004-07-08 17:31:43 rurban Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam
 
@@ -23,7 +23,7 @@ rcs_id('$Id: AllPages.php,v 1.26 2004-06-21 16:22:32 rurban Exp $');
 require_once('lib/PageList.php');
 
 /**
- * TODO: support author=[] (current user) and owner, creator
+ * DONE: support author=[] (current user) and owner, creator
  * to be able to have pages: 
  * AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastAuthoredByMe
  */
@@ -40,7 +40,7 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.26 $");
+                            "\$Revision: 1.27 $");
     }
 
     function getDefaultArguments() {
@@ -115,6 +115,16 @@ extends WikiPlugin
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.26  2004/06/21 16:22:32  rurban
+// add DEFAULT_DUMP_DIR and HTML_DUMP_DIR constants, for easier cmdline dumps,
+// fixed dumping buttons locally (images/buttons/),
+// support pages arg for dumphtml,
+// optional directory arg for dumpserial + dumphtml,
+// fix a AllPages warning,
+// show dump warnings/errors on DEBUG,
+// don't warn just ignore on wikilens pagelist columns, if not loaded.
+// RateIt pagelist column is called "rating", not "ratingwidget" (Dan?)
+//
 // Revision 1.25  2004/06/14 11:31:38  rurban
 // renamed global $Theme to $WikiTheme (gforge nameclash)
 // inherit PageList default options from PageList
-- 
2.45.0