[CLEANUP] Optimize scheduler task to be run in CLI mode

fnagel · Jan 13, 2014 · 7ccd7af · 7ccd7af
1 parent 0eb588c
commit 7ccd7af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/Classes/Task/MigrateDamCategoryRelationsTask.php b/Classes/Task/MigrateDamCategoryRelationsTask.php
@@ -160,7 +160,7 @@ protected function getAllMigratedDamRecords() {
 
 		$select = 'uid, _migrateddamuid AS damuid';
 		$from = 'sys_file';
-		$where = '_migrateddamuid>0 AND deleted=0';
+		$where = '_migrateddamuid>0';
 		$index = 'damuid';
 
 		$migratedRecords = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows($select,$from,$where,'','','',$index);
@@ -251,4 +251,4 @@ protected function increaseCategoriesFieldOfFile($fileUid) {
 
 		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('sys_file', $where, $updateValues);
 	}
-}
+}
diff --git a/Classes/Task/MigrateRelationsTask.php b/Classes/Task/MigrateRelationsTask.php
@@ -46,7 +46,7 @@ public function execute() {
 		$falRecords = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
 			'uid, _migrateddamuid AS damuid',
 			'sys_file',
-			'_migrateddamuid>0 AND deleted=0',
+			'_migrateddamuid>0',
 			'',	// group by
 			'', // order by
 			'', // limit
@@ -122,4 +122,4 @@ public function execute() {
 		return TRUE;
 	}
 
-}
+}
diff --git a/Classes/Task/MigrateTask.php b/Classes/Task/MigrateTask.php
@@ -55,7 +55,7 @@ public function execute() {
 		$migratedRecords = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
 			'uid, _migrateddamuid AS damuid',
 			'sys_file',
-			'_migrateddamuid>0 AND deleted=0',
+			'_migrateddamuid>0',
 			'',	// group by
 			'', // order by
 			'', // limit
@@ -96,6 +96,7 @@ public function execute() {
 			// right now we only support files in fileadmin/
 			if (\TYPO3\CMS\Core\Utility\GeneralUtility::isFirstPartOfStr($fileIdentifier, 'fileadmin/') === TRUE) {
 				// strip away the "fileadmin/" prefix
+				echo 'Indexing ' . $fileIdentifier . CRLF;
 				$fullFileName = substr($fileIdentifier, 10);
 
 				// check if the DAM record is already indexed for FAL (based on the filename)
@@ -105,7 +106,7 @@ public function execute() {
 					// file not found jump to next file
 					continue;
 				} catch(\Exception $e) {
-					var_dump($e);
+					echo 'File not found: ' . $fullFileName . CRLF;
 				}
 
 				if ($fileObject instanceof \TYPO3\CMS\Core\Resource\File) {
@@ -121,10 +122,12 @@ public function execute() {
 						$updateData['location_country'] = $damRecord['location_country'];
 					}
 
-					$fileObject->updateProperties($updateData);
-					$fileRepository->update($fileObject);
-
-					#$uid = $fileObject->getUid();
+					$uid = $fileObject->getUid();
+					$GLOBALS['TYPO3_DB']->exec_UPDATEquery(
+						'sys_file',
+						'uid=' . $uid,
+						$updateData
+					);
 					$migratedFiles++;
 
 
@@ -144,11 +147,13 @@ public function execute() {
 			$message = 'All files have been migrated.';
 		}
 
-		$messageObject = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $message, $headline);
-		\TYPO3\CMS\Core\Messaging\FlashMessageQueue::addMessage($messageObject);
+		if (!TYPO3_cliMode) {
+			$messageObject = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $message, $headline);
+			\TYPO3\CMS\Core\Messaging\FlashMessageQueue::addMessage($messageObject);
+		}
 
 			// it was always a success
 		return TRUE;
 	}
 
-}
+}