Merge branch '24.05.02' into 24.05.10

code/web/cron/importAspenBackup.php

@@ -21,8 +21,19 @@
 		if ($exportFile != '.' && $exportFile != '..' && is_file($sqlBackupDir . $exportFile)) {
 			/** @noinspection PhpStrFunctionsInspection */
 			if (strpos($exportFile, ".sql") > 0 && strpos($exportFile, 'mysql') === false) {
+				// Trimming the first two lines of the file
+				$filePath = $sqlBackupDir . $exportFile;
+				$fhnd = fopen($filePath, 'r');
+				$line = fgets($fhnd);
+				fclose($fhnd);
+
 				echo("Importing $exportFile\n");
-				$importCommand = "mysql -u$dbUser -p$dbPassword -h$dbHost -P$dbPort $dbName < $sqlBackupDir$exportFile";
+				if (strpos($line, "/*!999999\- enable the sandbox mode") === 0){
+					$importCommand = "mysql -u$dbUser -p$dbPassword -h$dbHost -P$dbPort -D $dbName --force < $sqlBackupDir$exportFile";
+				}else{
+					$importCommand = "mysql -u$dbUser -p$dbPassword -h$dbHost -P$dbPort $dbName < $sqlBackupDir$exportFile ";
+				}
+
 				$results = [];
 				exec($importCommand, $results);
 				echo(implode("\n", $results));

code/web/release_notes/24.05.02.MD

@@ -6,7 +6,10 @@
 - Correct indexing Polaris Items when new items are found that have not been indexed previously. (*MDN*)
 
 ### Symphony Updates
-- Immediately delete MARC files after they have been processed. (Ticket 128804) (*MDN*) 
+- Immediately delete MARC files after they have been processed. (Ticket 128804) (*MDN*)
+
+### Other Updates
+- Update import script to ignore sandbox mode if not available. (*MDN*)
 
 ## This release includes code contributions from
 - ByWater Solutions