Some cleanups, more usage of ObjectFactory:

[core.git] / inc / classes / main / database / databases / class_LocalFileDatabase.php

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 407aa0d7c1d4145ac1d20f46bc982a47f2b957d0..083729efdac4e3812565dae4bc7c5ca1acc88389 100644 (file)
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -32,11 +32,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
        // Status results
        const RESULT_OKAY = 'ok';
 
-       /**
-        * Save path for "file database"
-        */
-       private $savePath = '';
-
        /**
         * The file's extension
         */
@@ -65,7 +60,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
        /**
         * Last exception
         */
-       private $lastException = null;
+       private $lastException = NULL;
 
        /**
         * Table information array
@@ -89,24 +84,20 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
        }
 
        /**
-        * Create an object of LocalFileDatabase and set the save path for local files.
-        * This method also validates the given file path.
+        * Create an object of LocalFileDatabase and set the save path from
+        * configuration for local files.
         *
-        * @param       $savePath               The local file path string
-        * @return      $dbInstance             An instance of LocalFileDatabase
+        * @return      $databaseInstance       An instance of LocalFileDatabase
         */
-       public static final function createLocalFileDatabase ($savePath) {
+       public static final function createLocalFileDatabase () {
                // Get an instance
                $databaseInstance = new LocalFileDatabase();
 
-               // Set save path and IO instance
-               $databaseInstance->setSavePath($savePath);
+               // Get a new compressor channel instance
+               $compressorInstance = ObjectFactory::createObjectByConfiguredName('compressor_channel_class');
 
                // Set the compressor channel
-               $databaseInstance->setCompressorChannel(CompressorChannel::createCompressorChannel(
-                       $databaseInstance->getConfigInstance()->getConfigEntry('base_path').
-                       $databaseInstance->getConfigInstance()->getConfigEntry('compressor_base_path')
-               ));
+               $databaseInstance->setCompressorChannel($compressorInstance);
 
                // "Connect" to the database
                $databaseInstance->connectToDatabase();
@@ -115,26 +106,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                return $databaseInstance;
        }
 
-       /**
-        * Setter for save path
-        *
-        * @param               $savePath               The local save path where we shall put our serialized classes
-        * @return      void
-        */
-       public final function setSavePath ($savePath) {
-               // Set save path
-               $this->savePath = (string) $savePath;
-       }
-
-       /**
-        * Getter for save path
-        *
-        * @return      $savePath               The local save path where we shall put our serialized classes
-        */
-       public final function getSavePath () {
-               return $this->savePath;
-       }
-
        /**
         * Getter for last error message
         *
@@ -172,7 +143,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         */
        private final function resetLastError () {
                $this->lastError = '';
-               $this->lastException = null;
+               $this->lastException = NULL;
        }
 
        /**
@@ -303,7 +274,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         */
        private function generateFqfnFromDataSet (Criteria $dataSetInstance, $rowName) {
                // This is the FQFN
-               $fqfn = $this->getSavePath() . $dataSetInstance->getTableName() . '/' . $rowName . '.' . $this->getFileExtension();
+               $fqfn = $this->getConfigInstance()->getConfigEntry('local_db_path') . $dataSetInstance->getTableName() . '/' . $rowName . '.' . $this->getFileExtension();
 
                // Return it
                return $fqfn;
@@ -375,10 +346,10 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         */
        public function querySelect ($resultType, $tableName, LocalSearchCriteria $criteriaInstance) {
                // The result is null by any errors
-               $resultData = null;
+               $resultData = NULL;
 
                // Create full path name
-               $pathName = $this->getSavePath() . $tableName . '/';
+               $pathName = $this->getConfigInstance()->getConfigEntry('local_db_path') . $tableName . '/';
 
                // A 'select' query is not that easy on local files, so first try to
                // find the 'table' which is in fact a directory on the server
@@ -511,7 +482,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         */
        public function queryUpdateDataSet (StoreableCriteria $dataSetInstance) {
                // Create full path name
-               $pathName = $this->getSavePath() . $dataSetInstance->getTableName() . '/';
+               $pathName = $this->getConfigInstance()->getConfigEntry('local_db_path') . $dataSetInstance->getTableName() . '/';
 
                // Try all the requests
                try {
@@ -602,7 +573,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         */
        public function getPrimaryKeyOfTable ($tableName) {
                // Default key is null
-               $primaryKey = null;
+               $primaryKey = NULL;
 
                // Does the table information exist?
                if (isset($this->tableInfo[$tableName])) {