Use single-quotes instead of double

[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 37dca8fcc4f2c3fa83c6e0a199b69db411a02477..6d54d6462a9ee8bc506968d1d5b3782ecbf09a92 100644 (file)
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -6,7 +6,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -48,20 +48,10 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
        private $lastContents = array();
 
        /**
-        * Wether the "connection is already up
+        * Whether the "connection is already up
         */
        private $alreadyConnected = false;
 
-       /**
-        * Last error message
-        */
-       private $lastError = '';
-
-       /**
-        * Last exception
-        */
-       private $lastException = NULL;
-
        /**
         * Table information array
         */
@@ -106,24 +96,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                return $databaseInstance;
        }
 
-       /**
-        * Getter for last error message
-        *
-        * @return      $lastError      Last error message
-        */
-       public final function getLastError () {
-               return $this->lastError;
-       }
-
-       /**
-        * Getter for last exception
-        *
-        * @return      $lastException  Last thrown exception
-        */
-       public final function getLastException () {
-               return $this->lastException;
-       }
-
        /**
         * Setter for the last read file
         *
@@ -135,17 +107,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                $this->lastFile = (string) $fqfn;
        }
 
-       /**
-        * Reset the last error and exception instance. This should be done after
-        * a successfull "query"
-        *
-        * @return      void
-        */
-       private final function resetLastError () {
-               $this->lastError = '';
-               $this->lastException = NULL;
-       }
-
        /**
         * Getter for last read file
         *
@@ -337,14 +298,13 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         * Starts a SELECT query on the database by given return type, table name
         * and search criteria
         *
-        * @param       $resultType             Result type ('array', 'object' and 'indexed' are valid)
         * @param       $tableName              Name of the database table
         * @param       $criteria               Local search criteria class
         * @return      $resultData             Result data of the query
         * @throws      UnsupportedCriteriaException    If the criteria is unsupported
         * @throws      SqlException                                    If an 'SQL error' occurs
         */
-       public function querySelect ($resultType, $tableName, LocalSearchCriteria $criteriaInstance) {
+       public function querySelect ($tableName, LocalSearchCriteria $criteriaInstance) {
                // The result is null by any errors
                $resultData = NULL;
 
@@ -424,19 +384,17 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        $directoryInstance->closeDirectory();
                        unset($directoryInstance);
 
-                       // Reset last error message and exception
-                       $this->resetLastError();
+                       // Reset last exception
+                       $this->resetLastException();
                } catch (PathIsNoDirectoryException $e) {
                        // Path not found means "table not found" for real databases...
-                       $this->lastException = $e;
-                       $this->lastError     = $e->getMessage();
+                       $this->setLastException($e);
 
                        // So throw an SqlException here with faked error message
                        throw new SqlException (array($this, sprintf("Table &#39;%s&#39; not found", $tableName), self::DB_CODE_TABLE_MISSING), self::EXCEPTION_SQL_QUERY);
                } catch (FrameworkException $e) {
                        // Catch all exceptions and store them in last error
-                       $this->lastException = $e;
-                       $this->lastError     = $e->getMessage();
+                       $this->setLastException($e);
                }
 
                // Return the gathered result
@@ -462,12 +420,11 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        // Update the primary key
                        $this->updatePrimaryKey($dataSetInstance);
 
-                       // Reset last error message and exception
-                       $this->resetLastError();
+                       // Reset last exception
+                       $this->resetLastException();
                } catch (FrameworkException $e) {
                        // Catch all exceptions and store them in last error
-                       $this->lastException = $e;
-                       $this->lastError     = $e->getMessage();
+                       $this->setLastException($e);
 
                        // Throw an SQL exception
                        throw new SqlException(array($this, sprintf("Cannot write data to table &#39;%s&#39;, is the table created?", $dataSetInstance->getTableName()), self::DB_CODE_TABLE_UNWRITEABLE), self::EXCEPTION_SQL_QUERY);
@@ -501,7 +458,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        $searchInstance = $dataSetInstance->getSearchInstance();
 
                        // Read the directory with some exceptions
-                       while (($dataFile = $directoryInstance->readDirectoryExcept(array('.', '..', '.htaccess', '.svn', "info." . $this->getFileExtension()))) && ($limitFound < $searchInstance->getLimit())) {
+                       while (($dataFile = $directoryInstance->readDirectoryExcept(array('.', '..', '.htaccess', '.svn', 'info.' . $this->getFileExtension()))) && ($limitFound < $searchInstance->getLimit())) {
                                // Does the extension match?
                                if (substr($dataFile, -(strlen($this->getFileExtension()))) !== $this->getFileExtension()) {
                                        // Skip this file!
@@ -553,12 +510,11 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
                        // Update the primary key
                        $this->updatePrimaryKey($dataSetInstance);
 
-                       // Reset last error message and exception
-                       $this->resetLastError();
+                       // Reset last exception
+                       $this->resetLastException();
                } catch (FrameworkException $e) {
                        // Catch all exceptions and store them in last error
-                       $this->lastException = $e;
-                       $this->lastError = $e->getMessage();
+                       $this->setLastException($e);
 
                        // Throw an SQL exception
                        throw new SqlException(array($this, sprintf("Cannot write data to table &#39;%s&#39;, is the table created?", $dataSetInstance->getTableName()), self::DB_CODE_TABLE_UNWRITEABLE), self::EXCEPTION_SQL_QUERY);