X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fdatabases%2Fclass_LocalFileDatabase.php;h=b3ee46ecb7b2b22851e2337439289394b4797417;hb=4c35e8280767c1e33832097060e39a32b80ffd01;hp=417c861ea61d8fe5176c156bc87468c0cfab01aa;hpb=9e29c40258d287d2fe93aa8ef0e1ea814399419f;p=shipsimu.git

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 417c861..b3ee46e 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -301,130 +301,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 		return $this->fileExtension;
 	}
 
-	/**
-	 * Get cached (last fetched) data from the local file database
-	 *
-	 * @param	$uniqueID	The ID number for looking up the data
-	 * @return	$object		The restored object from the maybe compressed
-	 *						serialized data
-	 * @throws	MismatchingCompressorsException		If the compressor from
-	 *									the loaded file
-	 *									mismatches with the
-	 *									current used one.
-	 * @throws	NullPointerException	If the restored object
-	 *									is null
-	 * @throws	NoObjectException		If the restored "object"
-	 *									is not an object instance
-	 * @throws	MissingMethodException	If the required method
-	 *									toString() is missing
-	 * @deprecated
-	 */
-	public final function getObjectFromCachedData ($uniqueID) {
-		// Get instance for file handler
-		$inputHandler = $this->getFileIoInstance();
-
-		// Get last file's name and contents
-		$fqfn = $this->repairFQFN($this->getLastFile(), $uniqueID);
-		$contents = $this->repairContents($this->getLastContents(), $fqfn);
-
-		// Let's decompress it. First we need the instance
-		$compressInstance = $this->getCompressorChannel();
-
-		// Is the compressor's extension the same as the one from the data?
-		if ($compressInstance->getCompressorExtension() != $contents['header'][0]) {
-			/**
-			 * @todo	For now we abort here but later we need to make this a little more dynamic.
-			 */
-			throw new MismatchingCompressorsException(array($this, $contents['header'][0], $fqfn, $compressInstance->getCompressorExtension()), self::EXCEPTION_MISMATCHING_COMPRESSORS);
-		}
-
-		// Decompress the data now
-		$serialized = $compressInstance->getCompressor()->decompressStream($contents['data']);
-
-		// And unserialize it...
-		$object = unserialize($serialized);
-
-		// This must become a valid object, so let's check it...
-		if (is_null($object)) {
-			// Is null, throw exception
-			throw new NullPointerException($object, self::EXCEPTION_IS_NULL_POINTER);
-		} elseif (!is_object($object)) {
-			// Is not an object, throw exception
-			throw new NoObjectException($object, self::EXCEPTION_IS_NO_OBJECT);
-		} elseif (!$object instanceof FrameworkInterface) {
-			// A highly required method was not found... :-(
-			throw new MissingMethodException(array($object, '__toString'), self::EXCEPTION_MISSING_METHOD);
-		}
-
-		// And return the object
-		return $object;
-	}
-
-	/**
-	 * Private method for re-gathering (repairing) the FQFN
-	 *
-	 * @param	$fqfn		The current FQFN we shall validate
-	 * @param	$uniqueID	The unique ID number
-	 * @return	$fqfn		The repaired FQFN when it is empty
-	 * @throws	NoArrayCreatedException		If explode() has not
-	 *										created an array
-	 * @throws	InvalidArrayCountException	If the array count is not
-	 *										as the expected
-	 * @deprecated
-	 */
-	private function repairFQFN ($fqfn, $uniqueID) {
-		// Cast both strings
-		$fqfn     = (string) $fqfn;
-		$uniqueID = (string) $uniqueID;
-
-		// Is there pre-cached data available?
-		if (empty($fqfn)) {
-			// Split the unique ID up in path and file name
-			$pathFile = explode("@", $uniqueID);
-
-			// Are there two elements? Index 0 is the path, 1 the file name + global extension
-			if (!is_array($pathFile)) {
-				// No array found
-				throw new NoArrayCreatedException(array($this, "pathFile"), self::EXCEPTION_ARRAY_EXPECTED);
-			} elseif (count($pathFile) != 2) {
-				// Invalid ID returned!
-				throw new InvalidArrayCountException(array($this, "pathFile", count($pathFile), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-			}
-
-			// Create full path name
-			$pathName = $this->getSavePath() . $pathFile[0];
-
-			// Nothing cached, so let's create a FQFN first
-			$fqfn = sprintf("%s/%s.%s", $pathName, $pathFile[1], $this->getFileExtension());
-			$this->setLastFile($fqfn);
-		}
-
-		// Return repaired FQFN
-		return $fqfn;
-	}
-
-	/**
-	 * Private method for re-gathering the contents of a given file
-	 *
-	 * @param		$contents		The (maybe) already cached contents as an array
-	 * @param		$fqfn		The current FQFN we shall validate
-	 * @return	$contents		The repaired contents from the given file
-	 * @deprecated
-	 */
-	private function repairContents ($contents, $fqfn) {
-		// Is there some content and header (2 indexes) in?
-		if ((!is_array($contents)) || (count($contents) != 2) || (!isset($contents['header'])) || (!isset($contents['data']))) {
-			// No content found so load the file again
-			$contents = $inputHandler->loadFileContents($fqfn);
-
-			// And remember all data for later usage
-			$this->setLastContents($contents);
-		}
-
-		// Return the repaired contents
-		return $contents;
-	}
-
 	/**
 	 * Reads a local data file  and returns it's contents in an array
 	 *
@@ -477,9 +353,9 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	 * Makes sure that the database connection is alive
 	 *
 	 * @return	void
+	 * @todo	Do some checks on the database directory and files here
 	 */
 	public function connectToDatabase () {
-		/* @TODO Do some checks on the database directory and files here */
 	}
 
 	/**