fixes for pdf

UMN-LATIS · Jul 15, 2024 · 05f706c · 05f706c
1 parent d07d254
commit 05f706c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/application/controllers/Beltdrive.php b/application/controllers/Beltdrive.php
@@ -121,6 +121,16 @@ public function processAWSBatchJob($fileObjectId) {
 			}
 			// reload each time to make sure artifacts get properly populated
 			$fileHandler->loadByObjectId($fileObjectId);
+			// lookup instance based on this file's collection.
+			$collection = $this->collection_model->getCollection($fileHandler->collectionId);
+			if($collection) {
+				$instances = $collection->getInstances();
+				if(count($instances) > 0) {
+					$instance = $instances[0];
+					$instanceId = $instance->getId();
+					$this->instance = $instance;
+				}
+			}
 			$performTaskByName = $fileHandler->performTaskByName($task["taskType"], array_merge($task["config"], ["runInLoop"=>true]));
 			if($performTaskByName == JOB_FAILED) {
 				// do some logging?

diff --git a/application/libraries/PDFHelper.php b/application/libraries/PDFHelper.php
@@ -18,7 +18,9 @@ public function minifyPDF($pdfFile) {
 		$process->run();
 		while($process->isRunning()) {
 			sleep(5);
-			$this->CI->pheanstalk->touch($this->CI->job);
+			if(isset($this->CI->job)) {
+				$this->CI->pheanstalk->touch($this->CI->job);
+			}
 			echo ".";
 		}
 		if(!file_exists($outFile)) {
@@ -61,7 +63,10 @@ public function scrapeText($pdfFile) {
 		$process->run();
 		while($process->isRunning()) {
 			sleep(5);
-			$this->CI->pheanstalk->touch($this->CI->job);
+			if(isset($this->CI->job)) {
+				$this->CI->pheanstalk->touch($this->CI->job);
+			}
+
 			echo ".";
 		}
 

diff --git a/application/models/filehandlers/Pdfhandler.php b/application/models/filehandlers/Pdfhandler.php
@@ -128,6 +128,9 @@ public function createThumbnails($args) {
 		ini_set('memory_limit', '4096M');
 		$success = true;
 		foreach($args as $derivativeSetting) {
+			if(!isset($derivativeSetting['type'])) {
+				continue;
+			}
 			$derivativeType = $derivativeSetting['type'];
 			$width = $derivativeSetting['width'];
 			$height = $derivativeSetting['height'];