X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fdatabases%2Fclass_LocalFileDatabase.php;h=c4c67ee5a565c6b583d8d4e64d73691eb77be963;hp=7aa3fb359f983740957752b205021412b220bbd4;hb=c494848d03b5dc76e698b28aeb3c3f7301bdb2f5;hpb=ccc1db45751c976264513b8c51884e39f8214b12

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 7aa3fb35..c4c67ee5 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -272,6 +272,27 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 		$this->writeDataArrayToFqfn($fqfn, $this->tableInfo[$dataSetInstance->getTableName()]);
 	}
 
+	/**
+	 * Updates the table info file from given dataset instance
+	 *
+	 * @param	$dataSetInstance	An instance of a database set class
+	 * @return	void
+	 */
+	private function updateTableInfoFile (StoreableCriteria $dataSetInstance) {
+		// "Cache" table name
+		$tableName = $dataSetInstance->getTableName();
+
+		// Create FQFN for creating the table information file
+		$fqfn = $this->generateFqfnFromDataSet($dataSetInstance, 'info');
+
+		// Get the data out from dataset in a local array
+		$this->tableInfo[$tableName]['primary']      = $dataSetInstance->getPrimaryKey();
+		$this->tableInfo[$tableName]['last_updated'] = time();
+
+		// Write the data to the file
+		$this->writeDataArrayToFqfn($fqfn, $this->tableInfo[$tableName]);
+	}
+
 	/**
 	 * Updates the primary key information or creates the table info file if not found
 	 *
@@ -279,16 +300,20 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 	 * @return	void
 	 */
 	private function updatePrimaryKey (StoreableCriteria $dataSetInstance) {
+		// "Cache" table name
+		$tableName = $dataSetInstance->getTableName();
+
 		// Get the information array from lower method
 		$infoArray = $this->getContentsFromTableInfoFile($dataSetInstance);
 
 		// Is the primary key there?
-		if (!isset($this->tableInfo['primary'])) {
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: tableInfo=' . print_r($this->tableInfo, TRUE));
+		if (!isset($this->tableInfo[$tableName]['primary'])) {
 			// Then create the info file
 			$this->createTableInfoFile($dataSetInstance);
-		} elseif (($this->getConfigInstance()->getConfigEntry('db_update_primary_forced') == 'Y') && ($dataSetInstance->getPrimaryKey() != $this->tableInfo['primary'])) {
+		} elseif (($this->getConfigInstance()->getConfigEntry('db_update_primary_forced') == 'Y') && ($dataSetInstance->getPrimaryKey() != $this->tableInfo[$tableName]['primary'])) {
 			// Set the array element
-			$this->tableInfo[$dataSetInstance->getTableName()]['primary'] = $dataSetInstance->getPrimaryKey();
+			$this->tableInfo[$tableName]['primary'] = $dataSetInstance->getPrimaryKey();
 
 			// Update the entry
 			$this->updateTableInfoFile($dataSetInstance);
@@ -348,7 +373,7 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 
 				// Read the file
 				$dataArray = $this->getDataArrayFromFile($pathName . $dataFile);
-				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',dataArray='.print_r($dataArray, TRUE));
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',dataArray='.print_r($dataArray, TRUE));
 
 				// Is this an array?
 				if (is_array($dataArray)) {
@@ -362,11 +387,11 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 
 						// Found one entry?
 						$isFound = (($isFound === TRUE) && ($searchInstance->isCriteriaMatching($key, $value)));
-						/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: key=' . $key . ',value=' . $value . ',isFound=' . intval($isFound));
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: key=' . $key . ',value=' . $value . ',isFound=' . intval($isFound));
 					} // END - foreach
 
 					// Is all found?
-					/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: isFound=' . intval($isFound) . ',limitFound=' . $limitFound . ',limit=' . $searchInstance->getLimit());
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: isFound=' . intval($isFound) . ',limitFound=' . $limitFound . ',limit=' . $searchInstance->getLimit());
 					if ($isFound === TRUE) {
 						// Shall we skip this entry?
 						if ($searchInstance->getSkip() > 0) {
@@ -518,6 +543,7 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 						foreach ($searchArray as $searchKey => $searchValue) {
 							// Make sure the value is not bool again
 							assert(!is_bool($searchValue));
+							assert($searchKey != $this->indexKey);
 
 							// Debug message + add/update it
 							//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: criteriaKey=' . $searchKey . ',criteriaValue=' . $searchValue);