From 9686d8ff5b9ca12d851b0e653738e416cc1d88f0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 17 Feb 2015 07:55:11 +0000 Subject: [PATCH] use error_log instead of echo to give constant feedback (echo uses output buffering) and set fs_content in all rows to NULL, as it is a lot quicker --- api/src/Vfs/Sqlfs/Utils.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/Vfs/Sqlfs/Utils.php b/api/src/Vfs/Sqlfs/Utils.php index c291eed9de..cca65b8643 100644 --- a/api/src/Vfs/Sqlfs/Utils.php +++ b/api/src/Vfs/Sqlfs/Utils.php @@ -30,7 +30,7 @@ class Utils extends StreamWrapper * * @param boolean $debug true to echo a message for each copied file */ - static function migrate_db2fs($debug=false) + static function migrate_db2fs($debug=true) { if (!is_object(self::$pdo)) { @@ -84,7 +84,7 @@ class Utils extends StreamWrapper { throw new egw_exception_assertion_failed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!"); } - if ($debug) echo "$fs_id: $fs_name: $bytes bytes copied to fs\n"; + if ($debug) error_log("$fs_id: $fs_name: $bytes bytes copied to fs"); fclose($dest); fclose($content); unset($content); @@ -99,7 +99,7 @@ class Utils extends StreamWrapper if ($n) // delete all content in DB, if there was some AND no error (exception thrown!) { - $query = 'UPDATE '.self::TABLE.' SET fs_content=NULL WHERE fs_content IS NOT NULL'; + $query = 'UPDATE '.self::TABLE.' SET fs_content=NULL'; $stmt = self::$pdo->prepare($query); $stmt->execute(); }