X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fdatabases%2Fclass_LocalFileDatabase.php;h=efc67c3e277a0eb236aadd61264d86a9503ad9cb;hb=ac948286448f4e0d4ef71d2dc8daaac53e8c902b;hp=2185039b5a814b21fd48beb59837c4bdcc8889eb;hpb=08f20e51c6a77a6f7998bbdac23bebe0ee03a125;p=core.git

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 2185039b..efc67c3e 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -206,7 +206,7 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: Writing ' . strlen($compressedData) . ' bytes ...');
 
 		// Write this data BASE64 encoded to the file
-		$this->getFileIoInstance()->saveFile($fqfn, $compressedData);
+		$this->getFileIoInstance()->saveFile($fqfn, $compressedData, $this);
 
 		// Debug message
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: Flushing ' . count($dataArray) . ' elements to database file completed.');
@@ -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);
@@ -357,11 +382,16 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 
 					// Search in the criteria with FMFW (First Matches, First Wins)
 					foreach ($dataArray as $key => $value) {
+						// Make sure value is not bool
+						assert(!is_bool($value));
+
 						// Found one entry?
 						$isFound = (($isFound === TRUE) && ($searchInstance->isCriteriaMatching($key, $value)));
+						//* 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());
 					if ($isFound === TRUE) {
 						// Shall we skip this entry?
 						if ($searchInstance->getSkip() > 0) {
@@ -378,7 +408,7 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 
 						// Entry found!
 						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: indexKey=' . $this->getIndexKey() . ',idx=' . $idx . ',dataArray=' . print_r($dataArray, TRUE));
-						$resultData[BaseDatabaseBackend::RESULT_INDEX_ROWS][] = $dataArray;
+						array_push($resultData[BaseDatabaseBackend::RESULT_INDEX_ROWS], $dataArray);
 
 						// Count found entries up
 						$limitFound++;
@@ -490,6 +520,9 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 
 					// Search in the criteria with FMFW (First Matches, First Wins)
 					foreach ($dataArray as $key => $value) {
+						// Make sure value is not bool
+						assert(!is_bool($value));
+
 						// Found one entry?
 						$isFound = (($isFound === TRUE) && ($searchInstance->isCriteriaMatching($key, $value)));
 					} // END - foreach
@@ -508,6 +541,11 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackendIn
 
 						// Entry found, so update it
 						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);
 							$dataArray[$searchKey] = $searchValue;
 						} // END - foreach