From: Roland Häder <roland@mxchange.org>
Date: Wed, 30 May 2012 22:16:24 +0000 (+0000)
Subject: Temporary added very noisy debug lines
X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=70cb8ef9a893f8676290c77b0b83d53363b6914c

Temporary added very noisy debug lines
---

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 6d54d646..9c9c00bd 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -189,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');
 
@@ -200,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.');
 	}
 
 	/**
@@ -463,7 +469,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 				if (substr($dataFile, -(strlen($this->getFileExtension()))) !== $this->getFileExtension()) {
 					// Skip this file!
 					continue;
-				}
+				} // END - if
 
 				// Open this file for reading
 				$dataArray = $this->getDataArrayFromFile($pathName . $dataFile);
@@ -477,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
diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
index ba9b58c2..253463cf 100644
--- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
@@ -59,20 +59,13 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 * be verified here.
 	 *
 	 * @param	$pathName		The path name we shall pass to opendir()
-	 * @param	$inConstructor	If we are in de/con-structor or from somewhere
-	 *							else
-	 * @return	$pointerInstance	A prepared instance of
-	 *								FrameworkDirectoryPointer
-	 * @throws	PathIsEmptyException	If the provided path name
-	 *									is empty
-	 * @throws	InvalidPathStringException	If the provided path name is
-	 *										not a string
-	 * @throws	PathIsNoDirectoryException	If the provided path name is
-	 *										not valid
-	 * @throws	PathReadProtectedException	If the provided path name is
-	 *										read-protected
-	 * @throws	DirPointerNotOpened			If opendir() returns not a
-	 *										directory resource
+	 * @param	$inConstructor	If we are in de/con-structor or from somewhere else
+	 * @return	$pointerInstance	A prepared instance of FrameworkDirectoryPointer
+	 * @throws	PathIsEmptyException	If the provided path name is empty
+	 * @throws	InvalidPathStringException	If the provided path name is not a string
+	 * @throws	PathIsNoDirectoryException	If the provided path name is not valid
+	 * @throws	PathReadProtectedException	If the provided path name is read-protected
+	 * @throws	DirPointerNotOpenedException	If opendir() returns not a directory resource
 	 */
 	public static final function createFrameworkDirectoryPointer ($pathName, $inConstructor = false) {
 		// Some pre-sanity checks...
@@ -131,8 +124,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * Read raw lines of data from a directory pointer and return the data
 	 *
-	 * @return	string	Directory and/or file names read from the current
-	 *					directory pointer
+	 * @return	string	Directory and/or file names read from the current directory pointer
 	 */
 	public function readRawDirectory () {
 		// Read data from the directory pointer and return it
@@ -142,15 +134,13 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * Read lines from the current directory pointer except some parts
 	 *
-	 * @param		$except	Some parts of a directory we want to ignore.
-	 *					Valid: dirs
-	 *					Other values will be silently ignored
-	 * @return	string	Directory and/or file names read from the current
-	 *					directory pointer
+	 * @param	$except		Some parts of a directory we want to ignore. Valid: directory and file names, other values will be silently ignored
+	 * @return	string		Directory and/or file names read from the current directory pointer
 	 */
-	public function readDirectoryExcept (array $except = array()) {
+	public function readDirectoryExcept (array $except = array('.', '..')) {
 		if (count($except) == 0) {
 			// No exception given, so read all data
+			$this->debugOutput('DIRECTORY: No exceptions given, please use readRawDirectory() instead!');
 			return $this->readRawDirectory();
 		} // END - if
 
@@ -160,16 +150,16 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		// Shall we exclude directories?
 		if ((!is_null($rawLine)) && ($rawLine !== false) && (!in_array($rawLine, $except))) {
 			// Return read data
-			//* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: rawLine[' . gettype($rawLine) . ']=' . $rawLine);
+			/* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: rawLine[' . gettype($rawLine) . ']=' . $rawLine);
 			return $rawLine;
 		} elseif ((!is_null($rawLine)) && ($rawLine !== false)) {
 			// Exclude this part
-			//* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: rawline[' . gettype($rawLine) . ']=' . $rawLine . ' - Recursive call!');
+			/* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: rawline[' . gettype($rawLine) . ']=' . $rawLine . ' - Recursive call!');
 			return $this->readDirectoryExcept($except);
 		}
 
 		// End pointer reached
-		//* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: Returning NULL!');
+		/* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: Returning NULL!');
 		return NULL;
 	}
 
@@ -189,7 +179,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * Setter for the directory pointer
 	 *
-	 * @param		$dirPointer	The directory resource
+	 * @param	$dirPointer		The directory resource
 	 * @return	void
 	 */
 	public final function setPointer ($dirPointer) {
@@ -206,8 +196,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * Getter for the directory pointer
 	 *
-	 * @return	$dirPointer	The directory pointer which shall be a valid
-	 *						directory resource
+	 * @return	$dirPointer		The directory pointer which shall be a valid directory resource
 	 */
 	public final function getPointer () {
 		return $this->dirPointer;
@@ -216,7 +205,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * Setter for path name
 	 *
-	 * @param		$pathName		The new path name
+	 * @param	$pathName	The new path name
 	 * @return	void
 	 */
 	public final function setPathName ($pathName) {
@@ -227,7 +216,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * Getter for path name
 	 *
-	 * @return	$pathName		The current path name
+	 * @return	$pathName	The current path name
 	 */
 	public final function getPathName () {
 		return $this->pathName;