Merge lp:~sebastian-meyer/goobi-presentation/bug809828 into lp:goobi-presentation/1.0

[Sebastian Meyer]

Fix Bug #809828: Collections with deleted documents can not be re-indexed.

[Sebastian Meyer (sebastian-meyer)]

review: Approve

=== modified file 'dlf/cli/class.tx_dlf_cli.php'
--- dlf/cli/class.tx_dlf_cli.php	2011-06-22 13:18:23 +0000
+++ dlf/cli/class.tx_dlf_cli.php	2011-08-10 11:07:28 +0000
@@ -80,11 +80,11 @@
 				$doc = tx_dlf_document::getInstance($this->cli_args['-doc'][0], 0, TRUE);
 
 				// ...save it to the database...
-				if (!($doc instanceof tx_dlf_document) || !$doc->save(intval($this->cli_args['-pid'][0]), $this->cli_args['-core'][0])) {
+				if ($doc === NULL || !$doc->save(intval($this->cli_args['-pid'][0]), $this->cli_args['-core'][0])) {
 
 					$this->cli_echo('ERROR: Document '.$this->cli_args['-doc'][0].' not saved and indexed'.LF, TRUE);
 
-					return 1;
+					exit (1);
 
 				}
 
@@ -98,7 +98,7 @@
 
 		}
 
-		return 0;
+		exit (0);
 
 	}
 

=== modified file 'dlf/common/class.tx_dlf_document.php'
--- dlf/common/class.tx_dlf_document.php	2011-06-27 09:20:36 +0000
+++ dlf/common/class.tx_dlf_document.php	2011-08-10 11:07:28 +0000
@@ -347,15 +347,19 @@
 		$instance = new self($uid, $pid);
 
 		// ...and save it to registry.
-		self::$registry[$instance->uid] = $instance;
-
-		// Load extension configuration
-		$_extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
-
-		// Save document to session if caching is enabled.
-		if (!empty($_extConf['caching'])) {
-
-			tx_dlf_helper::saveToSession(self::$registry, get_class($instance));
+		if ($instance !== NULL) {
+
+			self::$registry[$instance->uid] = $instance;
+
+			// Load extension configuration
+			$_extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
+
+			// Save document to session if caching is enabled.
+			if (!empty($_extConf['caching'])) {
+
+				tx_dlf_helper::saveToSession(self::$registry, get_class($instance));
+
+			}
 
 		}
 
@@ -578,7 +582,7 @@
 
 				trigger_error('Invalid class/method '.$_class.'->extractMetadata()', E_USER_ERROR);
 
-				exit;
+				return array ();
 
 			}
 
@@ -720,8 +724,6 @@
 
 			trigger_error('No valid METS part found in document with UID '.$this->uid, E_USER_ERROR);
 
-			exit;
-
 		}
 
 	}
@@ -834,7 +836,7 @@
 
 			trigger_error('Saving documents is only allowed in the backend!', E_USER_ERROR);
 
-			exit;
+			return FALSE;
 
 		}
 
@@ -1056,14 +1058,18 @@
 
 			$superior = tx_dlf_document::getInstance($this->tableOfContents[0]['points']);
 
-			if ($superior->pid != $pid) {
-
-				$superior->save($pid);
+			if ($superior !== NULL) {
+
+				if ($superior->pid != $pid) {
+
+					$superior->save($pid);
+
+				}
+
+				$partof = $superior->uid;
 
 			}
 
-			$partof = $superior->uid;
-
 		}
 
 		// Get metadata for lists.
@@ -1234,7 +1240,7 @@
 
 			trigger_error('No PID for metadata definitions found', E_USER_ERROR);
 
-			exit;
+			return array ();
 
 		}
 
@@ -1646,7 +1652,7 @@
 
 			trigger_error('There is no record with UID '.$uid.' or you are not allowed to access it', E_USER_ERROR);
 
-			exit;
+			return;
 
 		}
 
@@ -1679,7 +1685,7 @@
 			trigger_error('Could not load XML file from '.$location, E_USER_ERROR);
 			// TODO: libxml_get_errors() || libxml_get_last_error() || libxml_clear_errors()
 
-			exit;
+			return;
 
 		}
 
@@ -1805,7 +1811,7 @@
 			trigger_error('Could not reload XML from session', E_USER_ERROR);
 			// TODO: libxml_get_errors() || libxml_get_last_error() || libxml_clear_errors()
 
-			exit;
+			return;
 
 		}
 

=== modified file 'dlf/common/class.tx_dlf_helper.php'
--- dlf/common/class.tx_dlf_helper.php	2011-06-27 09:03:45 +0000
+++ dlf/common/class.tx_dlf_helper.php	2011-08-10 11:07:28 +0000
@@ -736,16 +736,12 @@
 
 					trigger_error('There are no entries with PID '.$pid.' in table '.$table.' or you are not allowed to access them', E_USER_ERROR);
 
-					exit;
-
 				}
 
 			} else {
 
 				trigger_error('The table '.$table.' is not allowed for translation', E_USER_ERROR);
 
-				exit;
-
 			}
 
 		}
@@ -821,7 +817,7 @@
 
 			trigger_error('Unexpected TYPO3_MODE', E_USER_ERROR);
 
-			exit;
+			return ' AND 1=-1';
 
 		}
 

=== modified file 'dlf/common/class.tx_dlf_indexing.php'
--- dlf/common/class.tx_dlf_indexing.php	2011-06-22 17:48:56 +0000
+++ dlf/common/class.tx_dlf_indexing.php	2011-08-10 11:07:28 +0000
@@ -147,7 +147,19 @@
 			// Handle multi-volume documents.
 			if ($doc->parentid) {
 
-				$errors = self::add(tx_dlf_document::getInstance($doc->parentid, 0, TRUE), $core);
+				$parent = tx_dlf_document::getInstance($doc->parentid, 0, TRUE);
+
+				if ($parent !== NULL) {
+
+					$errors = self::add($parent, $core);
+
+				} else {
+
+					trigger_error('Could not load multi-volume work with UID '.$doc->parentid, E_USER_ERROR);
+
+					return 1;
+
+				}
 
 			}
 

=== modified file 'dlf/common/class.tx_dlf_plugin.php'
--- dlf/common/class.tx_dlf_plugin.php	2011-04-01 15:53:16 +0000
+++ dlf/common/class.tx_dlf_plugin.php	2011-08-10 11:07:28 +0000
@@ -188,6 +188,12 @@
 			// Get instance of tx_dlf_document.
 			$this->doc = tx_dlf_document::getInstance($this->piVars['id'], $pid);
 
+			if ($this->doc === NULL) {
+
+				trigger_error('Failed to load document with UID '.$this->piVars['id'], E_USER_ERROR);
+
+			}
+
 		} else {
 
 			trigger_error('Required parameters are not set', E_USER_ERROR);

=== modified file 'dlf/hooks/class.tx_dlf_tcemain.php'
--- dlf/hooks/class.tx_dlf_tcemain.php	2011-06-15 16:12:43 +0000
+++ dlf/hooks/class.tx_dlf_tcemain.php	2011-08-10 11:07:28 +0000
@@ -241,7 +241,15 @@
 									// Reindex document.
 									$doc = tx_dlf_document::getInstance($id);
 
-									$doc->save($doc->pid, $core);
+									if ($doc !== NULL) {
+
+										$doc->save($doc->pid, $core);
+
+									} else {
+
+										trigger_error('Failed to reindex document with UID '.$id, E_USER_WARNING);
+
+									}
 
 								}
 
@@ -303,7 +311,15 @@
 
 							$doc = tx_dlf_document::getInstance($id);
 
-							$doc->save($doc->pid, $core);
+							if ($doc !== NULL) {
+
+								$doc->save($doc->pid, $core);
+
+							} else {
+
+								trigger_error('Failed to reindex document with UID '.$id, E_USER_WARNING);
+
+							}
 
 							break;
 
@@ -321,7 +337,15 @@
 							// Reindex document.
 							$doc = tx_dlf_document::getInstance($id);
 
-							$doc->save($doc->pid, $core);
+							if ($doc !== NULL) {
+
+								$doc->save($doc->pid, $core);
+
+							} else {
+
+								trigger_error('Failed to reindex document with UID '.$id, E_USER_WARNING);
+
+							}
 
 							break;
 

=== modified file 'dlf/modules/indexing/index.php'
--- dlf/modules/indexing/index.php	2011-06-23 08:24:25 +0000
+++ dlf/modules/indexing/index.php	2011-08-10 11:07:28 +0000
@@ -182,7 +182,7 @@
 		// Save document to database and index.
 		$doc = tx_dlf_document::getInstance($uid, 0, TRUE);
 
-		if (!$doc->save($doc->pid, $this->data['core'])) {
+		if ($doc === NULL || !$doc->save($doc->pid, $this->data['core'])) {
 
 			$_message = t3lib_div::makeInstance(
 				't3lib_FlashMessage',
@@ -212,8 +212,6 @@
 
 		$this->printContent();
 
-		exit;
-
 	}
 
 	/**
@@ -248,7 +246,7 @@
 						// Save document to database and index.
 						$doc = tx_dlf_document::getInstance($this->data['id'], 0, TRUE);
 
-						if (!$doc->save($this->id, $this->data['core'])) {
+						if ($doc === NULL || !$doc->save($this->id, $this->data['core'])) {
 
 							$_message = t3lib_div::makeInstance(
 								't3lib_FlashMessage',
@@ -279,7 +277,7 @@
 								'tx_dlf_relations',
 								'tx_dlf_collections',
 								'AND tx_dlf_documents.pid='.intval($this->id).' AND tx_dlf_collections.uid='.intval($this->data['collection']).tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-								'',
+								'tx_dlf_documents.uid',
 								'',
 								''
 							);

=== modified file 'dlf/plugins/metadata/class.tx_dlf_metadata.php'
--- dlf/plugins/metadata/class.tx_dlf_metadata.php	2011-06-07 15:32:59 +0000
+++ dlf/plugins/metadata/class.tx_dlf_metadata.php	2011-08-10 11:07:28 +0000
@@ -53,16 +53,16 @@
 
 		$this->init($conf);
 
-		// Quit without doing anything if required piVars are not set.
-		if (!$this->checkPIvars()) {
-
-			return $content;
-
-		}
-
 		// Load current document.
 		$this->loadDocument();
 
+		// Quit without doing anything if required variables are not set.
+		if ($this->doc === NULL) {
+
+			return $content;
+
+		}
+
 		$metadata = array ();
 
 		if ($this->conf['rootline'] < 2) {

=== modified file 'dlf/plugins/navigation/class.tx_dlf_navigation.php'
--- dlf/plugins/navigation/class.tx_dlf_navigation.php	2011-04-01 15:53:16 +0000
+++ dlf/plugins/navigation/class.tx_dlf_navigation.php	2011-08-10 11:07:28 +0000
@@ -53,17 +53,11 @@
 
 		$this->init($conf);
 
-		// Quit without doing anything if required piVars are not set.
-		if (!$this->checkPIvars()) {
-
-			return $content;
-
-		}
-
+		// Load current document.
 		$this->loadDocument();
 
-		// Check if this document has any images.
-		if ($this->doc->numPages < 1) {
+		// Quit without doing anything if required variables are not set.
+		if ($this->doc === NULL || $this->doc->numPages < 1) {
 
 			return $content;
 

=== modified file 'dlf/plugins/pageview/class.tx_dlf_pageview.php'
--- dlf/plugins/pageview/class.tx_dlf_pageview.php	2011-06-27 09:20:36 +0000
+++ dlf/plugins/pageview/class.tx_dlf_pageview.php	2011-08-10 11:07:28 +0000
@@ -149,17 +149,11 @@
 
 		$this->init($conf);
 
-		// Quit without doing anything if required piVars are not set.
-		if (!$this->checkPIvars()) {
-
-			return $content;
-
-		}
-
+		// Load current document.
 		$this->loadDocument();
 
-		// Check if this document has any images.
-		if ($this->doc->numPages < 1) {
+		// Quit without doing anything if required variables are not set.
+		if ($this->doc === NULL || $this->doc->numPages < 1) {
 
 			return $content;
 

=== modified file 'dlf/plugins/toc/class.tx_dlf_toc.php'
--- dlf/plugins/toc/class.tx_dlf_toc.php	2011-06-22 17:36:00 +0000
+++ dlf/plugins/toc/class.tx_dlf_toc.php	2011-08-10 11:07:28 +0000
@@ -85,7 +85,15 @@
 
 			$_doc = tx_dlf_document::getInstance($entry['points'], ($this->conf['excludeOther'] ? $this->conf['pages'] : 0));
 
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => ($_doc->pid ? $_doc->uid : $entry['points']), 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+			if ($_doc !== NULL) {
+
+				$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => ($_doc->pid ? $_doc->uid : $entry['points']), 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+
+			} else {
+
+				$entryArray['doNotLinkIt'] = 1;
+
+			}
 
 		} elseif (!empty($entry['points']['doc'])) {
 
@@ -211,16 +219,16 @@
 
 		$this->init($conf);
 
-		// Quit without doing anything if required piVars are not set.
-		if (!$this->checkPIvars()) {
-
-			return array ();
-
-		}
-
 		// Load current document.
 		$this->loadDocument();
 
+		// Quit without doing anything if required variables are not set.
+		if ($this->doc === NULL) {
+
+			return array ();
+
+		}
+
 		$menuArray = array ();
 
 		// Does the document have physical pages or is it an external file?