X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fdatabases%2Fclass_LocalFileDatabase.php;h=d4c45e972eaa9b04c03f8de6b5e3fcc190597c26;hp=1c03a52128797d30a63b81826732ea4c3b22ae84;hb=0d566e56ff27dcbf25a90d513950bbf26fe71422;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 1c03a521..d4c45e97 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -75,7 +75,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	/**
 	 * Element for index
 	 */
-	private $indexKey = "__idx";
+	private $indexKey = '__idx';
 
 	/**
 	 * The protected constructor. Do never instance from outside! You need to
@@ -86,20 +86,16 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	protected function __construct() {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
 	 * Create an object of LocalFileDatabase and set the save path for local files.
 	 * This method also validates the given file path.
 	 *
-	 * @param		$savePath					The local file path string
-	 * @param		$ioInstance				The input/output handler. This
-	 *									should be FileIoHandler
-	 * @return	$dbInstance				An instance of LocalFileDatabase
+	 * @param		$savePath		The local file path string
+	 * @param		$ioInstance		The input/output handler. This
+	 *								should be FileIoHandler
+	 * @return	$dbInstance			An instance of LocalFileDatabase
 	 */
 	public final static function createLocalFileDatabase ($savePath, FileIoHandler $ioInstance) {
 		// Get an instance
@@ -285,7 +281,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 		$infoArray = array();
 
 		// Create FQFN for getting the table information file
-		$fqfn = $this->getSavePath() . $dataSetInstance->getTableName() . '/info.' . $this->getFileExtension();
+		$fqfn = $this->generateFqfnFromDataSet($dataSetInstance, 'info');
 
 		// Get the file contents
 		try {
@@ -298,6 +294,21 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 		return $infoArray;
 	}
 
+	/**
+	 * Generates an FQFN from given dataset instance and string
+	 *
+	 * @param	$dataSetInstance	An instance of a database set class
+	 * @param	$rowName			Name of the row
+	 * @return	$fqfn				The FQFN for this row
+	 */
+	private function generateFqfnFromDataSet (Criteria $dataSetInstance, $rowName) {
+		// This is the FQFN
+		$fqfn = $this->getSavePath() . $dataSetInstance->getTableName() . '/' . $rowName . '.' . $this->getFileExtension();
+
+		// Return it
+		return $fqfn;
+	}
+
 	/**
 	 * Creates the table info file from given dataset instance
 	 *
@@ -306,7 +317,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	 */
 	private function createTableInfoFile (StoreableCriteria $dataSetInstance) {
 		// Create FQFN for creating the table information file
-		$fqfn = $this->getSavePath() . $dataSetInstance->getTableName() . '/info.' . $this->getFileExtension();
+		$fqfn = $this->generateFqfnFromDataSet($dataSetInstance, 'info');
 
 		// Get the data out from dataset in a local array
 		$this->tableInfo[$dataSetInstance->getTableName()] = array(
@@ -333,7 +344,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 		if (!isset($this->tableInfo['primary'])) {
 			// Then create the info file
 			$this->createTableInfoFile($dataSetInstance);
-		} elseif (($this->getConfigInstance()->readConfig('db_update_primary_forced') == 'Y') && ($dataSetInstance->getPrimaryKey() != $this->tableInfo['primary'])) {
+		} elseif (($this->getConfigInstance()->getConfigEntry('db_update_primary_forced') == 'Y') && ($dataSetInstance->getPrimaryKey() != $this->tableInfo['primary'])) {
 			// Set the array element
 			$this->tableInfo[$dataSetInstance->getTableName()]['primary'] = $dataSetInstance->getPrimaryKey();
 
@@ -469,12 +480,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	 */
 	public function queryInsertDataSet (StoreableCriteria $dataSetInstance) {
 		// Create full path name
-		$fqfn = sprintf("%s%s/%s.%s",
-			$this->getSavePath(),
-			$dataSetInstance->getTableName(),
-			md5($dataSetInstance->getUniqueValue()),
-			$this->getFileExtension()
-		);
+		$fqfn = $this->generateFqfnFromDataSet($dataSetInstance, md5($dataSetInstance->getUniqueValue()));
 
 		// Try to save the request away
 		try {