From 43cfe28ba3e16e345f3a41d71b98abf4404a55c7 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 13 Dec 2004 14:35:42 +0000
Subject: [PATCH] verbose arg

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4272 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/WikiAdminUtils.php | 20 +++++---------------
 lib/upgrade.php               | 27 ++++++++++++++++++---------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/lib/plugin/WikiAdminUtils.php b/lib/plugin/WikiAdminUtils.php
index 77c96964a..8d949728d 100644
--- a/lib/plugin/WikiAdminUtils.php
+++ b/lib/plugin/WikiAdminUtils.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: WikiAdminUtils.php,v 1.15 2004-12-10 22:33:40 rurban Exp $');
+rcs_id('$Id: WikiAdminUtils.php,v 1.16 2004-12-13 14:35:42 rurban Exp $');
 /**
  Copyright 2003, 2004 $ThePhpWikiProgrammingTeam
 
@@ -42,7 +42,7 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.15 $");
+                            "\$Revision: 1.16 $");
     }
 
     function getDefaultArguments() {
@@ -181,20 +181,10 @@ extends WikiPlugin
     function _do_convert_cached_html(&$request, $args) {
 
         require_once("lib/upgrade.php");
+        $dbh = $request->_dbi;
         _upgrade_db_init($dbh);
 
-  	$database = $dbh->_backend->database();
-        extract($dbh->_backend->_table_names);
-        $fields = $dbh->_backend->listOfFields($database, $page_tbl);
-        if (!strstr(strtolower(join(':', $fields)), "cached_html")) {
-            $backend_type = $dbh->_backend->backendType();
-            if (substr($backend_type,0,5) == 'mysql')
-                $dbh->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB");
-            else
-                $dbh->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
-        }
-
-        $count = _convert_cached_html($dbh);
+        $count = _upgrade_cached_html($dbh, false);
 
         if (!$count)
             return _("No old _cached_html pagedata found.");
@@ -312,4 +302,4 @@ extends _PageList_Column {
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
+?>
\ No newline at end of file
diff --git a/lib/upgrade.php b/lib/upgrade.php
index 2c435cd5d..660cdda54 100644
--- a/lib/upgrade.php
+++ b/lib/upgrade.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: upgrade.php,v 1.34 2004-12-11 09:39:28 rurban Exp $');
+rcs_id('$Id: upgrade.php,v 1.35 2004-12-13 14:35:41 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -482,29 +482,35 @@ function _upgrade_db_init (&$dbh) {
  * it is only rarelely needed: for current page only, if-not-modified
  * but was extracetd for every simple page iteration.
  */
-function _upgrade_cached_html (&$dbh) {
+function _upgrade_cached_html (&$dbh, $verbose=true) {
     global $DBParams;
     if (!in_array($DBParams['dbtype'], array('SQL','ADODB'))) return;
-
+    $count = 0;
     if (phpwiki_version() >= 1030.10) {
-  	echo _("check for extra page.cached_html column")," ... ";
+        if ($verbose)
+            echo _("check for extra page.cached_html column")," ... ";
   	$database = $dbh->_backend->database();
         extract($dbh->_backend->_table_names);
         $fields = $dbh->_backend->listOfFields($database, $page_tbl);
         if (!strstr(strtolower(join(':', $fields)), "cached_html")) {
-            echo "<b>",_("ADDING"),"</b>"," ... ";
+            if ($verbose)
+                echo "<b>",_("ADDING"),"</b>"," ... ";
             $backend_type = $dbh->_backend->backendType();
             if (substr($backend_type,0,5) == 'mysql')
                 $dbh->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB");
             else
                 $dbh->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
-            echo "<b>",_("CONVERTING"),"</b>"," ... ";
-            _convert_cached_html($dbh);
-            echo _("OK"), "<br />\n";
+            if ($verbose)
+                echo "<b>",_("CONVERTING"),"</b>"," ... ";
+            $count = _convert_cached_html($dbh);
+            if ($verbose)
+                echo $count, " ", _("OK"), "<br />\n";
         } else {
-            echo _("OK"), "<br />\n";
+            if ($verbose)
+                echo _("OK"), "<br />\n";
         }
     }
+    return $count;
 }
 
 /** 
@@ -640,6 +646,9 @@ function DoUpgrade($request) {
 
 /*
  $Log: not supported by cvs2svn $
+ Revision 1.34  2004/12/11 09:39:28  rurban
+ needed init for ref
+
  Revision 1.33  2004/12/10 22:33:39  rurban
  add WikiAdminUtils method for convert-cached-html
  missed some vars.
-- 
2.45.0