X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fdatabases%2Fclass_LocalFileDatabase.php;h=9c9c00bde531870addff78e18f3611f25ea5919f;hp=d104151d0cda7ba443872d20b8b913e75dd5dfe7;hb=70cb8ef9a893f8676290c77b0b83d53363b6914c;hpb=3cfc834fbd3fae00c5edc65033c0f043fc4186a2

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index d104151d..9c9c00bd 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -52,11 +52,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	 */
 	private $alreadyConnected = false;
 
-	/**
-	 * Last exception
-	 */
-	private $lastException = NULL;
-
 	/**
 	 * Table information array
 	 */
@@ -101,15 +96,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 		return $databaseInstance;
 	}
 
-	/**
-	 * Getter for last exception
-	 *
-	 * @return	$lastException	Last thrown exception
-	 */
-	public final function getLastException () {
-		return $this->lastException;
-	}
-
 	/**
 	 * Setter for the last read file
 	 *
@@ -121,16 +107,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 		$this->lastFile = (string) $fqfn;
 	}
 
-	/**
-	 * Reset the last exception instance. This should be done after a "query"
-	 * was completed without any errors.
-	 *
-	 * @return	void
-	 */
-	private final function resetLastException () {
-		$this->lastException = NULL;
-	}
-
 	/**
 	 * Getter for last read file
 	 *
@@ -213,6 +189,9 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	 * @return	void
 	 */
 	private function writeDataArrayToFqfn ($fqfn, array $dataArray) {
+		// Debug message
+		/* NOISY-DEBUG: */ $this->debugOutput('DATABASE: Flushing ' . count($dataArray) . ' elements to database file ' . $fqfn . ' ...');
+
 		// Get a file pointer instance
 		$fileInstance = FrameworkFileOutputPointer::createFrameworkFileOutputPointer($fqfn, 'w');
 
@@ -224,6 +203,9 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 
 		// Close the file pointer
 		$fileInstance->closeFile();
+
+		// Debug message
+		/* NOISY-DEBUG: */ $this->debugOutput('DATABASE: Flushing ' . count($dataArray) . ' elements to database file completed.');
 	}
 
 	/**
@@ -412,13 +394,13 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 			$this->resetLastException();
 		} catch (PathIsNoDirectoryException $e) {
 			// Path not found means "table not found" for real databases...
-			$this->lastException = $e;
+			$this->setLastException($e);
 
 			// So throw an SqlException here with faked error message
 			throw new SqlException (array($this, sprintf("Table '%s' 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->setLastException($e);
 		}
 
 		// Return the gathered result
@@ -448,7 +430,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 			$this->resetLastException();
 		} catch (FrameworkException $e) {
 			// Catch all exceptions and store them in last error
-			$this->lastException = $e;
+			$this->setLastException($e);
 
 			// Throw an SQL exception
 			throw new SqlException(array($this, sprintf("Cannot write data to table '%s', is the table created?", $dataSetInstance->getTableName()), self::DB_CODE_TABLE_UNWRITEABLE), self::EXCEPTION_SQL_QUERY);
@@ -482,12 +464,12 @@ 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!
 					continue;
-				}
+				} // END - if
 
 				// Open this file for reading
 				$dataArray = $this->getDataArrayFromFile($pathName . $dataFile);
@@ -501,7 +483,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 
 						// Is the criteria met?
 						if ((!is_null($criteria)) && ($criteria == $value))  {
-
 							// Shall we skip this entry?
 							if ($searchInstance->getSkip() > 0) {
 								// We shall skip some entries
@@ -538,7 +519,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 			$this->resetLastException();
 		} catch (FrameworkException $e) {
 			// Catch all exceptions and store them in last error
-			$this->lastException = $e;
+			$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);