Merge lp:goobi-presentation/1.1 into lp:~slub.team/goobi-presentation/old-bzr-trunk

[Sebastian Meyer]

[Sebastian Meyer (sebastian-meyer)]

review: Approve

=== modified file 'dlf/common/class.tx_dlf_document.php'
--- dlf/common/class.tx_dlf_document.php	2012-08-09 10:31:57 +0000
+++ dlf/common/class.tx_dlf_document.php	2012-08-17 07:00:27 +0000
@@ -35,7 +35,7 @@
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_document {
+final class tx_dlf_document {
 
 	/**
 	 * This holds the whole XML file as string for serialization purposes
@@ -87,15 +87,23 @@
 	 * @access protected
 	 */
 	protected $formats = array (
-		'OTHER' => array (
-			'DVRIGHTS' => array (
-				'rootElement' => 'rights',
-				'namespaceURI' => 'http://dfg-viewer.de/',
-			),
-			'DVLINKS' => array (
-				'rootElement' => 'links',
-				'namespaceURI' => 'http://dfg-viewer.de/',
-			)
+		'METS' => array (
+			'rootElement' => 'mets',
+			'namespaceURI' => 'http://www.loc.gov/METS/',
+		),
+		// This one can become a problem, because MODS uses its own custom XLINK schema.
+		// @see http://comments.gmane.org/gmane.comp.text.mods/1126
+		'XLINK' => array (
+			'rootElement' => 'xlink',
+			'namespaceURI' => 'http://www.w3.org/1999/xlink',
+		),
+		'DVRIGHTS' => array (
+			'rootElement' => 'rights',
+			'namespaceURI' => 'http://dfg-viewer.de/',
+		),
+		'DVLINKS' => array (
+			'rootElement' => 'links',
+			'namespaceURI' => 'http://dfg-viewer.de/',
 		)
 	);
 
@@ -300,13 +308,17 @@
 	 */
 	public function getFileLocation($id) {
 
-		if (($_location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/mets:FLocat[@LOCTYPE="URL"]'))) {
+		if (($location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/mets:FLocat[@LOCTYPE="URL"]'))) {
 
-			return (string) $_location[0]->attributes('http://www.w3.org/1999/xlink')->href;
+			return (string) $location[0]->attributes('http://www.w3.org/1999/xlink')->href;
 
 		} else {
 
-			trigger_error('There is no file node with @ID '.$id, E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->getFileLocation('.$id.')] There is no file node with @ID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return '';
 
@@ -325,9 +337,9 @@
 
 		if (!$this->hookObjectsLoaded && is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'])) {
 
-			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'] as $_classRef) {
+			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'] as $classRef) {
 
-				$this->hookObjects[] = t3lib_div::getUserObj($_classRef);
+				$this->hookObjects[] = t3lib_div::getUserObj($classRef);
 
 			}
 
@@ -393,10 +405,10 @@
 			self::$registry[$instance->uid] = $instance;
 
 			// Load extension configuration
-			$_extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
+			$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
 
 			// Save document to session if caching is enabled.
-			if (!empty($_extConf['caching'])) {
+			if (!empty($extConf['caching'])) {
 
 				tx_dlf_helper::saveToSession(self::$registry, get_class($instance));
 
@@ -412,6 +424,62 @@
 	/**
 	 * This gets details about a logical structure element
 	 *
+	 * @access	public
+	 *
+	 * @param	string		$id: The @ID attribute of the logical structure node
+	 * @param	boolean		$recursive: Whether to include the child elements
+	 *
+	 * @return	array		Array of the element's id, label, type and physical page indexes/mptr link
+	 */
+	public function getLogicalStructure($id, $recursive = FALSE) {
+
+		$details = array ();
+
+		// Is the requested logical unit already loaded?
+		if (!$recursive && !empty($this->logicalUnits[$id])) {
+
+			// Yes. Return it.
+			return $this->logicalUnits[$id];
+
+		} elseif (!empty($id)) {
+
+			// Get specified logical unit.
+			$divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]');
+
+		} else {
+
+			// Get all logical units at top level.
+			$divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div');
+
+		}
+
+		if (!empty($divs)) {
+
+			if (!$recursive) {
+
+				// Get the details for the first xpath hit.
+				$details = $this->getLogicalStructureInfo($divs[0]);
+
+			} else {
+
+				// Walk the logical structure recursively and fill the whole table of contents.
+				foreach ($divs as $div) {
+
+					$this->tableOfContents[] = $this->getLogicalStructureInfo($div, TRUE);
+
+				}
+
+			}
+
+		}
+
+		return $details;
+
+	}
+
+	/**
+	 * This gets details about a logical structure element
+	 *
 	 * @access	protected
 	 *
 	 * @param	SimpleXMLElement		$structure: The logical structure node
@@ -439,6 +507,7 @@
 
 		$details['volume'] = '';
 
+		// Set volume information only if no label is set and this is the toplevel structure element.
 		if (empty($details['label']) && $details['id'] == $this->_getToplevelId()) {
 
 			$metadata = $this->getMetadata($details['id']);
@@ -455,11 +524,14 @@
 
 		$details['type'] = $attributes['TYPE'];
 
+		// Load smLinks.
+		$this->_getSmLinks();
+
 		// Get the physical page or external file this structure element is pointing at.
 		$details['points'] = '';
 
 		// Is there a mptr node?
-		if (!empty($structure->children('http://www.loc.gov/METS/')->mptr)) {
+		if (count($structure->children('http://www.loc.gov/METS/')->mptr)) {
 
 			// Yes. Get the file reference.
 			$details['points'] = (string) $structure->children('http://www.loc.gov/METS/')->mptr[0]->attributes('http://www.w3.org/1999/xlink')->href;
@@ -472,7 +544,7 @@
 			// Get page number of the first page related to this structure element.
 			$details['pagination'] = $this->physicalPagesInfo[$id]['label'];
 
-		// Is this the toplevel structure?
+		// Is this the toplevel structure element?
 		} elseif ($details['id'] == $this->_getToplevelId()) {
 
 			// Yes. Point to itself.
@@ -484,14 +556,14 @@
 		$this->logicalUnits[$details['id']] = $details;
 
 		// Walk the structure recursively? And are there any children of the current element?
-		if ($recursive && !empty($structure->children('http://www.loc.gov/METS/')->div)) {
+		if ($recursive && count($structure->children('http://www.loc.gov/METS/')->div)) {
 
 			$details['children'] = array ();
 
 			foreach ($structure->children('http://www.loc.gov/METS/')->div as $child) {
 
 				// Repeat for all children.
-				$details['children'][] = $this->getLogicalStructureInfo($child, $recursive);
+				$details['children'][] = $this->getLogicalStructureInfo($child, TRUE);
 
 			}
 
@@ -502,64 +574,6 @@
 	}
 
 	/**
-	 * This gets details about a logical structure element
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$id: The @ID attribute of the logical structure node
-	 * @param	boolean		$recursive: Whether to include the child elements
-	 *
-	 * @return	array		Array of the element's id, label, type and physical page indexes/mptr link
-	 */
-	public function getLogicalStructure($id = '', $recursive = FALSE) {
-
-		// Is the requested logical unit already loaded?
-		if (!$recursive && !empty($id) && !empty($this->logicalUnits[$id])) {
-
-			// Yes. Return it.
-			return $this->logicalUnits[$id];
-
-		} elseif (!empty($id)) {
-
-			// Get specified logical unit.
-			$div = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]');
-
-		} elseif ($recursive) {
-
-			// Get all logical units at top level.
-			$div = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div');
-
-		}
-
-		if (!empty($div)) {
-
-			// Load smLinks.
-			$this->_getSmLinks();
-
-			foreach ($div as $structure) {
-
-				// Get logical unit's details.
-				$this->tableOfContents[] = $this->getLogicalStructureInfo($structure, $recursive);
-
-			}
-
-		}
-
-		if (!empty($this->logicalUnits[$id])) {
-
-			return $this->logicalUnits[$id];
-
-		} else {
-
-//			trigger_error('There is no logical structure node with @ID '.$id, E_USER_WARNING);
-
-			return array ();
-
-		}
-
-	}
-
-	/**
 	 * This extracts all the metadata for a logical structure node
 	 *
 	 * @access	public
@@ -572,6 +586,9 @@
 	 */
 	public function getMetadata($id, $cPid = 0) {
 
+		// Save parameter for logging purposes.
+		$_cPid = $cPid;
+
 		// Make sure $cPid is a non-negative integer.
 		$cPid = max(intval($cPid), 0);
 
@@ -583,7 +600,11 @@
 
 		} elseif (!$cPid) {
 
-			trigger_error('Invalid PID ('.$cPid.') for metadata definitions', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->getMetadata('.$id.', '.$_cPid.')] Invalid PID "'.$cPid.'" for metadata definitions', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return array ();
 
@@ -597,7 +618,7 @@
 		}
 
 		// Initialize metadata array with empty values.
-		$_metadata = array (
+		$metadata = array (
 			'title' => array (),
 			'title_sorting' => array (),
 			'author' => array (),
@@ -619,17 +640,17 @@
 		// Get the logical structure node's DMDID.
 		if (!empty($this->logicalUnits[$id])) {
 
-			$_dmdId = $this->logicalUnits[$id]['dmdId'];
+			$dmdId = $this->logicalUnits[$id]['dmdId'];
 
 		} else {
 
-			$_dmdId = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@DMDID');
+			$dmdId = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@DMDID');
 
-			$_dmdId = (string) $_dmdId[0];
+			$dmdId = (string) $dmdId[0];
 
 		}
 
-		if (!empty($_dmdId)) {
+		if (!empty($dmdId)) {
 
 			// Load available metadata formats and dmdSecs.
 			$this->loadFormats();
@@ -637,30 +658,34 @@
 			$this->_getDmdSec();
 
 			// Is this metadata format supported?
-			if (!empty($this->formats[$this->dmdSec[$_dmdId]['type']]['class'])) {
-
-				$_class = $this->formats[$this->dmdSec[$_dmdId]['type']]['class'];
-
-			} elseif (!empty($this->formats['OTHER'][$this->dmdSec[$_dmdId]['type']]['class'])) {
-
-				$_class = $this->formats['OTHER'][$this->dmdSec[$_dmdId]['type']]['class'];
+			if (!empty($this->formats[$this->dmdSec[$dmdId]['type']]['class'])) {
+
+				$class = $this->formats[$this->dmdSec[$dmdId]['type']]['class'];
 
 			} else {
 
-				trigger_error('Unsupported metadata format or dmdSec with @ID '.$_dmdId.' not found', E_USER_WARNING);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_document->getMetadata('.$id.', '.$_cPid.')] Unsupported metadata format "'.$this->dmdSec[$dmdId]['type'].'" in dmdSec with @ID "'.$dmdId.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+				}
 
 				return array ();
 
 			}
 
 			// Get the metadata from class.
-			if (class_exists($_class) && ($obj = t3lib_div::makeInstance($_class)) instanceof tx_dlf_format) {
+			if (class_exists($class) && ($obj = t3lib_div::makeInstance($class)) instanceof tx_dlf_format) {
 
-				$obj->extractMetadata($this->dmdSec[$_dmdId]['xml'], $_metadata);
+				$obj->extractMetadata($this->dmdSec[$dmdId]['xml'], $metadata);
 
 			} else {
 
-				trigger_error('Invalid class/method '.$_class.'->extractMetadata()', E_USER_ERROR);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_document->getMetadata('.$id.', '.$_cPid.')] Invalid class/method "'.$class.'->extractMetadata()" for metadata format "'.$this->dmdSec[$dmdId]['type'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 				return array ();
 
@@ -669,84 +694,84 @@
 			// Get the structure's type.
 			if (!empty($this->logicalUnits[$id])) {
 
-				$_metadata['type'] = array ($this->logicalUnits[$id]['type']);
+				$metadata['type'] = array ($this->logicalUnits[$id]['type']);
 
 			} else {
 
-				$_struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE');
+				$struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE');
 
-				$_metadata['type'] = array ((string) $_struct[0]);
+				$metadata['type'] = array ((string) $struct[0]);
 
 			}
 
 			// Get the additional metadata from database.
-			$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 				'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.default_value AS default_value',
 				'tx_dlf_metadata,tx_dlf_formats',
-				'tx_dlf_metadata.pid='.$cPid.' AND ((tx_dlf_metadata.encoded=tx_dlf_formats.uid AND tx_dlf_formats.type='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->dmdSec[$_dmdId]['type'], 'tx_dlf_formats').') OR tx_dlf_metadata.encoded=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata', TRUE).tx_dlf_helper::whereClause('tx_dlf_formats'),
+				'tx_dlf_metadata.pid='.$cPid.' AND ((tx_dlf_metadata.encoded=tx_dlf_formats.uid AND tx_dlf_formats.type='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->dmdSec[$dmdId]['type'], 'tx_dlf_formats').') OR tx_dlf_metadata.encoded=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata', TRUE).tx_dlf_helper::whereClause('tx_dlf_formats'),
 				'',
 				'',
 				''
 			);
 
 			// We need a DOMDocument here, because SimpleXML doesn't support XPath functions properly.
-			$_domNode = dom_import_simplexml($this->dmdSec[$_dmdId]['xml']);
-
-			$_domXPath = new DOMXPath($_domNode->ownerDocument);
-
-			$this->registerNamespaces($_domXPath);
+			$domNode = dom_import_simplexml($this->dmdSec[$dmdId]['xml']);
+
+			$domXPath = new DOMXPath($domNode->ownerDocument);
+
+			$this->registerNamespaces($domXPath);
 
 			// OK, now make the XPath queries.
-			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 				// Set metadata field's value(s).
-				if ($resArray['xpath'] && ($_values = $_domXPath->evaluate($resArray['xpath'], $_domNode))) {
-
-					if ($_values instanceof DOMNodeList && $_values->length > 0) {
-
-						$_metadata[$resArray['index_name']] = array ();
-
-						foreach ($_values as $_value) {
-
-							$_metadata[$resArray['index_name']][] = trim((string) $_value->nodeValue);
+				if ($resArray['xpath'] && ($values = $domXPath->evaluate($resArray['xpath'], $domNode))) {
+
+					if ($values instanceof DOMNodeList && $values->length > 0) {
+
+						$metadata[$resArray['index_name']] = array ();
+
+						foreach ($values as $value) {
+
+							$metadata[$resArray['index_name']][] = trim((string) $value->nodeValue);
 
 						}
 
-					} elseif (!($_values instanceof DOMNodeList)) {
+					} elseif (!($values instanceof DOMNodeList)) {
 
-						$_metadata[$resArray['index_name']] = array (trim((string) $_values));
+						$metadata[$resArray['index_name']] = array (trim((string) $values));
 
 					}
 
 				}
 
 				// Set default value if applicable.
-				if (empty($_metadata[$resArray['index_name']][0]) && $resArray['default_value']) {
+				if (empty($metadata[$resArray['index_name']][0]) && $resArray['default_value']) {
 
-					$_metadata[$resArray['index_name']] = array ($resArray['default_value']);
+					$metadata[$resArray['index_name']] = array ($resArray['default_value']);
 
 				}
 
 				// Set sorting value if applicable.
-				if (!empty($_metadata[$resArray['index_name']]) && $resArray['is_sortable']) {
-
-					if ($resArray['xpath_sorting'] && ($_values = $_domXPath->evaluate($resArray['xpath_sorting'], $_domNode))) {
-
-						if ($_values instanceof DOMNodeList && $_values->length > 0) {
-
-							$_metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $_values->item(0)->nodeValue);
-
-						} elseif (!($_values instanceof DOMNodeList)) {
-
-							$_metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $_values);
+				if (!empty($metadata[$resArray['index_name']]) && $resArray['is_sortable']) {
+
+					if ($resArray['xpath_sorting'] && ($values = $domXPath->evaluate($resArray['xpath_sorting'], $domNode))) {
+
+						if ($values instanceof DOMNodeList && $values->length > 0) {
+
+							$metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $values->item(0)->nodeValue);
+
+						} elseif (!($values instanceof DOMNodeList)) {
+
+							$metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $values);
 
 						}
 
 					}
 
-					if (empty($_metadata[$resArray['index_name'].'_sorting'][0])) {
+					if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
 
-						$_metadata[$resArray['index_name'].'_sorting'][0] = $_metadata[$resArray['index_name']][0];
+						$metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
 
 					}
 
@@ -755,11 +780,11 @@
 			}
 
 			// Set title to empty string if not present.
-			if (empty($_metadata['title'][0])) {
-
-				$_metadata['title'][0] = '';
-
-				$_metadata['title_sorting'][0] = '';
+			if (empty($metadata['title'][0])) {
+
+				$metadata['title'][0] = '';
+
+				$metadata['title_sorting'][0] = '';
 
 			}
 
@@ -770,7 +795,7 @@
 
 		}
 
-		return $_metadata;
+		return $metadata;
 
 	}
 
@@ -786,6 +811,9 @@
 	 */
 	public static function getTitle($uid, $recursive = FALSE) {
 
+		// Save parameter for logging purposes.
+		$_uid = $uid;
+
 		$title = '';
 
 		// Sanitize input.
@@ -816,13 +844,21 @@
 
 			} else {
 
-				trigger_error('No document with UID '.$uid.' found', E_USER_WARNING);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_document->getTitle('.$_uid.', ['.($recursive ? 'TRUE' : 'FALSE').'])] No document with UID "'.$uid.'" found or document not accessible', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+				}
 
 			}
 
 		} else {
 
-			trigger_error('No UID given for document', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->getTitle('.$_uid.', ['.($recursive ? 'TRUE' : 'FALSE').'])] Invalid UID "'.$uid.'" for document', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 		}
 
@@ -865,11 +901,11 @@
 		// Get METS node from XML file.
 		$this->registerNamespaces($this->xml);
 
-		$_mets = $this->xml->xpath('//mets:mets');
-
-		if ($_mets) {
-
-			$this->mets = $_mets[0];
+		$mets = $this->xml->xpath('//mets:mets');
+
+		if ($mets) {
+
+			$this->mets = $mets[0];
 
 			// Register namespaces.
 			$this->registerNamespaces($this->mets);
@@ -879,7 +915,11 @@
 
 		} else {
 
-			trigger_error('No valid METS part found in document with UID '.$this->uid, E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->init()] No METS part found in document with UID "'.$this->uid.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 		}
 
@@ -904,39 +944,48 @@
 			|| version_compare(phpversion(), '5.3.3', '<')) {
 
 			// Load extension configuration
-			$_extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
+			$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
 
 			// Set user-agent to identify self when fetching XML data.
-			if (!empty($_extConf['useragent'])) {
+			if (!empty($extConf['useragent'])) {
 
-				@ini_set('user_agent', $_extConf['useragent']);
+				@ini_set('user_agent', $extConf['useragent']);
 
 			}
 
-			// Load XML from file...
-			$_libxmlErrors = libxml_use_internal_errors(TRUE);
-
-			$_xml = @simplexml_load_file($location);
-
-			libxml_use_internal_errors($_libxmlErrors);
-
-			// ...and set some basic properties.
-			if ($_xml !== FALSE) {
-
-				$this->xml = $_xml;
+			// Turn off libxml's error logging.
+			$libxmlErrors = libxml_use_internal_errors(TRUE);
+
+			// Load XML from file.
+			$xml = @simplexml_load_file($location);
+
+			// Reset libxml's error logging.
+			libxml_use_internal_errors($libxmlErrors);
+
+			// Set some basic properties.
+			if ($xml !== FALSE) {
+
+				$this->xml = $xml;
 
 				return TRUE;
 
 			} else {
 
-				trigger_error('Could not load XML file from '.$location, E_USER_ERROR);
-				// TODO: libxml_get_errors() || libxml_get_last_error() || libxml_clear_errors()
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_document->load('.$location.')] Could not load XML file from "'.$location.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 			}
 
 		} else {
 
-			trigger_error('File location "'.$location.'" is not a valid URL', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->load('.$location.')] Invalid file location "'.$location.'" for document loading', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 		}
 
@@ -956,8 +1005,8 @@
 		if (!$this->formatsLoaded) {
 
 			// Get available data formats from database.
-			$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'tx_dlf_formats.type AS type,tx_dlf_formats.other_type AS other_type,tx_dlf_formats.root AS root,tx_dlf_formats.namespace AS namespace,tx_dlf_formats.class AS class',
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_formats.type AS type,tx_dlf_formats.root AS root,tx_dlf_formats.namespace AS namespace,tx_dlf_formats.class AS class',
 				'tx_dlf_formats',
 				'tx_dlf_formats.pid=0'.tx_dlf_helper::whereClause('tx_dlf_formats'),
 				'',
@@ -965,27 +1014,14 @@
 				''
 			);
 
-			while ($_resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
-
-				if (!$_resArray['other_type']) {
-
-					// Update format registry.
-					$this->formats[$_resArray['type']] = array (
-						'rootElement' => $_resArray['root'],
-						'namespaceURI' => $_resArray['namespace'],
-						'class' => $_resArray['class']
-					);
-
-				} else {
-
-					// Update format registry.
-					$this->formats['OTHER'][$_resArray['type']] = array (
-						'rootElement' => $_resArray['root'],
-						'namespaceURI' => $_resArray['namespace'],
-						'class' => $_resArray['class']
-					);
-
-				}
+			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+
+					// Update format registry.
+					$this->formats[$resArray['type']] = array (
+						'rootElement' => $resArray['root'],
+						'namespaceURI' => $resArray['namespace'],
+						'class' => $resArray['class']
+					);
 
 			}
 
@@ -1011,43 +1047,28 @@
 		// Do we have a SimpleXMLElement or DOMXPath object?
 		if ($obj instanceof SimpleXMLElement) {
 
-			$_method = 'registerXPathNamespace';
+			$method = 'registerXPathNamespace';
 
 		} elseif ($obj instanceof DOMXPath) {
 
-			$_method = 'registerNamespace';
+			$method = 'registerNamespace';
 
 		} else {
 
-			trigger_error('No SimpleXMLElement or DOMXPath object given', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->registerNamespaces(['.get_class($obj).'])] Given object is neither a SimpleXMLElement nor a DOMXPath instance', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return;
 
 		}
 
-		// Register mandatory METS' and XLINK's namespaces.
-		$obj->$_method('mets', 'http://www.loc.gov/METS/');
-
-		// This one can become a problem, because MODS uses its own custom XLINK schema.
-		// @see http://comments.gmane.org/gmane.comp.text.mods/1126
-		$obj->$_method('xlink', 'http://www.w3.org/1999/xlink');
-
 		// Register metadata format's namespaces.
 		foreach ($this->formats as $enc => $conf) {
 
-			if ($enc != 'OTHER') {
-
-				$obj->$_method(strtolower($enc), $conf['namespaceURI']);
-
-			} else {
-
-				foreach ($conf as $otherEnc => $otherConf) {
-
-					$obj->$_method(strtolower($otherEnc), $otherConf['namespaceURI']);
-
-				}
-
-			}
+			$obj->$method(strtolower($enc), $conf['namespaceURI']);
 
 		}
 
@@ -1065,9 +1086,18 @@
 	 */
 	public function save($pid = 0, $core = 0) {
 
+		// Save parameters for logging purposes.
+		$_pid = $pid;
+
+		$_core = $core;
+
 		if (TYPO3_MODE !== 'BE') {
 
-			trigger_error('Saving documents is only allowed in the backend!', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Saving a document is only allowed in the backend', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return FALSE;
 
@@ -1087,7 +1117,11 @@
 
 		} elseif (!$pid) {
 
-			trigger_error('Invalid PID ('.$pid.') given to save document', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Invalid PID "'.$pid.'" for document saving', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return FALSE;
 
@@ -1118,7 +1152,11 @@
 		// Check for record identifier.
 		if (empty($metadata['record_id'][0])) {
 
-			trigger_error('No record identifier found to avoid duplication', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] No record identifier found to avoid duplication', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return FALSE;
 
@@ -1142,7 +1180,11 @@
 
 		} else {
 
-			trigger_error('Could not identify structure type', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return FALSE;
 
@@ -1166,23 +1208,23 @@
 
 			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-			$_collUid[$resArray['index_name']] = $resArray['uid'];
+			$collUid[$resArray['index_name']] = $resArray['uid'];
 
 		}
 
 		foreach ($metadata['collection'] as $collection) {
 
-			if (!empty($_collUid[$collection])) {
+			if (!empty($collUid[$collection])) {
 
 				// Add existing collection's UID.
-				$collections[] = $_collUid[$collection];
+				$collections[] = $collUid[$collection];
 
 			} else {
 
 				// Insert new collection.
-				$_collNewUid = uniqid('NEW');
+				$collNewUid = uniqid('NEW');
 
-				$_collData['tx_dlf_collections'][$_collNewUid] = array (
+				$collData['tx_dlf_collections'][$collNewUid] = array (
 					'pid' => $pid,
 					'label' => $collection,
 					'index_name' => $collection,
@@ -1193,23 +1235,23 @@
 					'status' => 0,
 				);
 
-				$_substUid = tx_dlf_helper::processDB($_collData);
+				$substUid = tx_dlf_helper::processDB($collData);
 
 				// Prevent double insertion.
-				unset ($_collData);
+				unset ($collData);
 
 				// Add new collection's UID.
-				$collections[] = $_substUid[$_collNewUid];
+				$collections[] = $substUid[$collNewUid];
 
-				$_message = t3lib_div::makeInstance(
+				$message = t3lib_div::makeInstance(
 					't3lib_FlashMessage',
-					htmlspecialchars(sprintf($GLOBALS['LANG']->getLL('flash.newCollection'), $collection, $_substUid[$_collNewUid])),
+					htmlspecialchars(sprintf($GLOBALS['LANG']->getLL('flash.newCollection'), $collection, $substUid[$collNewUid])),
 					$GLOBALS['LANG']->getLL('flash.attention', TRUE),
 					t3lib_FlashMessage::INFO,
 					TRUE
 				);
 
-				t3lib_FlashMessageQueue::addMessage($_message);
+				t3lib_FlashMessageQueue::addMessage($message);
 
 			}
 
@@ -1254,9 +1296,9 @@
 		} else {
 
 			// Insert new library.
-			$_libNewUid = uniqid('NEW');
+			$libNewUid = uniqid('NEW');
 
-			$_libData['tx_dlf_libraries'][$_libNewUid] = array (
+			$libData['tx_dlf_libraries'][$libNewUid] = array (
 				'pid' => $pid,
 				'label' => $metadata['owner'][0],
 				'index_name' => $metadata['owner'][0],
@@ -1271,20 +1313,20 @@
 				'union_base' => '',
 			);
 
-			$_substUid = tx_dlf_helper::processDB($_libData);
+			$substUid = tx_dlf_helper::processDB($libData);
 
 			// Add new library's UID.
-			$owner = $_substUid[$_libNewUid];
+			$owner = $substUid[$libNewUid];
 
-			$_message = t3lib_div::makeInstance(
+			$message = t3lib_div::makeInstance(
 				't3lib_FlashMessage',
-				htmlspecialchars(sprintf($GLOBALS['LANG']->getLL('flash.newLibrary'), $metadata['owner'][0], $_substUid[$_libNewUid])),
+				htmlspecialchars(sprintf($GLOBALS['LANG']->getLL('flash.newLibrary'), $metadata['owner'][0], $substUid[$libNewUid])),
 				$GLOBALS['LANG']->getLL('flash.attention', TRUE),
 				t3lib_FlashMessage::INFO,
 				TRUE
 			);
 
-			t3lib_FlashMessageQueue::addMessage($_message);
+			t3lib_FlashMessageQueue::addMessage($message);
 
 		}
 
@@ -1401,7 +1443,11 @@
 
 		} else {
 
-			trigger_error('Invalid UID for Solr core ('.$core.') given to index document', E_USER_NOTICE);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Invalid UID "'.$core.'" for Solr core', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+
+			}
 
 		}
 
@@ -1437,49 +1483,39 @@
 			$this->loadFormats();
 
 			// Get dmdSec nodes from METS.
-			$_dmdIds = $this->mets->xpath('./mets:dmdSec/@ID');
-
-			foreach ($_dmdIds as $_dmdId) {
-
-				$_type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $_dmdId.'"]/mets:mdWrap/@MDTYPE');
-
-				if ($_type && !empty($this->formats[(string) $_type[0]]) && $_type[0] != 'OTHER') {
-
-					$_type = (string) $_type[0];
-
-					$_xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $_dmdId.'"]/mets:mdWrap[@MDTYPE="'.$_type.'"]/mets:xmlData/'.strtolower($_type).':'.$this->formats[$_type]['rootElement']);
-
-					if ($_xml) {
-
-						$this->dmdSec[(string) $_dmdId]['type'] = $_type;
-
-						$this->dmdSec[(string) $_dmdId]['xml'] = $_xml[0];
-
-						$this->registerNamespaces($this->dmdSec[(string) $_dmdId]['xml']);
-
-					}
-
-				} elseif ($_type && $_type[0] == 'OTHER') {
-
-					$_otherType = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $_dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"]/@OTHERMDTYPE');
-
-					if ($_otherType && !empty($this->formats['OTHER'][(string) $_otherType[0]])) {
-
-						$_otherType = (string) $_otherType[0];
-
-						$_xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $_dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="'.$_otherType.'"]/mets:xmlData/'.strtolower($_otherType).':'.$this->formats['OTHER'][$_otherType]['rootElement']);
-
-						if ($_xml) {
-
-							$this->dmdSec[(string) $_dmdId]['type'] = $_otherType;
-
-							$this->dmdSec[(string) $_dmdId]['xml'] = $_xml[0];
-
-							$this->registerNamespaces($this->dmdSec[(string) $_dmdId]['xml']);
-
-						}
-
-					}
+			$dmdIds = $this->mets->xpath('./mets:dmdSec/@ID');
+
+			foreach ($dmdIds as $dmdId) {
+
+				if ($type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[not(@MDTYPE="OTHER")]/@MDTYPE')) {
+
+					if (!empty($this->formats[(string) $type[0]])) {
+
+						$type = (string) $type[0];
+
+						$xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
+
+					}
+
+				} elseif ($type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"]/@OTHERMDTYPE')) {
+
+					if (!empty($this->formats[(string) $type[0]])) {
+
+						$type = (string) $type[0];
+
+						$xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
+
+					}
+
+				}
+
+				if ($xml) {
+
+					$this->dmdSec[(string) $dmdId]['type'] = $type;
+
+					$this->dmdSec[(string) $dmdId]['xml'] = $xml[0];
+
+					$this->registerNamespaces($this->dmdSec[(string) $dmdId]['xml']);
 
 				}
 
@@ -1507,7 +1543,11 @@
 
 		if (!$cPid) {
 
-			trigger_error('No PID for metadata definitions found', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->getMetadataArray()] Invalid PID "'.$cPid.'" for metadata definitions', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return array ();
 
@@ -1516,11 +1556,11 @@
 		if (!$this->metadataArrayLoaded || $this->metadataArray[0] != $cPid) {
 
 			// Get all logical structure nodes with metadata
-			if (($_ids = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID]/@ID'))) {
-
-				foreach ($_ids as $_id) {
-
-					$this->metadataArray[(string) $_id] = $this->getMetadata((string) $_id, $cPid);
+			if (($ids = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID]/@ID'))) {
+
+				foreach ($ids as $id) {
+
+					$this->metadataArray[(string) $id] = $this->getMetadata((string) $id, $cPid);
 
 				}
 
@@ -1591,26 +1631,26 @@
 		if (!$this->physicalPagesLoaded) {
 
 			// Does the document have a structMap node of type "PHYSICAL"?
-			$_pageNodes = $this->mets->xpath('./mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]/mets:div[@TYPE="page"]');
+			$pageNodes = $this->mets->xpath('./mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]/mets:div[@TYPE="page"]');
 
-			if ($_pageNodes) {
+			if ($pageNodes) {
 
 				$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]);
 
-				$_useGrps = t3lib_div::trimExplode(',', $extConf['fileGrps']);
+				$useGrps = t3lib_div::trimExplode(',', $extConf['fileGrps']);
 
 				// Yes. Get concordance of @FILEID and @USE attributes.
-				$_fileUse = array ();
-
-				$_fileGrps = $this->mets->xpath('./mets:fileSec/mets:fileGrp');
-
-				foreach ($_fileGrps as $_fileGrp) {
-
-					if (in_array((string) $_fileGrp['USE'], $_useGrps)) {
-
-						foreach ($_fileGrp->children('http://www.loc.gov/METS/')->file as $_file) {
-
-							$_fileUse[(string) $_file->attributes()->ID] = (string) $_fileGrp['USE'];
+				$fileUse = array ();
+
+				$fileGrps = $this->mets->xpath('./mets:fileSec/mets:fileGrp');
+
+				foreach ($fileGrps as $fileGrp) {
+
+					if (in_array((string) $fileGrp['USE'], $useGrps)) {
+
+						foreach ($fileGrp->children('http://www.loc.gov/METS/')->file as $file) {
+
+							$fileUse[(string) $file->attributes()->ID] = (string) $fileGrp['USE'];
 
 						}
 
@@ -1619,46 +1659,46 @@
 				}
 
 				// Get the physical sequence's metadata.
-				$_physNode = $this->mets->xpath('./mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]');
-
-				$_physSeq[0] = (string) $_physNode[0]['ID'];
-
-				$this->physicalPagesInfo[$_physSeq[0]]['dmdId'] = (isset($_physNode[0]['DMDID']) ? (string) $_physNode[0]['DMDID'] : '');
-
-				$this->physicalPagesInfo[$_physSeq[0]]['label'] = (isset($_physNode[0]['ORDERLABEL']) ? (string) $_physNode[0]['ORDERLABEL'] : '');
-
-				$this->physicalPagesInfo[$_physSeq[0]]['type'] = (string) $_physNode[0]['TYPE'];
+				$physNode = $this->mets->xpath('./mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]');
+
+				$physSeq[0] = (string) $physNode[0]['ID'];
+
+				$this->physicalPagesInfo[$physSeq[0]]['dmdId'] = (isset($physNode[0]['DMDID']) ? (string) $physNode[0]['DMDID'] : '');
+
+				$this->physicalPagesInfo[$physSeq[0]]['label'] = (isset($physNode[0]['ORDERLABEL']) ? (string) $physNode[0]['ORDERLABEL'] : '');
+
+				$this->physicalPagesInfo[$physSeq[0]]['type'] = (string) $physNode[0]['TYPE'];
 
 				// Get the file representations from fileSec node.
-				foreach ($_physNode[0]->children('http://www.loc.gov/METS/')->fptr as $_fptr) {
+				foreach ($physNode[0]->children('http://www.loc.gov/METS/')->fptr as $fptr) {
 
 					// Check if file has valid @USE attribute.
-					if (!empty($_fileUse[(string) $_fptr->attributes()->FILEID])) {
+					if (!empty($fileUse[(string) $fptr->attributes()->FILEID])) {
 
-						$this->physicalPagesInfo[$_physSeq[0]]['files'][strtolower($_fileUse[(string) $_fptr->attributes()->FILEID])] = (string) $_fptr->attributes()->FILEID;
+						$this->physicalPagesInfo[$physSeq[0]]['files'][strtolower($fileUse[(string) $fptr->attributes()->FILEID])] = (string) $fptr->attributes()->FILEID;
 
 					}
 
 				}
 
 				// Build the physical pages' array from the physical structMap node.
-				foreach ($_pageNodes as $_pageNode) {
-
-					$_pages[(int) $_pageNode['ORDER']] = (string) $_pageNode['ID'];
-
-					$this->physicalPagesInfo[$_pages[(int) $_pageNode['ORDER']]]['dmdId'] = (isset($_pageNode['DMDID']) ? (string) $_pageNode['DMDID'] : '');
-
-					$this->physicalPagesInfo[$_pages[(int) $_pageNode['ORDER']]]['label'] = (isset($_pageNode['ORDERLABEL']) ? (string) $_pageNode['ORDERLABEL'] : '');
-
-					$this->physicalPagesInfo[$_pages[(int) $_pageNode['ORDER']]]['type'] = (string) $_pageNode['TYPE'];
+				foreach ($pageNodes as $pageNode) {
+
+					$pages[(int) $pageNode['ORDER']] = (string) $pageNode['ID'];
+
+					$this->physicalPagesInfo[$pages[(int) $pageNode['ORDER']]]['dmdId'] = (isset($pageNode['DMDID']) ? (string) $pageNode['DMDID'] : '');
+
+					$this->physicalPagesInfo[$pages[(int) $pageNode['ORDER']]]['label'] = (isset($pageNode['ORDERLABEL']) ? (string) $pageNode['ORDERLABEL'] : '');
+
+					$this->physicalPagesInfo[$pages[(int) $pageNode['ORDER']]]['type'] = (string) $pageNode['TYPE'];
 
 					// Get the file representations from fileSec node.
-					foreach ($_pageNode->children('http://www.loc.gov/METS/')->fptr as $_fptr) {
+					foreach ($pageNode->children('http://www.loc.gov/METS/')->fptr as $fptr) {
 
 						// Check if file has valid @USE attribute.
-						if (!empty($_fileUse[(string) $_fptr->attributes()->FILEID])) {
+						if (!empty($fileUse[(string) $fptr->attributes()->FILEID])) {
 
-							$this->physicalPagesInfo[$_pages[(int) $_pageNode['ORDER']]]['files'][strtolower($_fileUse[(string) $_fptr->attributes()->FILEID])] = (string) $_fptr->attributes()->FILEID;
+							$this->physicalPagesInfo[$pages[(int) $pageNode['ORDER']]]['files'][strtolower($fileUse[(string) $fptr->attributes()->FILEID])] = (string) $fptr->attributes()->FILEID;
 
 						}
 
@@ -1667,13 +1707,13 @@
 				}
 
 				// Sort array by keys (= @ORDER).
-				if (ksort($_pages)) {
+				if (ksort($pages)) {
 
 					// Set total number of pages.
-					$this->numPages = count($_pages);
+					$this->numPages = count($pages);
 
 					// Merge and re-index the array to get nice numeric indexes.
-					$this->physicalPages = array_merge($_physSeq, $_pages);
+					$this->physicalPages = array_merge($physSeq, $pages);
 
 				}
 
@@ -1905,22 +1945,25 @@
 			// Cast to string for safety reasons.
 			$location = (string) $uid;
 
-			// Get record identifier to check with database.
-			$_libxmlErrors = libxml_use_internal_errors(TRUE);
+			// Turn off libxml's error logging.
+			$libxmlErrors = libxml_use_internal_errors(TRUE);
 
+			// Load XML file.
 			$xml = @simplexml_load_file($location);
 
-			libxml_use_internal_errors($_libxmlErrors);
+			// Reset libxml's error logging.
+			libxml_use_internal_errors($libxmlErrors);
 
 			if ($xml !== FALSE) {
 
 				$xml->registerXPathNamespace('mets', 'http://www.loc.gov/METS/');
 
-				$_objId = $xml->xpath('//mets:mets');
-
-				if (!empty($_objId[0]['OBJID'])) {
-
-					$this->recordid = (string) $_objId[0]['OBJID'];
+				// Check for @OBJID in order to use it as record identifier.
+				$objId = $xml->xpath('//mets:mets');
+
+				if (!empty($objId[0]['OBJID'])) {
+
+					$this->recordid = (string) $objId[0]['OBJID'];
 
 				}
 
@@ -1955,12 +1998,12 @@
 		// Check for PID if needed.
 		if ($pid) {
 
-			$whereClause .= ' AND tx_dlf_documents.pid='.$pid;
+			$whereClause .= ' AND tx_dlf_documents.pid='.intval($pid);
 
 		}
 
 		// Get document PID and location from database.
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_documents.uid AS uid,tx_dlf_documents.pid AS pid,tx_dlf_documents.record_id AS record_id,tx_dlf_documents.partof AS partof,tx_dlf_documents.location AS location',
 			'tx_dlf_documents',
 			$whereClause,
@@ -1969,9 +2012,9 @@
 			'1'
 		);
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($_result) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-			list ($this->uid, $this->pid, $this->recordid, $this->parentid, $location) = $GLOBALS['TYPO3_DB']->sql_fetch_row($_result);
+			list ($this->uid, $this->pid, $this->recordid, $this->parentid, $location) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
 			// Load XML file...
 			if ($this->load($location)) {
@@ -1995,7 +2038,11 @@
 
 		} else {
 
-			trigger_error('There is no record with UID '.$uid.' or you are not allowed to access it', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->__construct('.$uid.', '.$pid.')] No document with UID "'.$uid.'" found or document not accessible', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 		}
 
@@ -2012,17 +2059,21 @@
 	 */
 	public function __get($var) {
 
-		$_method = '_get'.ucfirst($var);
-
-		if (!property_exists($this, $var) || !method_exists($this, $_method)) {
-
-			trigger_error('There is no get function for property '.$var, E_USER_ERROR);
+		$method = '_get'.ucfirst($var);
+
+		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->__get('.$var.')] There is no getter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return;
 
 		} else {
 
-			return $this->$_method();
+			return $this->$method();
 
 		}
 
@@ -2040,15 +2091,19 @@
 	 */
 	public function __set($var, $value) {
 
-		$_method = '_set'.ucfirst($var);
-
-		if (!property_exists($this, $var) || !method_exists($this, $_method)) {
-
-			trigger_error('There is no set function for property '.$var, E_USER_ERROR);
+		$method = '_set'.ucfirst($var);
+
+		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->__set('.$var.', '.$value.')] There is no setter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 		} else {
 
-			$this->$_method($value);
+			$this->$method($value);
 
 		}
 
@@ -2080,13 +2135,13 @@
 	 */
 	public function __toString() {
 
-		$_xml = new DOMDocument('1.0', 'utf-8');
-
-		$_xml->appendChild($_xml->importNode(dom_import_simplexml($this->mets), TRUE));
-
-		$_xml->formatOutput = TRUE;
-
-		return $_xml->saveXML();
+		$xml = new DOMDocument('1.0', 'utf-8');
+
+		$xml->appendChild($xml->importNode(dom_import_simplexml($this->mets), TRUE));
+
+		$xml->formatOutput = TRUE;
+
+		return $xml->saveXML();
 
 	}
 
@@ -2100,26 +2155,31 @@
 	 */
 	public function __wakeup() {
 
-		$_libxmlErrors = libxml_use_internal_errors(TRUE);
-
-		// Reload XML from string...
-		$_xml = @simplexml_load_string($this->asXML);
-
-		libxml_use_internal_errors($_libxmlErrors);
-
-		if ($_xml !== FALSE) {
+		// Turn off libxml's error logging.
+		$libxmlErrors = libxml_use_internal_errors(TRUE);
+
+		// Reload XML from string.
+		$xml = @simplexml_load_string($this->asXML);
+
+		// Reset libxml's error logging.
+		libxml_use_internal_errors($libxmlErrors);
+
+		if ($xml !== FALSE) {
 
 			$this->asXML = '';
 
-			$this->xml = $_xml;
+			$this->xml = $xml;
 
-			// ...and rebuild the unserializable properties.
+			// Rebuild the unserializable properties.
 			$this->init();
 
 		} else {
 
-			trigger_error('Could not reload XML from session', E_USER_ERROR);
-			// TODO: libxml_get_errors() || libxml_get_last_error() || libxml_clear_errors()
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_document->__wakeup()] Could not load XML after deserialization', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 		}
 
 
=== modified file 'dlf/common/class.tx_dlf_helper.php'
--- dlf/common/class.tx_dlf_helper.php	2012-08-06 15:18:18 +0000
+++ dlf/common/class.tx_dlf_helper.php	2012-08-17 07:00:27 +0000
@@ -231,15 +231,25 @@
 		// Check for PHP extension "mcrypt".
 		if (!extension_loaded('mcrypt')) {
 
-			trigger_error('PHP extension "mcrypt" not available', E_USER_WARNING);
-
-			return NULL;
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] PHP extension "mcrypt" not available', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
+
+			return;
 
 		}
 
 		if (empty($encrypted) || empty($hash)) {
 
-			return NULL;
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] Invalid parameters given for decryption', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
+
+			return;
 
 		}
 
@@ -253,7 +263,13 @@
 
 		if ($hashed !== $hash) {
 
-			return NULL;
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] Invalid hash "'.$hash.'" given for decryption', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
+
+			return;
 
 		}
 
@@ -276,9 +292,13 @@
 		// Check for PHP extension "mcrypt".
 		if (!extension_loaded('mcrypt')) {
 
-			trigger_error('PHP extension "mcrypt" not available', E_USER_WARNING);
-
-			return NULL;
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->encrypt('.$string.')] PHP extension "mcrypt" not available', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
+
+			return;
 
 		}
 
@@ -305,22 +325,50 @@
 
 		if (TYPO3_MODE === 'FE') {
 
-			// TODO: Anpassen! (aus typo3/init.php übernommen)
-			$userObj = t3lib_div::makeInstance('t3lib_beUserAuth');
-
-			$userObj->start();
-
-			$userObj->backendCheckLogin();
-
-			return $userObj;
+			// Check for existing backend login.
+			if ($GLOBALS['TSFE']->beUserLogin > 0 && isset($GLOBALS['BE_USER'])) {
+
+				return $GLOBALS['BE_USER'];
+
+			} elseif (!isset($_COOKIE['be_typo_user'])) {
+
+				// Initialize backend session with CLI user's rights.
+				$userObj = t3lib_div::makeInstance('t3lib_beUserAuth');
+
+				$userObj->dontSetCookie = TRUE;
+
+				$userObj->start();
+
+				$userObj->setBeUserByName('_cli_dlf');
+
+				$userObj->backendCheckLogin();
+
+				return $userObj;
+
+			} else {
+
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_helper->getBeUser()] Could not determine current user\'s login status', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
+
+				return;
+
+			}
 
 		} elseif (TYPO3_MODE === 'BE') {
 
+			// Return current backend user.
 			return $GLOBALS['BE_USER'];
 
 		} else {
 
-			trigger_error('Unexpected TYPO3_MODE', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->getBeUser()] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return;
 
@@ -341,11 +389,21 @@
 	 */
 	public static function getIndexName($uid, $table, $pid = -1) {
 
+		// Save parameters for logging purposes.
+		$_uid = $uid;
+
+		$_pid = $pid;
+
+		// Sanitize input.
 		$uid = max(intval($uid), 0);
 
 		if (!$uid || !in_array($table, array ('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'))) {
 
-			trigger_error('At least one argument is not valid: UID='.$uid.' or TABLE='.$table, E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->getIndexName('.$_uid.', '.$table.', '.$_pid.')] Invalid UID "'.$uid.'" or table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return '';
 
@@ -353,6 +411,7 @@
 
 		$where = '';
 
+		// Should we check for a specific PID, too?
 		if ($pid !== -1) {
 
 			$pid = max(intval($pid), 0);
@@ -361,7 +420,8 @@
 
 		}
 
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		// Get index_name from database.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			$table.'.index_name AS index_name',
 			$table,
 			$table.'.uid='.$uid.$where.self::whereClause($table),
@@ -370,18 +430,24 @@
 			'1'
 		);
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($_result) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result);
+			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
 			return $resArray['index_name'];
 
+		} else {
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->getIndexName('.$_uid.', '.$table.', '.$_pid.')] No "index_name" with UID "'.$uid.'" and PID "'.$pid.'" found in table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
+
+			return '';
+
 		}
 
-		trigger_error('No "index_name" with UID '.$uid.' found for PID '.$pid.' in TABLE '.$table, E_USER_WARNING);
-
-		return '';
-
 	}
 
 	/**
@@ -395,45 +461,52 @@
 	 */
 	public static function getLanguageName($code) {
 
-		$_code = strtolower(trim($code));
-
-		if (preg_match('/^[a-z]{3}$/', $_code)) {
-
-			$_file = t3lib_extMgm::extPath(self::$extKey).'lib/ISO-639/iso-639-2b.xml';
-
-		} elseif (preg_match('/^[a-z]{2}$/', $_code)) {
-
-			$_file = t3lib_extMgm::extPath(self::$extKey).'lib/ISO-639/iso-639-1.xml';
+		// Analyze code and set appropriate ISO table.
+		$isoCode = strtolower(trim($code));
+
+		if (preg_match('/^[a-z]{3}$/', $isoCode)) {
+
+			$file = t3lib_extMgm::extPath(self::$extKey).'lib/ISO-639/iso-639-2b.xml';
+
+		} elseif (preg_match('/^[a-z]{2}$/', $isoCode)) {
+
+			$file = t3lib_extMgm::extPath(self::$extKey).'lib/ISO-639/iso-639-1.xml';
 
 		} else {
 
+			// No ISO code, return unchanged.
 			return $code;
 
 		}
 
+		// Load ISO table and get localized full name of language.
 		if (TYPO3_MODE === 'FE') {
 
-			$iso639 = $GLOBALS['TSFE']->readLLfile($_file);
-
-			if (!empty($iso639['default'][$_code])) {
-
-				$lang = $GLOBALS['TSFE']->getLLL($_code, $iso639);
+			$iso639 = $GLOBALS['TSFE']->readLLfile($file);
+
+			if (!empty($iso639['default'][$isoCode])) {
+
+				$lang = $GLOBALS['TSFE']->getLLL($isoCode, $iso639);
 
 			}
 
 		} elseif (TYPO3_MODE === 'BE') {
 
-			$iso639 = $GLOBALS['LANG']->includeLLFile($_file, FALSE, TRUE);
-
-			if (!empty($iso639['default'][$_code])) {
-
-				$lang = $GLOBALS['LANG']->getLLL($_code, $iso639, FALSE);
+			$iso639 = $GLOBALS['LANG']->includeLLFile($file, FALSE, TRUE);
+
+			if (!empty($iso639['default'][$isoCode])) {
+
+				$lang = $GLOBALS['LANG']->getLLL($isoCode, $iso639, FALSE);
 
 			}
 
 		} else {
 
-			trigger_error('Unexpected TYPO3_MODE', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->getLanguageName('.$code.')] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return $code;
 
@@ -445,7 +518,11 @@
 
 		} else {
 
-			trigger_error('Language code "'.$code.'" not found', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->getLanguageName('.$code.')] Language code "'.$code.'" not found in ISO-639 table', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+
+			}
 
 			return $code;
 
@@ -466,7 +543,7 @@
 	 */
 	public static function getURN($base, $id) {
 
-		$concordance = array(
+		$concordance = array (
 			'0' => 1,
 			'1' => 2,
 			'2' => 3,
@@ -511,7 +588,11 @@
 
 		if (preg_match('/[^a-z0-9:-]/', $urn)) {
 
-			trigger_error('Invalid chars in URN', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->getURN('.$base.', '.$id.')] Invalid chars in given parameters', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return '';
 
@@ -559,23 +640,31 @@
 	 *
 	 * @access	public
 	 *
-	 * @param	string		$key: Session key for retrieval
+	 * @param	string		$key: Session data key for retrieval
 	 *
 	 * @return	mixed		Session value for given key or NULL on failure
 	 */
 	public static function loadFromSession($key) {
 
+		// Save parameter for logging purposes.
+		$_key = $key;
+
 		// Cast to string for security reasons.
 		$key = (string) $key;
 
 		if (!$key) {
 
-			trigger_error('No session key given', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->loadFromSession('.$_key.')] Invalid key "'.$key.'" for session data retrieval', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return;
 
 		}
 
+		// Get the session data.
 		if (TYPO3_MODE === 'FE') {
 
 			return $GLOBALS['TSFE']->fe_user->getKey('ses', $key);
@@ -586,7 +675,11 @@
 
 		} else {
 
-			trigger_error('Unexpected TYPO3_MODE', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->loadFromSession('.$_key.')] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return;
 
@@ -647,23 +740,31 @@
 	 * @access	public
 	 *
 	 * @param	string		$value: Value to save
-	 * @param	string		$key: Session key for retrieval
+	 * @param	string		$key: Session data key for saving
 	 *
 	 * @return	boolean		TRUE on success, FALSE on failure
 	 */
 	public static function saveToSession($value, $key) {
 
+		// Save parameter for logging purposes.
+		$_key = $key;
+
 		// Cast to string for security reasons.
 		$key = (string) $key;
 
 		if (!$key) {
 
-			trigger_error('No session key given', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->saveToSession('.$value.', '.$_key.')] Invalid key "'.$key.'" for session data saving', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return FALSE;
 
 		}
 
+		// Save value in session data.
 		if (TYPO3_MODE === 'FE') {
 
 			$GLOBALS['TSFE']->fe_user->setKey('ses', $key, $value);
@@ -680,7 +781,11 @@
 
 		} else {
 
-			trigger_error('Unexpected TYPO3_MODE', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->saveToSession('.$value.', '.$_key.')] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return FALSE;
 
@@ -689,82 +794,6 @@
 	}
 
 	/**
-	 * This validates a METS file against its schemas
-	 * TODO: nicht funktionstüchtig!
-	 *
-	 * @access	public
-	 *
-	 * @param	SimpleXMLElement		$xml:
-	 *
-	 * @return	void
-	 */
-	public static function schemaValidate(SimpleXMLElement $xml) {
-
-		$_libxmlErrors = libxml_use_internal_errors(TRUE);
-
-		// Get schema locations.
-		$xml->registerXPathNamespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-
-		$_schemaLocations = $xml->xpath('//*[@xsi:schemaLocation]');
-
-		foreach ($_schemaLocations as $_schemaLocation) {
-
-			$_schemas = explode(' ', (string) $_schemaLocation->attributes('http://www.w3.org/2001/XMLSchema-instance')->schemaLocation);
-
-			for ($i = 1, $j = count($_schemas); $i <= $j; $i++) {
-
-				if ($_schemas[$i] == 'http://www.loc.gov/METS/') {
-
-					$schema['mets'] = $_schemas[$i + 1];
-
-				} elseif ($_schemas[$i] == 'http://www.loc.gov/mods/v3') {
-
-					$schema['mods'] = $_schemas[$i + 1];
-
-				}
-
-			}
-
-		}
-		// TODO: Error-Handling (keine Schemas gefunden)
-
-		// Validate METS part against schema.
-		$dom = new DOMDocument('1.0', 'UTF-8');
-
-		$dom->appendChild($dom->importNode(dom_import_simplexml($this->mets), TRUE));
-
-		$dom->schemaValidate($schema['mets']);
-
-		// TODO: Error-Handling (invalider METS-Part)
-		// libxml_get_last_error() || libxml_get_errors() || libxml_clear_errors()
-
-		// Validate dmdSec parts against schema.
-		foreach ($this->dmdSec as $dmdSec) {
-
-			switch ($dmdSec['type']) {
-
-				case 'MODS':
-
-					$dom = new DOMDocument('1.0', 'UTF-8');
-
-					$dom->appendChild($dom->importNode(dom_import_simplexml($dmdSec['xml']), TRUE));
-
-					$dom->schemaValidate($schema['mods']);
-
-					// TODO: Error-Handling (invalider MODS-Part)
-					// libxml_get_last_error() || libxml_get_errors() || libxml_clear_errors()
-
-					break;
-
-			}
-
-		}
-
-		libxml_use_internal_errors($_libxmlErrors);
-
-	}
-
-	/**
 	 * This translates an internal "index_name"
 	 *
 	 * @access	public
@@ -777,13 +806,24 @@
 	 */
 	public static function translate($index_name, $table, $pid) {
 
+		// Save parameters for logging purposes.
+		$_index_name = $index_name;
+
+		$_pid = $pid;
+
+		// Load labels into static variable for future use.
 		static $labels = array ();
 
+		// Sanitize input.
 		$pid = max(intval($pid), 0);
 
 		if (!$pid) {
 
-			trigger_error('No PID given for translations', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->translate('.$_index_name.', '.$table.', '.$_pid.')] Invalid PID "'.$pid.'" for translation', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return $index_name;
 
@@ -811,7 +851,7 @@
 				}
 
 				// Get labels from database.
-				$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 					'*',
 					$table,
 					'pid='.$pid.$additionalWhere.self::whereClause($table),
@@ -820,9 +860,9 @@
 					''
 				);
 
-				if ($GLOBALS['TYPO3_DB']->sql_num_rows($_result) > 0) {
+				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 						// Overlay localized labels if available.
 						if ($GLOBALS['TSFE']->sys_language_content > 0) {
@@ -841,13 +881,21 @@
 
 				} else {
 
-					trigger_error('There are no entries with PID '.$pid.' in table '.$table.' or you are not allowed to access them', E_USER_ERROR);
+					if (TYPO3_DLOG) {
+
+						t3lib_div::devLog('[tx_dlf_helper->translate('.$_index_name.', '.$table.', '.$_pid.')] No translation with PID "'.$pid.'" available in table "'.$table.'" or translation not accessible', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+
+					}
 
 				}
 
 			} else {
 
-				trigger_error('The table '.$table.' is not allowed for translation', E_USER_ERROR);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_helper->translate('.$_index_name.', '.$table.', '.$_pid.')] No translations available for table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+				}
 
 			}
 
@@ -916,7 +964,11 @@
 
 		} else {
 
-			trigger_error('Unexpected TYPO3_MODE', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_helper->whereClause('.$table.', ['.($showHidden ? 'TRUE' : 'FALSE').'])] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return ' AND 1=-1';
 
 
=== modified file 'dlf/common/class.tx_dlf_indexing.php'
--- dlf/common/class.tx_dlf_indexing.php	2012-08-09 10:31:57 +0000
+++ dlf/common/class.tx_dlf_indexing.php	2012-08-17 07:00:27 +0000
@@ -38,15 +38,6 @@
 class tx_dlf_indexing {
 
 	/**
-	 * Array of autocompletable metadata
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $autocompleted = array ();
-
-	/**
 	 * The extension key
 	 *
 	 * @var string
@@ -55,31 +46,21 @@
 	public static $extKey = 'dlf';
 
 	/**
-	 * Array of facets
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $facets = array ();
-
-	/**
-	 * Array of fields' boost values
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $fieldboost = array ();
-
-	/**
-	 * Array of indexed metadata
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $indexed = array ();
+	 * Array of metadata fields' configuration
+	 * @see loadIndexConf()
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected static $fields = array (
+		'autocompleted' => array (),
+		'facets' => array (),
+		'sortables' => array (),
+		'indexed' => array (),
+		'stored' => array (),
+		'tokenized' => array (),
+		'fieldboost' => array ()
+	);
 
 	/**
 	 * List of already processed documents
@@ -98,33 +79,6 @@
 	protected static $solr;
 
 	/**
-	 * Array of sortable metadata
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $sortables = array ();
-
-	/**
-	 * Array of stored metadata
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $stored = array ();
-
-	/**
-	 * Array of tokenized metadata
-	 * @see loadIndexConf()
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $tokenized = array ();
-
-	/**
 	 * Array of toplevel structure elements
 	 * @see loadIndexConf()
 	 *
@@ -164,7 +118,11 @@
 
 				} else {
 
-					trigger_error('Could not load multi-volume work with UID '.$doc->parentid, E_USER_ERROR);
+					if (TYPO3_DLOG) {
+
+						t3lib_div::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentid.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+					}
 
 					return 1;
 
@@ -195,7 +153,7 @@
 				self::$solr->commit();
 
 				// Get document title from database.
-				$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 					'tx_dlf_documents.title AS title',
 					'tx_dlf_documents',
 					'tx_dlf_documents.uid='.intval($doc->uid).tx_dlf_helper::whereClause('tx_dlf_documents'),
@@ -204,11 +162,11 @@
 					'1'
 				);
 
-				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result);
+				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
 				if (!defined('TYPO3_cliMode')) {
 
-					$_message = t3lib_div::makeInstance(
+					$message = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						htmlspecialchars(sprintf($GLOBALS['LANG']->getLL('flash.documentIndexed'), $resArray['title'], $doc->uid)),
 						$GLOBALS['LANG']->getLL('flash.done', TRUE),
@@ -216,7 +174,7 @@
 						TRUE
 					);
 
-					t3lib_FlashMessageQueue::addMessage($_message);
+					t3lib_FlashMessageQueue::addMessage($message);
 
 				}
 
@@ -226,7 +184,7 @@
 
 				if (!defined('TYPO3_cliMode')) {
 
-					$_message = t3lib_div::makeInstance(
+					$message = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						$GLOBALS['LANG']->getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
 						$GLOBALS['LANG']->getLL('flash.error', TRUE),
@@ -234,11 +192,15 @@
 						TRUE
 					);
 
-					t3lib_FlashMessageQueue::addMessage($_message);
-
-				}
-
-				trigger_error('Apache Solr exception thrown: '.$e->getMessage(), E_USER_ERROR);
+					t3lib_FlashMessageQueue::addMessage($message);
+
+				}
+
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 				return 1;
 
@@ -248,7 +210,7 @@
 
 			if (!defined('TYPO3_cliMode')) {
 
-				$_message = t3lib_div::makeInstance(
+				$message = t3lib_div::makeInstance(
 					't3lib_FlashMessage',
 					$GLOBALS['LANG']->getLL('flash.solrNoConnection', TRUE),
 					$GLOBALS['LANG']->getLL('flash.warning', TRUE),
@@ -256,11 +218,15 @@
 					TRUE
 				);
 
-				t3lib_FlashMessageQueue::addMessage($_message);
-
-			}
-
-			trigger_error('Could not connect to Apache Solr server', E_USER_WARNING);
+				t3lib_FlashMessageQueue::addMessage($message);
+
+			}
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return 1;
 
@@ -279,6 +245,9 @@
 	 */
 	public static function delete($uid) {
 
+		// Save parameter for logging purposes.
+		$_uid = $uid;
+
 		// Sanitize input.
 		$uid = max(intval($uid), 0);
 
@@ -310,7 +279,7 @@
 
 					if (!defined('TYPO3_cliMode')) {
 
-						$_message = t3lib_div::makeInstance(
+						$message = t3lib_div::makeInstance(
 							't3lib_FlashMessage',
 							$GLOBALS['LANG']->getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
 							$GLOBALS['LANG']->getLL('flash.error', TRUE),
@@ -318,11 +287,15 @@
 							TRUE
 						);
 
-						t3lib_FlashMessageQueue::addMessage($_message);
-
-					}
-
-					trigger_error('Apache Solr exception thrown: '.$e->getMessage(), E_USER_ERROR);
+						t3lib_FlashMessageQueue::addMessage($message);
+
+					}
+
+					if (TYPO3_DLOG) {
+
+						t3lib_div::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+					}
 
 					return 1;
 
@@ -332,7 +305,7 @@
 
 				if (!defined('TYPO3_cliMode')) {
 
-					$_message = t3lib_div::makeInstance(
+					$message = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						$GLOBALS['LANG']->getLL('flash.solrNoConnection', TRUE),
 						$GLOBALS['LANG']->getLL('flash.error', TRUE),
@@ -340,11 +313,15 @@
 						TRUE
 					);
 
-					t3lib_FlashMessageQueue::addMessage($_message);
-
-				}
-
-				trigger_error('Could not connect to Apache Solr server', E_USER_ERROR);
+					t3lib_FlashMessageQueue::addMessage($message);
+
+				}
+
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 				return 1;
 
@@ -352,7 +329,7 @@
 
 			if (!defined('TYPO3_cliMode')) {
 
-				$_message = t3lib_div::makeInstance(
+				$message = t3lib_div::makeInstance(
 					't3lib_FlashMessage',
 					htmlspecialchars(sprintf($GLOBALS['LANG']->getLL('flash.documentDeleted'), $title, $uid)),
 					$GLOBALS['LANG']->getLL('flash.done', TRUE),
@@ -360,7 +337,7 @@
 					TRUE
 				);
 
-				t3lib_FlashMessageQueue::addMessage($_message);
+				t3lib_FlashMessageQueue::addMessage($message);
 
 			}
 
@@ -368,7 +345,11 @@
 
 		} else {
 
-			trigger_error('Could not find document with UID '.$uid, E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return 1;
 
@@ -388,7 +369,7 @@
 	protected static function loadIndexConf($pid) {
 
 		// Get the list of toplevel structures.
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_structures.index_name AS index_name',
 			'tx_dlf_structures',
 			'tx_dlf_structures.toplevel=1 AND tx_dlf_structures.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_structures'),
@@ -397,14 +378,14 @@
 			''
 		);
 
-		while ($_toplevel = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+		while ($toplevel = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			self::$toplevel[] = $_toplevel['index_name'];
+			self::$toplevel[] = $toplevel['index_name'];
 
 		}
 
 		// Get the metadata indexing options.
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.tokenized AS tokenized,tx_dlf_metadata.stored AS stored,tx_dlf_metadata.indexed AS indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.autocomplete AS autocomplete,tx_dlf_metadata.boost AS boost',
 			'tx_dlf_metadata',
 			'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
@@ -413,51 +394,51 @@
 			''
 		);
 
-		while ($_indexing = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
-
-			if ($_indexing['tokenized']) {
-
-				self::$tokenized[] = $_indexing['index_name'];
-
-			}
-
-			if ($_indexing['stored'] || $_indexing['is_listed']) {
-
-				self::$stored[] = $_indexing['index_name'];
-
-			}
-
-			if ($_indexing['indexed']) {
-
-				self::$indexed[] = $_indexing['index_name'];
-
-			}
-
-			if ($_indexing['is_sortable']) {
-
-				self::$sortables[] = $_indexing['index_name'];
-
-			}
-
-			if ($_indexing['is_facet']) {
-
-				self::$facets[] = $_indexing['index_name'];
-
-			}
-
-			if ($_indexing['autocomplete']) {
-
-				self::$autocompleted[] = $_indexing['index_name'];
-
-			}
-
-			if ($_indexing['boost'] > 0.0) {
-
-				self::$fieldboost[$_indexing['index_name']] = floatval($_indexing['boost']);
+		while ($indexing = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+
+			if ($indexing['tokenized']) {
+
+				self::$fields['tokenized'][] = $indexing['index_name'];
+
+			}
+
+			if ($indexing['stored'] || $indexing['is_listed']) {
+
+				self::$fields['stored'][] = $indexing['index_name'];
+
+			}
+
+			if ($indexing['indexed']) {
+
+				self::$fields['indexed'][] = $indexing['index_name'];
+
+			}
+
+			if ($indexing['is_sortable']) {
+
+				self::$fields['sortables'][] = $indexing['index_name'];
+
+			}
+
+			if ($indexing['is_facet']) {
+
+				self::$fields['facets'][] = $indexing['index_name'];
+
+			}
+
+			if ($indexing['autocomplete']) {
+
+				self::$fields['autocompleted'][] = $indexing['index_name'];
+
+			}
+
+			if ($indexing['boost'] > 0.0) {
+
+				self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['boost']);
 
 			} else {
 
-				self::$fieldboost[$_indexing['index_name']] = FALSE;
+				self::$fields['fieldboost'][$indexing['index_name']] = FALSE;
 
 			}
 
@@ -513,39 +494,39 @@
 
 			$solrDoc->setField('toplevel', in_array($logicalUnit['type'], self::$toplevel));
 
-			$solrDoc->setField('type', $logicalUnit['type'], self::$fieldboost['type']);
-
-			$solrDoc->setField('title', $metadata['title'][0], self::$fieldboost['title']);
-
-			$solrDoc->setField('volume', $metadata['volume'][0], self::$fieldboost['volume']);
+			$solrDoc->setField('type', $logicalUnit['type'], self::$fields['fieldboost']['type']);
+
+			$solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
+
+			$solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
 
 			foreach ($metadata as $index_name => $data) {
 
 				if (!empty($data) && substr($index_name, -8) !== '_sorting') {
 
-					$suffix = (in_array($index_name, self::$tokenized) ? 't' : 'u');
-
-					$suffix .= (in_array($index_name, self::$stored) ? 's' : 'u');
-
-					$suffix .= (in_array($index_name, self::$indexed) ? 'i' : 'u');
-
-					$solrDoc->setField($index_name.'_'.$suffix, $data, self::$fieldboost[$index_name]);
-
-					if (in_array($index_name, self::$sortables)) {
+					$suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
+
+					$suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
+
+					$suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
+
+					$solrDoc->setField($index_name.'_'.$suffix, $data, self::$fields['fieldboost'][$index_name]);
+
+					if (in_array($index_name, self::$fields['sortables'])) {
 
 						// Add sortable fields to index.
 						$solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
 
 					}
 
-					if (in_array($index_name, self::$facets)) {
+					if (in_array($index_name, self::$fields['facets'])) {
 
 						// Add facets to index.
 						$solrDoc->setField($index_name.'_faceting', $data);
 
 					}
 
-					if (in_array($index_name, self::$autocompleted)) {
+					if (in_array($index_name, self::$fields['autocompleted'])) {
 
 						// Add autocomplete values to index.
 						$solrDoc->setField($index_name.'_suggest', $data);
@@ -564,7 +545,7 @@
 
 				if (!defined('TYPO3_cliMode')) {
 
-					$_message = t3lib_div::makeInstance(
+					$message = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						$GLOBALS['LANG']->getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
 						$GLOBALS['LANG']->getLL('flash.error', TRUE),
@@ -572,7 +553,7 @@
 						TRUE
 					);
 
-					t3lib_FlashMessageQueue::addMessage($_message);
+					t3lib_FlashMessageQueue::addMessage($message);
 
 				}
 
 
=== modified file 'dlf/common/class.tx_dlf_list.php'
--- dlf/common/class.tx_dlf_list.php	2012-08-06 15:19:06 +0000
+++ dlf/common/class.tx_dlf_list.php	2012-08-17 07:00:27 +0000
@@ -92,11 +92,18 @@
 	 */
 	public function remove($position) {
 
+		// Save parameter for logging purposes.
+		$_position = $position;
+
 		$position = intval($position);
 
 		if ($position < 0 || $position >= $this->count) {
 
-			trigger_error('No valid list position for removal', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_list->remove('.$_position.')] Invalid position "'.$position.'" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return;
 
@@ -122,12 +129,21 @@
 	 */
 	public function move($position, $steps) {
 
+		// Save parameters for logging purposes.
+		$_position = $position;
+
+		$_steps = $steps;
+
 		$position = intval($position);
 
 		// Check if list position is valid.
 		if ($position < 0 || $position >= $this->count) {
 
-			trigger_error('Invalid list position '.$position, E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid position "'.$position.'" for element moving', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return;
 
@@ -138,7 +154,11 @@
 		// Check if moving given amount of steps is possible.
 		if (($position + $steps) < 0 || ($position + $steps) >= $this->count) {
 
-			trigger_error('Element at position '.$position.' can not be moved '.$steps.' steps', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid steps "'.$steps.'" for moving element at position "'.$position.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return;
 
@@ -273,6 +293,14 @@
 
 			$this->elements = $newOrder;
 
+		} else {
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_list->sort('.$by.', ['.($asc ? 'TRUE' : 'FALSE').'])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
+
 		}
 
 	}
@@ -400,17 +428,21 @@
 	 */
 	public function __get($var) {
 
-		$_method = '_get'.ucfirst($var);
-
-		if (!property_exists($this, $var) || !method_exists($this, $_method)) {
-
-			trigger_error('There is no get function for property '.$var, E_USER_ERROR);
+		$method = '_get'.ucfirst($var);
+
+		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_list->__get('.$var.')] There is no getter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 			return;
 
 		} else {
 
-			return $this->$_method();
+			return $this->$method();
 
 		}
 
@@ -428,15 +460,19 @@
 	 */
 	public function __set($var, $value) {
 
-		$_method = '_set'.ucfirst($var);
-
-		if (!property_exists($this, $var) || !method_exists($this, $_method)) {
-
-			trigger_error('There is no set function for property '.$var, E_USER_ERROR);
+		$method = '_set'.ucfirst($var);
+
+		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_list->__set('.$var.', '.$value.')] There is no setter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+
+			}
 
 		} else {
 
-			$this->$_method($value);
+			$this->$method($value);
 
 		}
 
 
=== modified file 'dlf/common/class.tx_dlf_mods.php'
--- dlf/common/class.tx_dlf_mods.php	2012-08-07 14:39:23 +0000
+++ dlf/common/class.tx_dlf_mods.php	2012-08-17 07:00:27 +0000
@@ -107,12 +107,6 @@
 
 					$metadata['author'][$i] = trim(implode(', ', $name));
 
-					if (!$metadata['author_sorting'][0]) {
-
-						$metadata['author_sorting'][0] = trim(implode(', ', $name));
-
-					}
-
 				}
 
 				// Check if there is a display form.
@@ -120,12 +114,6 @@
 
 					$metadata['author'][$i] = (string) $displayForm[0];
 
-					if (!$metadata['author_sorting'][0]) {
-
-						$metadata['author_sorting'][0] = (string) $displayForm[0];
-
-					}
-
 				}
 
 			}
 
=== modified file 'dlf/common/class.tx_dlf_module.php'
--- dlf/common/class.tx_dlf_module.php	2012-08-07 14:39:23 +0000
+++ dlf/common/class.tx_dlf_module.php	2012-08-17 07:00:27 +0000
@@ -147,13 +147,13 @@
 		// Set $this->MOD_MENU array here or leave empty.
 
 		/* Example code:
-		 $this->MOD_MENU = array (
-		 		'function' => array (
-		 				'1' => $GLOBALS['LANG']->getLL('function1'),
-		 				'2' => $GLOBALS['LANG']->getLL('function2'),
-		 				'3' => $GLOBALS['LANG']->getLL('function3'),
-		 		)
-		 ); */
+		$this->MOD_MENU = array (
+			'function' => array (
+				'1' => $GLOBALS['LANG']->getLL('function1'),
+				'2' => $GLOBALS['LANG']->getLL('function2'),
+				'3' => $GLOBALS['LANG']->getLL('function3'),
+			)
+		); */
 
 	}
 
@@ -182,17 +182,15 @@
 		<script type="text/javascript">
 		script_ended = 0;
 		function jumpToUrl(URL)	{
-		document.location = URL;
-	}
-	</script>
-	';
+			document.location = URL;
+		}
+		</script>';
 
 		// Add Javascript for convenient module switch.
 		$this->doc->postCode .= '
 		<script type="text/javascript">
 		script_ended = 1;
-		</script>
-		';
+		</script>';
 
 		// Render output.
 		$this->content .= $this->doc->startPage($GLOBALS['LANG']->getLL('title'));
@@ -233,7 +231,7 @@
 }
 
 /* No xclasses for abstract classes!
- if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_module.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_module.php'])	{
 include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_module.php']);
 }
 */
 
=== modified file 'dlf/common/class.tx_dlf_plugin.php'
--- dlf/common/class.tx_dlf_plugin.php	2012-08-07 14:39:23 +0000
+++ dlf/common/class.tx_dlf_plugin.php	2012-08-17 07:00:27 +0000
@@ -155,7 +155,11 @@
 			if (!$this->doc->ready) {
 
 				// Destroy the incomplete object.
-				trigger_error('Failed to load document with UID '.$this->piVars['id'], E_USER_ERROR);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 				$this->doc = NULL;
 
@@ -170,12 +174,12 @@
 
 			// Get UID of document with given record identifier.
 			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-					'tx_dlf_documents.uid',
-					'tx_dlf_documents',
-					'tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['recordId'], 'tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_documents'),
-					'',
-					'',
-					'1'
+				'tx_dlf_documents.uid',
+				'tx_dlf_documents',
+				'tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['recordId'], 'tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_documents'),
+				'',
+				'',
+				'1'
 			);
 
 			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
@@ -193,13 +197,21 @@
 
 			} else {
 
-				trigger_error('Failed to load document with record ID '.$this->piVars['recordId'], E_USER_ERROR);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 			}
 
 		} else {
 
-			trigger_error('No UID or PID given for document', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_plugin->loadDocument()] Invalid UID "'.$this->piVars['id'].'" or PID "'.$this->conf['pages'].'" for document loading', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 		}
 
@@ -304,7 +316,7 @@
 }
 
 /* No xclasses for abstract classes!
- if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_plugin.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_plugin.php'])	{
 include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_plugin.php']);
 }
 */
 
=== modified file 'dlf/common/class.tx_dlf_solr.php'
--- dlf/common/class.tx_dlf_solr.php	2012-08-07 14:39:23 +0000
+++ dlf/common/class.tx_dlf_solr.php	2012-08-17 07:00:27 +0000
@@ -93,6 +93,9 @@
 	 */
 	public static function solrConnect($core = 0) {
 
+		// Save parameter for logging purposes.
+		$_core = $core;
+
 		// Load class.
 		if (!class_exists('Apache_Solr_Service')) {
 
@@ -122,7 +125,11 @@
 
 			if (empty($core)) {
 
-				trigger_error('Could not find Solr core with UID '.$core, E_USER_NOTICE);
+				if (TYPO3_DLOG) {
+
+					t3lib_div::devLog('[tx_dlf_solr->solrConnect('.$_core.')] Invalid UID "'.$_core.'" for Apache Solr core', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+				}
 
 				return;
 
@@ -146,7 +153,11 @@
 
 		} else {
 
-			trigger_error('Could not connect to Solr server with core "'.$core.'"', E_USER_ERROR);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_solr->solrConnect('.$_core.')] Could not connect to Apache Solr server with core "'.$core.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+			}
 
 			return;
 
@@ -191,7 +202,7 @@
 }
 
 /* No xclasses for static classes!
- if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_solr.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_solr.php'])	{
 include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/common/class.tx_dlf_solr.php']);
 }
 */
 
=== modified file 'dlf/ext_autoload.php'
--- dlf/ext_autoload.php	2012-08-07 14:39:23 +0000
+++ dlf/ext_autoload.php	2012-08-17 07:00:27 +0000
@@ -25,36 +25,36 @@
 $extensionPath = t3lib_extMgm::extPath('dlf');
 
 return array (
-		'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
-		'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',
-		'tx_dlf_format' => $extensionPath.'common/class.tx_dlf_format.php',
-		'tx_dlf_helper' => $extensionPath.'common/class.tx_dlf_helper.php',
-		'tx_dlf_indexing' => $extensionPath.'common/class.tx_dlf_indexing.php',
-		'tx_dlf_list' => $extensionPath.'common/class.tx_dlf_list.php',
-		'tx_dlf_mods' => $extensionPath.'common/class.tx_dlf_mods.php',
-		'tx_dlf_module' => $extensionPath.'common/class.tx_dlf_module.php',
-		'tx_dlf_plugin' => $extensionPath.'common/class.tx_dlf_plugin.php',
-		'tx_dlf_solr' => $extensionPath.'common/class.tx_dlf_solr.php',
-		'tx_dlf_em' => $extensionPath.'hooks/class.tx_dlf_em.php',
-		'tx_dlf_hacks' => $extensionPath.'hooks/class.tx_dlf_hacks.php',
-		'tx_dlf_tceforms' => $extensionPath.'hooks/class.tx_dlf_tceforms.php',
-		'tx_dlf_tcemain' => $extensionPath.'hooks/class.tx_dlf_tcemain.php',
-		'tx_dlf_modIndexing' => $extensionPath.'modules/indexing/index.php',
-		'tx_dlf_modNewclient' => $extensionPath.'modules/newclient/index.php',
-		'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
-		'tx_dlf_feeds' => $extensionPath.'plugins/feeds/class.tx_dlf_feeds.php',
-		'tx_dlf_listview' => $extensionPath.'plugins/listview/class.tx_dlf_listview.php',
-		'tx_dlf_metadata' => $extensionPath.'plugins/metadata/class.tx_dlf_metadata.php',
-		'tx_dlf_navigation' => $extensionPath.'plugins/navigation/class.tx_dlf_navigation.php',
-		'tx_dlf_oai' => $extensionPath.'plugins/oai/class.tx_dlf_oai.php',
-		'tx_dlf_pageview' => $extensionPath.'plugins/pageview/class.tx_dlf_pageview.php',
-		'tx_dlf_search' => $extensionPath.'plugins/search/class.tx_dlf_search.php',
-		'tx_dlf_search_suggest' => $extensionPath.'plugins/search/class.tx_dlf_search_suggest.php',
-		'tx_dlf_statistics' => $extensionPath.'plugins/statistics/class.tx_dlf_statistics.php',
-		'tx_dlf_toc' => $extensionPath.'plugins/toc/class.tx_dlf_toc.php',
-		'tx_dlf_toolbox' => $extensionPath.'plugins/toolbox/class.tx_dlf_toolbox.php',
-		'tx_dlf_toolsDfgviewer' => $extensionPath.'plugins/toolbox/tools/dfgviewer/class.tx_dlf_toolsDfgviewer.php',
-		'tx_dlf_toolsPdf' => $extensionPath.'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php'
+	'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
+	'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',
+	'tx_dlf_format' => $extensionPath.'common/class.tx_dlf_format.php',
+	'tx_dlf_helper' => $extensionPath.'common/class.tx_dlf_helper.php',
+	'tx_dlf_indexing' => $extensionPath.'common/class.tx_dlf_indexing.php',
+	'tx_dlf_list' => $extensionPath.'common/class.tx_dlf_list.php',
+	'tx_dlf_mods' => $extensionPath.'common/class.tx_dlf_mods.php',
+	'tx_dlf_module' => $extensionPath.'common/class.tx_dlf_module.php',
+	'tx_dlf_plugin' => $extensionPath.'common/class.tx_dlf_plugin.php',
+	'tx_dlf_solr' => $extensionPath.'common/class.tx_dlf_solr.php',
+	'tx_dlf_em' => $extensionPath.'hooks/class.tx_dlf_em.php',
+	'tx_dlf_hacks' => $extensionPath.'hooks/class.tx_dlf_hacks.php',
+	'tx_dlf_tceforms' => $extensionPath.'hooks/class.tx_dlf_tceforms.php',
+	'tx_dlf_tcemain' => $extensionPath.'hooks/class.tx_dlf_tcemain.php',
+	'tx_dlf_modIndexing' => $extensionPath.'modules/indexing/index.php',
+	'tx_dlf_modNewclient' => $extensionPath.'modules/newclient/index.php',
+	'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
+	'tx_dlf_feeds' => $extensionPath.'plugins/feeds/class.tx_dlf_feeds.php',
+	'tx_dlf_listview' => $extensionPath.'plugins/listview/class.tx_dlf_listview.php',
+	'tx_dlf_metadata' => $extensionPath.'plugins/metadata/class.tx_dlf_metadata.php',
+	'tx_dlf_navigation' => $extensionPath.'plugins/navigation/class.tx_dlf_navigation.php',
+	'tx_dlf_oai' => $extensionPath.'plugins/oai/class.tx_dlf_oai.php',
+	'tx_dlf_pageview' => $extensionPath.'plugins/pageview/class.tx_dlf_pageview.php',
+	'tx_dlf_search' => $extensionPath.'plugins/search/class.tx_dlf_search.php',
+	'tx_dlf_search_suggest' => $extensionPath.'plugins/search/class.tx_dlf_search_suggest.php',
+	'tx_dlf_statistics' => $extensionPath.'plugins/statistics/class.tx_dlf_statistics.php',
+	'tx_dlf_toc' => $extensionPath.'plugins/toc/class.tx_dlf_toc.php',
+	'tx_dlf_toolbox' => $extensionPath.'plugins/toolbox/class.tx_dlf_toolbox.php',
+	'tx_dlf_toolsDfgviewer' => $extensionPath.'plugins/toolbox/tools/dfgviewer/class.tx_dlf_toolsDfgviewer.php',
+	'tx_dlf_toolsPdf' => $extensionPath.'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php'
 );
 
 ?>
 \ No newline at end of file
 
=== modified file 'dlf/ext_emconf.php'
--- dlf/ext_emconf.php	2012-08-09 12:13:34 +0000
+++ dlf/ext_emconf.php	2012-08-17 07:00:27 +0000
@@ -23,6 +23,7 @@
 ***************************************************************/
 
 $EM_CONF[$_EXTKEY] = array(
+<<<<<<< TREE
 	'title' => 'Goobi.Presentation',
 	'description' => 'Base plugins, modules, services and API of the Digital Library Framework. It is part of the community-based Goobi Digitization Suite.',
 	'category' => 'fe',
@@ -53,6 +54,38 @@
 		),
 	),
 	'_md5_values_when_last_written' => '',
+=======
+	'title' => 'Goobi.Presentation',
+	'description' => 'Base plugins, modules, services and API of the Digital Library Framework. It is part of the community-based Goobi Digitization Suite.',
+	'category' => 'fe',
+	'author' => 'Sebastian Meyer',
+	'author_email' => '[e-mail]',
+	'author_company' => '<br /><a href="http://www.slub-dresden.de/en/" target="_blank">Saxon State and University Library Dresden</a><br /><a href="https://launchpad.net/goobi" target="_blank">The Goobi Community</a>',
+	'shy' => '',
+	'priority' => '',
+	'module' => '',
+	'state' => 'stable',
+	'internal' => '',
+	'uploadfolder' => TRUE,
+	'createDirs' => '',
+	'modify_tables' => '',
+	'clearCacheOnLoad' => FALSE,
+	'lockType' => '',
+	'version' => '1.1.3',
+	'constraints' => array(
+		'depends' => array(
+			'php' => '5.3.0-',
+			'typo3' => '4.5.0-',
+		),
+		'conflicts' => array(
+		),
+		'suggests' => array(
+			'realurl' => '',
+			't3jquery' => '',
+		),
+	),
+	'_md5_values_when_last_written' => '',
+>>>>>>> MERGE-SOURCE
 );
 
 ?>
 \ No newline at end of file
 
=== modified file 'dlf/ext_tables.php'
--- dlf/ext_tables.php	2012-08-07 14:39:23 +0000
+++ dlf/ext_tables.php	2012-08-17 07:00:27 +0000
@@ -26,173 +26,174 @@
 
 // Register database tables.
 $TCA['tx_dlf_documents'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents',
-				'label'     => 'title',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'default_sortby' => 'ORDER BY title_sorting',
-				'delete' => 'deleted',
-				'enablecolumns' => array (
-						'disabled' => 'hidden',
-						'fe_group' => 'fe_group',
-				),
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfdocuments.png',
-				'rootLevel'	=> 0,
-				'dividers2tabs' => 2,
-				'searchFields' => 'title,volume,author,year,place,uid,prod_id,location,oai_id,opac_id,union_id,urn',
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents',
+		'label'     => 'title',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'default_sortby' => 'ORDER BY title_sorting',
+		'delete'	=> 'deleted',
+		'enablecolumns' => array (
+			'disabled' => 'hidden',
+			'starttime' => 'starttime',
+			'endtime' => 'endtime',
+			'fe_group' => 'fe_group',
 		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => '',
-		)
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfdocuments.png',
+		'rootLevel'	=> 0,
+		'dividers2tabs' => 2,
+		'searchFields' => 'title,volume,author,year,place,uid,prod_id,location,oai_id,opac_id,union_id,urn',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => '',
+	)
 );
 
 $TCA['tx_dlf_structures'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures',
-				'label'     => 'label',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'languageField'            => 'sys_language_uid',
-				'transOrigPointerField'    => 'l18n_parent',
-				'transOrigDiffSourceField' => 'l18n_diffsource',
-				'default_sortby' => 'ORDER BY label',
-				'delete' => 'deleted',
-				'enablecolumns' => array (
-						'disabled' => 'hidden',
-				),
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfstructures.png',
-				'rootLevel'	=> 0,
-				'dividers2tabs' => 2,
-				'searchFields' => 'label,index_name,oai_name',
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures',
+		'label'     => 'label',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'languageField' => 'sys_language_uid',
+		'transOrigPointerField' => 'l18n_parent',
+		'transOrigDiffSourceField' => 'l18n_diffsource',
+		'default_sortby' => 'ORDER BY label',
+		'delete'	=> 'deleted',
+		'enablecolumns' => array (
+			'disabled' => 'hidden',
 		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => '',
-		)
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfstructures.png',
+		'rootLevel'	=> 0,
+		'dividers2tabs' => 2,
+		'searchFields' => 'label,index_name,oai_name',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => '',
+	)
 );
 
 $TCA['tx_dlf_metadata'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata',
-				'label'     => 'label',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'languageField'            => 'sys_language_uid',
-				'transOrigPointerField'    => 'l18n_parent',
-				'transOrigDiffSourceField' => 'l18n_diffsource',
-				'sortby' => 'sorting',
-				'delete' => 'deleted',
-				'enablecolumns' => array (
-						'disabled' => 'hidden',
-				),
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfmetadata.png',
-				'rootLevel'	=> 0,
-				'dividers2tabs' => 2,
-				'searchFields' => 'label,index_name,encoding,xpath,xpath_sorting,default',
-				'requestUpdate' => 'is_sortable',
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata',
+		'label'     => 'label',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'languageField' => 'sys_language_uid',
+		'transOrigPointerField' => 'l18n_parent',
+		'transOrigDiffSourceField' => 'l18n_diffsource',
+		'sortby'	=> 'sorting',
+		'delete'	=> 'deleted',
+		'enablecolumns' => array (
+			'disabled' => 'hidden',
 		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => '',
-		)
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfmetadata.png',
+		'rootLevel'	=> 0,
+		'dividers2tabs' => 2,
+		'searchFields' => 'label,index_name,encoding,xpath,xpath_sorting,default',
+		'requestUpdate' => 'is_sortable',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => '',
+	)
 );
 
 $TCA['tx_dlf_formats'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats',
-				'label'     => 'type',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'default_sortby' => 'ORDER BY type',
-				'delete' => 'deleted',
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfformats.png',
-				'rootLevel'	=> 1,
-				'dividers2tabs' => 2,
-				'searchFields' => 'type,class',
-		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => '',
-		)
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats',
+		'label'     => 'type',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'default_sortby' => 'ORDER BY type',
+		'delete'	=> 'deleted',
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfformats.png',
+		'rootLevel'	=> 1,
+		'dividers2tabs' => 2,
+		'searchFields' => 'type,class',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => '',
+	)
 );
 
 $TCA['tx_dlf_solrcores'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_solrcores',
-				'label'     => 'label',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'default_sortby' => 'ORDER BY label',
-				'delete' => 'deleted',
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfsolrcores.png',
-				'rootLevel'	=> -1,
-				'adminOnly' => 1,
-				'dividers2tabs' => 2,
-				'searchFields' => 'label,index_name',
-		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => '',
-		)
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_solrcores',
+		'label'     => 'label',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'default_sortby' => 'ORDER BY label',
+		'delete'	=> 'deleted',
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfsolrcores.png',
+		'rootLevel'	=> -1,
+		'dividers2tabs' => 2,
+		'searchFields' => 'label,index_name',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => '',
+	)
 );
 
 $TCA['tx_dlf_collections'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections',
-				'label'     => 'label',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'fe_cruser_id' => 'fe_cruser_id',
-				'fe_admin_lock' => 'fe_admin_lock',
-				'languageField'            => 'sys_language_uid',
-				'transOrigPointerField'    => 'l18n_parent',
-				'transOrigDiffSourceField' => 'l18n_diffsource',
-				'default_sortby' => 'ORDER BY label',
-				'delete' => 'deleted',
-				'enablecolumns' => array (
-						'disabled' => 'hidden',
-						'fe_group' => 'fe_group',
-				),
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfcollections.png',
-				'rootLevel'	=> 0,
-				'dividers2tabs' => 2,
-				'searchFields' => 'label,index_name,oai_name,fe_cruser_id',
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections',
+		'label'     => 'label',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'fe_cruser_id' => 'fe_cruser_id',
+		'fe_admin_lock' => 'fe_admin_lock',
+		'languageField' => 'sys_language_uid',
+		'transOrigPointerField' => 'l18n_parent',
+		'transOrigDiffSourceField' => 'l18n_diffsource',
+		'default_sortby' => 'ORDER BY label',
+		'delete'	=> 'deleted',
+		'enablecolumns' => array (
+			'disabled' => 'hidden',
+			'fe_group' => 'fe_group',
 		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => 'label,description,documents',
-		)
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlfcollections.png',
+		'rootLevel'	=> 0,
+		'dividers2tabs' => 2,
+		'searchFields' => 'label,index_name,oai_name,fe_cruser_id',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => 'label,description,documents',
+	)
 );
 
 $TCA['tx_dlf_libraries'] = array (
-		'ctrl' => array (
-				'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries',
-				'label'     => 'label',
-				'tstamp'    => 'tstamp',
-				'crdate'    => 'crdate',
-				'cruser_id' => 'cruser_id',
-				'languageField'            => 'sys_language_uid',
-				'transOrigPointerField'    => 'l18n_parent',
-				'transOrigDiffSourceField' => 'l18n_diffsource',
-				'default_sortby' => 'ORDER BY label',
-				'delete' => 'deleted',
-				'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
-				'iconfile'          => t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlflibraries.png',
-				'rootLevel'	=> 0,
-				'dividers2tabs' => 2,
-				'searchFields' => 'label,website,contact',
-		),
-		'feInterface' => array (
-				'fe_admin_fieldList' => '',
-		)
+	'ctrl' => array (
+		'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_libraries',
+		'label'     => 'label',
+		'tstamp'    => 'tstamp',
+		'crdate'    => 'crdate',
+		'cruser_id' => 'cruser_id',
+		'languageField' => 'sys_language_uid',
+		'transOrigPointerField' => 'l18n_parent',
+		'transOrigDiffSourceField' => 'l18n_diffsource',
+		'default_sortby' => 'ORDER BY label',
+		'delete'	=> 'deleted',
+		'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tca.php',
+		'iconfile'	=> t3lib_extMgm::extRelPath($_EXTKEY).'res/icons/txdlflibraries.png',
+		'rootLevel'	=> 0,
+		'dividers2tabs' => 2,
+		'searchFields' => 'label,website,contact',
+	),
+	'feInterface' => array (
+		'fe_admin_fieldList' => '',
+	)
 );
 
 // Register static typoscript.
 
=== modified file 'dlf/ext_tables.sql'
--- dlf/ext_tables.sql	2012-08-09 10:31:57 +0000
+++ dlf/ext_tables.sql	2012-08-17 07:00:27 +0000
@@ -9,6 +9,8 @@
     cruser_id int(11) DEFAULT '0' NOT NULL,
     deleted tinyint(4) DEFAULT '0' NOT NULL,
     hidden tinyint(4) DEFAULT '0' NOT NULL,
+    starttime int(11) DEFAULT '0' NOT NULL,
+    endtime int(11) DEFAULT '0' NOT NULL,
     fe_group varchar(100) DEFAULT '' NOT NULL,
     prod_id tinytext NOT NULL,
     location text NOT NULL,
@@ -109,7 +111,6 @@
     cruser_id int(11) DEFAULT '0' NOT NULL,
     deleted tinyint(4) DEFAULT '0' NOT NULL,
     type tinytext NOT NULL,
-    other_type tinyint(4) DEFAULT '0' NOT NULL,
     root tinytext NOT NULL,
     namespace text NOT NULL,
     class text NOT NULL,
 
=== modified file 'dlf/ext_tables_static+adt.sql'
--- dlf/ext_tables_static+adt.sql	2012-04-30 16:05:21 +0000
+++ dlf/ext_tables_static+adt.sql	2012-08-17 07:00:27 +0000
@@ -9,7 +9,6 @@
     cruser_id int(11) DEFAULT '0' NOT NULL,
     deleted tinyint(4) DEFAULT '0' NOT NULL,
     type tinytext NOT NULL,
-    other_type tinyint(4) DEFAULT '0' NOT NULL,
     root tinytext NOT NULL,
     namespace text NOT NULL,
     class text NOT NULL,
@@ -18,4 +17,4 @@
     KEY parent (pid)
 );
 
-INSERT INTO tx_dlf_formats VALUES ('1', '0', '0', '0', '0', '0', 'MODS', '0', 'mods', 'http://www.loc.gov/mods/v3', 'tx_dlf_mods');
+INSERT INTO tx_dlf_formats VALUES ('1', '0', '0', '0', '0', '0', 'MODS', 'mods', 'http://www.loc.gov/mods/v3', 'tx_dlf_mods');
 
=== modified file 'dlf/hooks/class.tx_dlf_em.php'
--- dlf/hooks/class.tx_dlf_em.php	2012-08-07 14:39:23 +0000
+++ dlf/hooks/class.tx_dlf_em.php	2012-08-17 07:00:27 +0000
@@ -84,10 +84,10 @@
 		$url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores';
 
 		$context = stream_context_create(array (
-				'http' => array (
-						'method' => 'GET',
-						'user_agent' => (!empty($conf['useragent']) ? $conf['useragent'] : ini_get('user_agent'))
-				)
+			'http' => array (
+				'method' => 'GET',
+				'user_agent' => (!empty($conf['useragent']) ? $conf['useragent'] : ini_get('user_agent'))
+			)
 		));
 
 		// Try to connect to Solr server.
@@ -101,11 +101,11 @@
 			if (is_array($status)) {
 
 				$message = t3lib_div::makeInstance(
-						't3lib_FlashMessage',
-						sprintf($GLOBALS['LANG']->getLL('solr.status'), (string) $status[0]),
-						$GLOBALS['LANG']->getLL('solr.connected'),
-						($status[0] == 0 ? t3lib_FlashMessage::OK : t3lib_FlashMessage::WARNING),
-						FALSE
+					't3lib_FlashMessage',
+					sprintf($GLOBALS['LANG']->getLL('solr.status'), (string) $status[0]),
+					$GLOBALS['LANG']->getLL('solr.connected'),
+					($status[0] == 0 ? t3lib_FlashMessage::OK : t3lib_FlashMessage::WARNING),
+					FALSE
 				);
 
 				$this->content .= $message->render();
@@ -117,11 +117,11 @@
 		}
 
 		$message = t3lib_div::makeInstance(
-				't3lib_FlashMessage',
-				sprintf($GLOBALS['LANG']->getLL('solr.error'), $url),
-				$GLOBALS['LANG']->getLL('solr.notConnected'),
-				t3lib_FlashMessage::WARNING,
-				FALSE
+			't3lib_FlashMessage',
+			sprintf($GLOBALS['LANG']->getLL('solr.error'), $url),
+			$GLOBALS['LANG']->getLL('solr.notConnected'),
+			t3lib_FlashMessage::WARNING,
+			FALSE
 		);
 
 		$this->content .= $message->render();
@@ -147,9 +147,9 @@
 
 		// Check if user "_cli_dlf" exists, is no admin and is not disabled.
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid,admin,usergroup',
-				'be_users',
-				'username='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users').t3lib_BEfunc::deleteClause('be_users')
+			'uid,admin,usergroup',
+			'be_users',
+			'username='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users').t3lib_BEfunc::deleteClause('be_users')
 		);
 
 		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
@@ -160,25 +160,25 @@
 			$resArray['usergroup'] = explode(',', $resArray['usergroup']);
 
 			// Check if user is not disabled.
-			$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-					'1',
-					'be_users',
-					'uid='.intval($resArray['uid']).t3lib_BEfunc::BEenableFields('be_users')
+			$result2 = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'1',
+				'be_users',
+				'uid='.intval($resArray['uid']).t3lib_BEfunc::BEenableFields('be_users')
 			);
 
 			// Check if user is configured properly.
 			if (count(array_diff(array ($groupUid), $resArray['usergroup'])) == 0
 					&& !$resArray['admin']
-					&& $GLOBALS['TYPO3_DB']->sql_num_rows($_result) > 0) {
+					&& $GLOBALS['TYPO3_DB']->sql_num_rows($result2) > 0) {
 
 				$usrUid = $resArray['uid'];
 
 				$message = t3lib_div::makeInstance(
-						't3lib_FlashMessage',
-						$GLOBALS['LANG']->getLL('cliUserGroup.usrOkayMsg'),
-						$GLOBALS['LANG']->getLL('cliUserGroup.usrOkay'),
-						t3lib_FlashMessage::OK,
-						FALSE
+					't3lib_FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrOkayMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrOkay'),
+					t3lib_FlashMessage::OK,
+					FALSE
 				);
 
 			} else {
@@ -186,15 +186,15 @@
 				if (!$checkOnly && $groupUid) {
 
 					// Keep exisiting values and add the new ones.
-					$_usergroup = array_unique(array_merge(array ($groupUid), $resArray['usergroup']));
+					$usergroup = array_unique(array_merge(array ($groupUid), $resArray['usergroup']));
 
 					// Try to configure user.
 					$data['be_users'][$resArray['uid']] = array (
-							'admin' => 0,
-							'usergroup' => implode(',', $_usergroup),
-							$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['disabled'] => 0,
-							$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['starttime'] => 0,
-							$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['endtime'] => 0
+						'admin' => 0,
+						'usergroup' => implode(',', $usergroup),
+						$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['disabled'] => 0,
+						$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['starttime'] => 0,
+						$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['endtime'] => 0
 					);
 
 					tx_dlf_helper::processDB($data);
@@ -205,33 +205,33 @@
 						$usrUid = $resArray['uid'];
 
 						$message = t3lib_div::makeInstance(
-								't3lib_FlashMessage',
-								$GLOBALS['LANG']->getLL('cliUserGroup.usrConfiguredMsg'),
-								$GLOBALS['LANG']->getLL('cliUserGroup.usrConfigured'),
-								t3lib_FlashMessage::INFO,
-								FALSE
+							't3lib_FlashMessage',
+							$GLOBALS['LANG']->getLL('cliUserGroup.usrConfiguredMsg'),
+							$GLOBALS['LANG']->getLL('cliUserGroup.usrConfigured'),
+							t3lib_FlashMessage::INFO,
+							FALSE
 						);
 
 					} else {
 
 						$message = t3lib_div::makeInstance(
-								't3lib_FlashMessage',
-								$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
-								$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
-								t3lib_FlashMessage::ERROR,
-								FALSE
-						);
-
-					}
-
-				} else {
-
-					$message = t3lib_div::makeInstance(
 							't3lib_FlashMessage',
 							$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
 							$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
 							t3lib_FlashMessage::ERROR,
 							FALSE
+						);
+
+					}
+
+				} else {
+
+					$message = t3lib_div::makeInstance(
+						't3lib_FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
+						t3lib_FlashMessage::ERROR,
+						FALSE
 					);
 
 				}
@@ -243,51 +243,51 @@
 			if (!$checkOnly && $groupUid) {
 
 				// Try to create user.
-				$_tempUid = uniqid('NEW');
+				$tempUid = uniqid('NEW');
 
-				$data['be_users'][$_tempUid] = array (
-						'pid' => 0,
-						'username' => '_cli_dlf',
-						'password' => md5($_tempUid),
-						'realName' => $GLOBALS['LANG']->getLL('cliUserGroup.usrRealName'),
-						'usergroup' => intval($groupUid)
+				$data['be_users'][$tempUid] = array (
+					'pid' => 0,
+					'username' => '_cli_dlf',
+					'password' => md5($tempUid),
+					'realName' => $GLOBALS['LANG']->getLL('cliUserGroup.usrRealName'),
+					'usergroup' => intval($groupUid)
 				);
 
-				$_substUid = tx_dlf_helper::processDB($data);
+				$substUid = tx_dlf_helper::processDB($data);
 
 				// Check if creation was successful.
-				if (!empty($_substUid[$_tempUid])) {
+				if (!empty($substUid[$tempUid])) {
 
-					$usrUid = $_substUid[$_tempUid];
+					$usrUid = $substUid[$tempUid];
 
 					$message = t3lib_div::makeInstance(
-							't3lib_FlashMessage',
-							$GLOBALS['LANG']->getLL('cliUserGroup.usrCreatedMsg'),
-							$GLOBALS['LANG']->getLL('cliUserGroup.usrCreated'),
-							t3lib_FlashMessage::INFO,
-							FALSE
+						't3lib_FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrCreatedMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrCreated'),
+						t3lib_FlashMessage::INFO,
+						FALSE
 					);
 
 				} else {
 
 					$message = t3lib_div::makeInstance(
-							't3lib_FlashMessage',
-							$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
-							$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
-							t3lib_FlashMessage::ERROR,
-							FALSE
-					);
-
-				}
-
-			} else {
-
-				$message = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
 						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
 						t3lib_FlashMessage::ERROR,
 						FALSE
+					);
+
+				}
+
+			} else {
+
+				$message = t3lib_div::makeInstance(
+					't3lib_FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
+					t3lib_FlashMessage::ERROR,
+					FALSE
 				);
 
 			}
@@ -319,21 +319,21 @@
 		if (empty($settings)) {
 
 			$settings = array (
-					'non_exclude_fields' => array (),
-					'tables_select' => array (
-							'tx_dlf_documents',
-							'tx_dlf_collections',
-							'tx_dlf_libraries',
-							'tx_dlf_structures',
-							'tx_dlf_metadata',
-							'tx_dlf_formats',
-							'tx_dlf_solrcores'
-					),
-					'tables_modify' => array (
-							'tx_dlf_documents',
-							'tx_dlf_collections',
-							'tx_dlf_libraries'
-					)
+				'non_exclude_fields' => array (),
+				'tables_select' => array (
+					'tx_dlf_documents',
+					'tx_dlf_collections',
+					'tx_dlf_libraries',
+					'tx_dlf_structures',
+					'tx_dlf_metadata',
+					'tx_dlf_formats',
+					'tx_dlf_solrcores'
+				),
+				'tables_modify' => array (
+					'tx_dlf_documents',
+					'tx_dlf_collections',
+					'tx_dlf_libraries'
+				)
 			);
 
 			// Set allowed exclude fields.
@@ -357,9 +357,9 @@
 
 		// Check if group "_cli_dlf" exists and is not disabled.
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid,non_exclude_fields,tables_select,tables_modify,inc_access_lists,'.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'],
-				'be_groups',
-				'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').t3lib_BEfunc::deleteClause('be_groups')
+			'uid,non_exclude_fields,tables_select,tables_modify,inc_access_lists,'.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'],
+			'be_groups',
+			'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').t3lib_BEfunc::deleteClause('be_groups')
 		);
 
 		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
@@ -383,11 +383,11 @@
 				$grpUid = $resArray['uid'];
 
 				$message = t3lib_div::makeInstance(
-						't3lib_FlashMessage',
-						$GLOBALS['LANG']->getLL('cliUserGroup.grpOkayMsg'),
-						$GLOBALS['LANG']->getLL('cliUserGroup.grpOkay'),
-						t3lib_FlashMessage::OK,
-						FALSE
+					't3lib_FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpOkayMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpOkay'),
+					t3lib_FlashMessage::OK,
+					FALSE
 				);
 
 			} else {
@@ -395,19 +395,19 @@
 				if (!$checkOnly) {
 
 					// Keep exisiting values and add the new ones.
-					$_non_exclude_fields = array_unique(array_merge($settings['non_exclude_fields'], $resArray['non_exclude_fields']));
-
-					$_tables_select = array_unique(array_merge($settings['tables_select'], $resArray['tables_select']));
-
-					$_tables_modify = array_unique(array_merge($settings['tables_modify'], $resArray['tables_modify']));
+					$non_exclude_fields = array_unique(array_merge($settings['non_exclude_fields'], $resArray['non_exclude_fields']));
+
+					$tables_select = array_unique(array_merge($settings['tables_select'], $resArray['tables_select']));
+
+					$tables_modify = array_unique(array_merge($settings['tables_modify'], $resArray['tables_modify']));
 
 					// Try to configure usergroup.
 					$data['be_groups'][$resArray['uid']] = array (
-							'non_exclude_fields' => implode(',', $_non_exclude_fields),
-							'tables_select' => implode(',', $_tables_select),
-							'tables_modify' => implode(',', $_tables_modify),
-							'inc_access_lists' => 1,
-							$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'] => 0
+						'non_exclude_fields' => implode(',', $non_exclude_fields),
+						'tables_select' => implode(',', $tables_select),
+						'tables_modify' => implode(',', $tables_modify),
+						'inc_access_lists' => 1,
+						$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'] => 0
 					);
 
 					tx_dlf_helper::processDB($data);
@@ -418,33 +418,33 @@
 						$grpUid = $resArray['uid'];
 
 						$message = t3lib_div::makeInstance(
-								't3lib_FlashMessage',
-								$GLOBALS['LANG']->getLL('cliUserGroup.grpConfiguredMsg'),
-								$GLOBALS['LANG']->getLL('cliUserGroup.grpConfigured'),
-								t3lib_FlashMessage::INFO,
-								FALSE
+							't3lib_FlashMessage',
+							$GLOBALS['LANG']->getLL('cliUserGroup.grpConfiguredMsg'),
+							$GLOBALS['LANG']->getLL('cliUserGroup.grpConfigured'),
+							t3lib_FlashMessage::INFO,
+							FALSE
 						);
 
 					} else {
 
 						$message = t3lib_div::makeInstance(
-								't3lib_FlashMessage',
-								$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
-								$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
-								t3lib_FlashMessage::ERROR,
-								FALSE
-						);
-
-					}
-
-				} else {
-
-					$message = t3lib_div::makeInstance(
 							't3lib_FlashMessage',
 							$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
 							$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
 							t3lib_FlashMessage::ERROR,
 							FALSE
+						);
+
+					}
+
+				} else {
+
+					$message = t3lib_div::makeInstance(
+						't3lib_FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
+						t3lib_FlashMessage::ERROR,
+						FALSE
 					);
 
 				}
@@ -456,53 +456,53 @@
 			if (!$checkOnly) {
 
 				// Try to create usergroup.
-				$_tempUid = uniqid('NEW');
+				$tempUid = uniqid('NEW');
 
-				$data['be_groups'][$_tempUid] = array (
-						'pid' => 0,
-						'title' => '_cli_dlf',
-						'description' => $GLOBALS['LANG']->getLL('cliUserGroup.grpDescription'),
-						'non_exclude_fields' => implode(',', $settings['non_exclude_fields']),
-						'tables_select' => implode(',', $settings['tables_select']),
-						'tables_modify' => implode(',', $settings['tables_modify']),
-						'inc_access_lists' => 1
+				$data['be_groups'][$tempUid] = array (
+					'pid' => 0,
+					'title' => '_cli_dlf',
+					'description' => $GLOBALS['LANG']->getLL('cliUserGroup.grpDescription'),
+					'non_exclude_fields' => implode(',', $settings['non_exclude_fields']),
+					'tables_select' => implode(',', $settings['tables_select']),
+					'tables_modify' => implode(',', $settings['tables_modify']),
+					'inc_access_lists' => 1
 				);
 
-				$_substUid = tx_dlf_helper::processDB($data);
+				$substUid = tx_dlf_helper::processDB($data);
 
 				// Check if creation was successful.
-				if (!empty($_substUid[$_tempUid])) {
+				if (!empty($substUid[$tempUid])) {
 
-					$grpUid = $_substUid[$_tempUid];
+					$grpUid = $substUid[$tempUid];
 
 					$message = t3lib_div::makeInstance(
-							't3lib_FlashMessage',
-							$GLOBALS['LANG']->getLL('cliUserGroup.grpCreatedMsg'),
-							$GLOBALS['LANG']->getLL('cliUserGroup.grpCreated'),
-							t3lib_FlashMessage::INFO,
-							FALSE
+						't3lib_FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpCreatedMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpCreated'),
+						t3lib_FlashMessage::INFO,
+						FALSE
 					);
 
 				} else {
 
 					$message = t3lib_div::makeInstance(
-							't3lib_FlashMessage',
-							$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
-							$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
-							t3lib_FlashMessage::ERROR,
-							FALSE
-					);
-
-				}
-
-			} else {
-
-				$message = t3lib_div::makeInstance(
 						't3lib_FlashMessage',
 						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
 						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
 						t3lib_FlashMessage::ERROR,
 						FALSE
+					);
+
+				}
+
+			} else {
+
+				$message = t3lib_div::makeInstance(
+					't3lib_FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
+					t3lib_FlashMessage::ERROR,
+					FALSE
 				);
 
 			}
@@ -549,21 +549,21 @@
 		if (is_executable(PATH_typo3.'cli_dispatch.phpsh')) {
 
 			$message = t3lib_div::makeInstance(
-					't3lib_FlashMessage',
-					$GLOBALS['LANG']->getLL('cliUserGroup.cliOkayMsg'),
-					$GLOBALS['LANG']->getLL('cliUserGroup.cliOkay'),
-					t3lib_FlashMessage::OK,
-					FALSE
+				't3lib_FlashMessage',
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliOkayMsg'),
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliOkay'),
+				t3lib_FlashMessage::OK,
+				FALSE
 			);
 
 		} else {
 
 			$message = t3lib_div::makeInstance(
-					't3lib_FlashMessage',
-					$GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkayMsg'),
-					$GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkay'),
-					t3lib_FlashMessage::ERROR,
-					FALSE
+				't3lib_FlashMessage',
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkayMsg'),
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkay'),
+				t3lib_FlashMessage::ERROR,
+				FALSE
 			);
 
 		}
 
=== modified file 'dlf/hooks/class.tx_dlf_hacks.php'
--- dlf/hooks/class.tx_dlf_hacks.php	2012-08-07 14:39:23 +0000
+++ dlf/hooks/class.tx_dlf_hacks.php	2012-08-17 07:00:27 +0000
@@ -55,23 +55,23 @@
 
 			$xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 
-			if (($_divs = $xml->xpath('//mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID]'))) {
-
-				$_smLinks = $xml->xpath('//mets:structLink/mets:smLink');
-
-				if ($_smLinks) {
-
-					foreach ($_smLinks as $_smLink) {
-
-						$_links[(string) $_smLink->attributes('http://www.w3.org/1999/xlink')->from][] = (string) $_smLink->attributes('http://www.w3.org/1999/xlink')->to;
+			if (($divs = $xml->xpath('//mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID]'))) {
+
+				$smLinks = $xml->xpath('//mets:structLink/mets:smLink');
+
+				if ($smLinks) {
+
+					foreach ($smLinks as $smLink) {
+
+						$links[(string) $smLink->attributes('http://www.w3.org/1999/xlink')->from][] = (string) $smLink->attributes('http://www.w3.org/1999/xlink')->to;
 
 					}
 
-					foreach ($_divs as $_div) {
-
-						if (!empty($_links[(string) $_div['ID']])) {
-
-							$_id = (string) $_div['DMDID'];
+					foreach ($divs as $div) {
+
+						if (!empty($links[(string) $div['ID']])) {
+
+							$id = (string) $div['DMDID'];
 
 							break;
 
@@ -81,17 +81,17 @@
 
 				}
 
-				if (empty($_id)) {
+				if (empty($id)) {
 
-					$_id = (string) $_divs[0]['DMDID'];
+					$id = (string) $divs[0]['DMDID'];
 
 				}
 
-				$_recordId = $xml->xpath('//mets:dmdSec[@ID="'.$_id.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
-
-				if (!empty($_recordId[0])) {
-
-					return (string) $_recordId[0];
+				$recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$id.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
+
+				if (!empty($recordIds[0])) {
+
+					return (string) $recordIds[0];
 
 				}
 
 
=== modified file 'dlf/hooks/class.tx_dlf_tceforms.php'
--- dlf/hooks/class.tx_dlf_tceforms.php	2012-08-07 14:39:23 +0000
+++ dlf/hooks/class.tx_dlf_tceforms.php	2012-08-17 07:00:27 +0000
@@ -59,21 +59,21 @@
 			// i.e. instead of "18" it reads "pages_18|Title"
 			if (!t3lib_div::testInt($pages)) {
 
-				$_parts = explode('|', $pages);
+				$parts = explode('|', $pages);
 
-				$pages = array_pop(explode('_', $_parts[0]));
+				$pages = array_pop(explode('_', $parts[0]));
 
 			}
 
 			if ($pages > 0) {
 
 				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-						'label,uid',
-						'tx_dlf_collections',
-						'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_collections'),
-						'',
-						'label',
-						''
+					'label,uid',
+					'tx_dlf_collections',
+					'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_collections'),
+					'',
+					'label',
+					''
 				);
 
 				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
@@ -114,21 +114,21 @@
 			// i.e. instead of "18" it reads "pages_18|Title"
 			if (!t3lib_div::testInt($pages)) {
 
-				$_parts = explode('|', $pages);
+				$parts = explode('|', $pages);
 
-				$pages = array_pop(explode('_', $_parts[0]));
+				$pages = array_pop(explode('_', $parts[0]));
 
 			}
 
 			if ($pages > 0) {
 
 				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-						'label,uid',
-						'tx_dlf_libraries',
-						'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_libraries'),
-						'',
-						'label',
-						''
+					'label,uid',
+					'tx_dlf_libraries',
+					'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_libraries'),
+					'',
+					'label',
+					''
 				);
 
 				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
@@ -169,21 +169,21 @@
 			// i.e. instead of "18" it reads "pages_18|Title"
 			if (!t3lib_div::testInt($pages)) {
 
-				$_parts = explode('|', $pages);
+				$parts = explode('|', $pages);
 
-				$pages = array_pop(explode('_', $_parts[0]));
+				$pages = array_pop(explode('_', $parts[0]));
 
 			}
 
 			if ($pages > 0) {
 
 				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-						'label,uid',
-						'tx_dlf_solrcores',
-						'pid IN ('.intval($pages).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-						'',
-						'label',
-						''
+					'label,uid',
+					'tx_dlf_solrcores',
+					'pid IN ('.intval($pages).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+					'',
+					'label',
+					''
 				);
 
 				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
=== modified file 'dlf/hooks/class.tx_dlf_tcemain.php'
--- dlf/hooks/class.tx_dlf_tcemain.php	2012-08-07 14:39:23 +0000
+++ dlf/hooks/class.tx_dlf_tcemain.php	2012-08-17 07:00:27 +0000
@@ -59,37 +59,13 @@
 				// Field post-processing for table "tx_dlf_documents".
 				case 'tx_dlf_documents':
 
-					// Set sorting fields if empty.
+					// Set sorting field if empty.
 					if (empty($fieldArray['title_sorting']) && !empty($fieldArray['title'])) {
 
 						$fieldArray['title_sorting'] = $fieldArray['title'];
 
 					}
 
-					if (empty($fieldArray['author_sorting']) && !empty($fieldArray['author'])) {
-
-						$fieldArray['author_sorting'] = $fieldArray['author'];
-
-					}
-
-					if (empty($fieldArray['year_sorting']) && !empty($fieldArray['year'])) {
-
-						$fieldArray['year_sorting'] = str_ireplace('x', '5', preg_replace('/[^\d.x]/i', '', (string) $fieldArray['year']));
-
-						if (strpos($fieldArray['year_sorting'], '.') || strlen($fieldArray['year_sorting']) < 3) {
-
-							$fieldArray['year_sorting'] = ((intval(trim($fieldArray['year_sorting'], '.')) - 1) * 100) + 50;
-
-						}
-
-					}
-
-					if (empty($fieldArray['place_sorting']) && !empty($fieldArray['place'])) {
-
-						$fieldArray['place_sorting'] = preg_replace('/[[:punct:]]/', '', (string) $fieldArray['place']);
-
-					}
-
 					break;
 
 					// Field post-processing for tables "tx_dlf_collections", "tx_dlf_libraries", "tx_dlf_metadata" and "tx_dlf_structures".
@@ -119,12 +95,12 @@
 
 					// Get number of existing cores.
 					$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-					'*',
-					'tx_dlf_solrcores',
-					'',
-					'',
-					'',
-					''
+						'*',
+						'tx_dlf_solrcores',
+						'',
+						'',
+						'',
+						''
 					);
 
 					// Get first unused core number.
@@ -155,10 +131,10 @@
 					$url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores?action=CREATE&name=dlfCore'.$coreNumber.'&instanceDir=.&dataDir=dlfCore'.$coreNumber;
 
 					$context = stream_context_create(array (
-							'http' => array (
-									'method' => 'GET',
-									'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
-							)
+						'http' => array (
+							'method' => 'GET',
+							'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
+						)
 					));
 
 					$response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
@@ -178,7 +154,11 @@
 
 					}
 
-					trigger_error('Could not create new Solr core "dlfCore'.$coreNumber.'"', E_USER_WARNING);
+					if (TYPO3_DLOG) {
+
+						t3lib_div::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Could not create new Apache Solr core "dlfCore'.$coreNumber.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
+
+					}
 
 					$fieldArray = NULL;
 
@@ -206,12 +186,12 @@
 
 							// Get current index name.
 							$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-									$table.'.index_name AS index_name',
-									$table,
-									$table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
-									'',
-									'',
-									'1'
+								$table.'.index_name AS index_name',
+								$table,
+								$table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+								'',
+								'',
+								'1'
 							);
 
 							if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -225,7 +205,11 @@
 
 						}
 
-						trigger_error('Prevented change of "index_name" for UID '.intval($id).' in table "'.htmlspecialchars($table).'"', E_USER_NOTICE);
+						if (TYPO3_DLOG) {
+
+							t3lib_div::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Prevented change of "index_name" for UID "'.$id.'" in table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_NOTICE, $fieldArray);
+
+						}
 
 					}
 
@@ -252,7 +236,7 @@
 	 */
 	public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj) {
 
-		if ($status == "update") {
+		if ($status == 'update') {
 
 			switch ($table) {
 
@@ -264,12 +248,12 @@
 
 						// Get Solr core.
 						$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-								'tx_dlf_solrcores.uid',
-								'tx_dlf_solrcores,tx_dlf_documents',
-								'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-								'',
-								'',
-								'1'
+							'tx_dlf_solrcores.uid',
+							'tx_dlf_solrcores,tx_dlf_documents',
+							'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+							'',
+							'',
+							'1'
 						);
 
 						if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -299,7 +283,11 @@
 
 								} else {
 
-									trigger_error('Failed to reindex document with UID '.$id, E_USER_WARNING);
+									if (TYPO3_DLOG) {
+
+										t3lib_div::devLog('[tx_dlf_tcemain->processDatamap_afterDatabaseOperations('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
+
+									}
 
 								}
 
@@ -336,12 +324,12 @@
 
 			// Get Solr core.
 			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-					'tx_dlf_solrcores.uid',
-					'tx_dlf_solrcores,tx_dlf_documents',
-					'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-					'',
-					'',
-					'1'
+				'tx_dlf_solrcores.uid',
+				'tx_dlf_solrcores,tx_dlf_documents',
+				'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+				'',
+				'',
+				'1'
 			);
 
 			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -380,7 +368,11 @@
 
 						} else {
 
-							trigger_error('Failed to reindex document with UID '.$id, E_USER_WARNING);
+							if (TYPO3_DLOG) {
+
+								t3lib_div::devLog('[tx_dlf_tcemain->processCmdmap_postProcess('.$command.', '.$table.', '.$id.', '.$value.', ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+
+							}
 
 						}
 
 
=== modified file 'dlf/locallang.xml'
--- dlf/locallang.xml	2012-08-09 10:31:57 +0000
+++ dlf/locallang.xml	2012-08-17 07:00:27 +0000
@@ -64,7 +64,6 @@
 			<label index="tx_dlf_metadata.tab3">Access</label>
 			<label index="tx_dlf_formats">Data Formats</label>
 			<label index="tx_dlf_formats.type">METS Name</label>
-			<label index="tx_dlf_formats.other_type">Is it @MDTYPE="OTHER" in METS?</label>
 			<label index="tx_dlf_formats.root">Root Element</label>
 			<label index="tx_dlf_formats.namespace">Namespace URI</label>
 			<label index="tx_dlf_formats.class">Class Name</label>
@@ -219,7 +218,6 @@
 			<label index="tx_dlf_metadata.tab3">Zugriff</label>
 			<label index="tx_dlf_formats">Datenformate</label>
 			<label index="tx_dlf_formats.type">Bezeichnung in METS</label>
-			<label index="tx_dlf_formats.other_type">@MDTYPE="OTHER" in METS?</label>
 			<label index="tx_dlf_formats.root">Root-Element</label>
 			<label index="tx_dlf_formats.namespace">Namensraum URI</label>
 			<label index="tx_dlf_formats.class">Klassenname</label>
 
=== modified file 'dlf/modules/indexing/index.php'
--- dlf/modules/indexing/index.php	2012-07-13 07:54:25 +0000
+++ dlf/modules/indexing/index.php	2012-08-17 07:00:27 +0000
@@ -70,7 +70,7 @@
 		$_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
 			'tx_dlf_solrcores',
-			'1=1'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+			'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
 			'',
 			'',
 			''
@@ -134,7 +134,7 @@
 		$_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
 			'tx_dlf_solrcores',
-			'1=1'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+			'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
 			'',
 			'',
 			''
 
=== modified file 'dlf/modules/newclient/index.php'
--- dlf/modules/newclient/index.php	2012-08-07 14:39:23 +0000
+++ dlf/modules/newclient/index.php	2012-08-17 07:00:27 +0000
@@ -127,6 +127,7 @@
 				'is_sortable' => $values['is_sortable'],
 				'is_facet' => $values['is_facet'],
 				'is_listed' => $values['is_listed'],
+				'autocomplete' => $value['autocomplete'],
 			);
 
 		}
 
=== modified file 'dlf/modules/newclient/metadata.inc.php'
--- dlf/modules/newclient/metadata.inc.php	2012-08-07 14:39:23 +0000
+++ dlf/modules/newclient/metadata.inc.php	2012-08-17 07:00:27 +0000
@@ -39,6 +39,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 0,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'record_id' => array (
 		'encoded' => 1,
@@ -53,6 +54,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 0,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'union_id' => array (
 		'encoded' => 1,
@@ -67,6 +69,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 0,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'opac_id' => array (
 		'encoded' => 1,
@@ -81,13 +84,14 @@
 		'is_sortable' => 0,
 		'is_facet' => 0,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'urn' => array (
 		'encoded' => 1,
 		'xpath' => './mods:identifier[@type="urn"]',
 		'xpath_sorting' => '',
 		'default_value' => '',
-		'wrap' => "key.wrap = <dt>|</dt>\nvalue.setContentToCurrent = 1\nvalue.required = 1\nvalue.typolink.parameter.current = 1\nvalue.typolink.parameter.prepend = TEXT\nvalue.typolink.parameter.prepend.value = http://nbn-resolving.de/\nvalue.wrap = <dd>|</dd>",
+		'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.typolink.parameter.prepend = TEXT\nvalue.typolink.parameter.prepend.value = http://nbn-resolving.de/\nvalue.wrap = <dd>|</dd>",
 		'tokenized' => 0,
 		'stored' => 0,
 		'indexed' => 1,
@@ -95,13 +99,14 @@
 		'is_sortable' => 0,
 		'is_facet' => 0,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'purl' => array (
 		'encoded' => 1,
 		'xpath' => './mods:identifier[@type="purl"]',
 		'xpath_sorting' => '',
 		'default_value' => '',
-		'wrap' => "key.wrap = <dt>|</dt>\nvalue.setContentToCurrent = 1\nvalue.required = 1\nvalue.typolink.parameter.current = 1\nvalue.wrap = <dd>|</dd>",
+		'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.wrap = <dd>|</dd>",
 		'tokenized' => 0,
 		'stored' => 0,
 		'indexed' => 0,
@@ -109,6 +114,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 0,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'owner' => array (
 		'encoded' => 1,
@@ -123,6 +129,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 1,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'collection' => array (
 		'encoded' => 1,
@@ -137,6 +144,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 1,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'language' => array (
 		'encoded' => 1,
@@ -151,6 +159,7 @@
 		'is_sortable' => 0,
 		'is_facet' => 1,
 		'is_listed' => 0,
+		'autocomplete' => 0,
 	),
 	'year' => array (
 		'encoded' => 1,
@@ -165,6 +174,7 @@
 		'is_sortable' => 1,
 		'is_facet' => 1,
 		'is_listed' => 1,
+		'autocomplete' => 0,
 	),
 	'place' => array (
 		'encoded' => 1,
@@ -179,6 +189,7 @@
 		'is_sortable' => 1,
 		'is_facet' => 1,
 		'is_listed' => 1,
+		'autocomplete' => 0,
 	),
 	'author' => array (
 		'encoded' => 1,
@@ -193,6 +204,7 @@
 		'is_sortable' => 1,
 		'is_facet' => 1,
 		'is_listed' => 1,
+		'autocomplete' => 1,
 	),
 	'volume' => array (
 		'encoded' => 1,
@@ -207,6 +219,7 @@
 		'is_sortable' => 1,
 		'is_facet' => 0,
 		'is_listed' => 1,
+		'autocomplete' => 0,
 	),
 	'title' => array (
 		'encoded' => 1,
@@ -221,13 +234,14 @@
 		'is_sortable' => 1,
 		'is_facet' => 0,
 		'is_listed' => 1,
+		'autocomplete' => 1,
 	),
 	'type' => array (
 		'encoded' => 0,
 		'xpath' => '',
 		'xpath_sorting' => '',
 		'default_value' => '',
-		'wrap' => "key.wrap = <dt class=\"tx-dlf-metadata-type\">|</dt>\nvalue.required = 1\nvalue.wrap = <dd class=\"tx-dlf-metadata-type\">|</dd>",
+		'wrap' => '',
 		'tokenized' => 0,
 		'stored' => 1,
 		'indexed' => 0,
@@ -235,6 +249,7 @@
 		'is_sortable' => 1,
 		'is_facet' => 1,
 		'is_listed' => 1,
+		'autocomplete' => 0,
 	)
 );
 
 
=== modified file 'dlf/plugins/collection/class.tx_dlf_collection.php'
--- dlf/plugins/collection/class.tx_dlf_collection.php	2012-08-07 14:42:49 +0000
+++ dlf/plugins/collection/class.tx_dlf_collection.php	2012-08-17 07:00:27 +0000
@@ -56,7 +56,11 @@
 		// Quit without doing anything if required configuration variables are not set.
 		if (empty($this->conf['pages'])) {
 
-			trigger_error('Incomplete configuration for plugin '.get_class($this), E_USER_NOTICE);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_collection->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+
+			}
 
 			return $content;
 
@@ -201,9 +205,9 @@
 				// Add feed link if applicable.
 				if (!empty($this->conf['targetFeed'])) {
 
-					$_img = '<img src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
+					$img = '<img src="'.t3lib_extMgm::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
 
-					$markerArray[$resArray['uid']]['###FEED###'] = $this->pi_linkTP($_img, array ($this->prefixId => array ('collection' => $resArray['uid'])), FALSE, $this->conf['targetFeed']);
+					$markerArray[$resArray['uid']]['###FEED###'] = $this->pi_linkTP($img, array ($this->prefixId => array ('collection' => $resArray['uid'])), FALSE, $this->conf['targetFeed']);
 
 				} else {
 
@@ -215,21 +219,21 @@
 				$markerArray[$resArray['uid']]['###DESCRIPTION###'] = $this->pi_RTEcssText($resArray['description']);
 
 				// Build statistic's output.
-				$_labelTitles = $this->pi_getLL(($resArray['titles'] > 1 ? 'titles' : 'title'), '', FALSE);
-
-				$markerArray[$resArray['uid']]['###COUNT_TITLES###'] = htmlspecialchars($resArray['titles'].$_labelTitles);
-
-				$_labelVolumes = $this->pi_getLL(($volumes[$resArray['uid']] > 1 ? 'volumes' : 'volume'), '', FALSE);
-
-				$markerArray[$resArray['uid']]['###COUNT_VOLUMES###'] = htmlspecialchars($volumes[$resArray['uid']].$_labelVolumes);
+				$labelTitles = $this->pi_getLL(($resArray['titles'] > 1 ? 'titles' : 'title'), '', FALSE);
+
+				$markerArray[$resArray['uid']]['###COUNT_TITLES###'] = htmlspecialchars($resArray['titles'].$labelTitles);
+
+				$labelVolumes = $this->pi_getLL(($volumes[$resArray['uid']] > 1 ? 'volumes' : 'volume'), '', FALSE);
+
+				$markerArray[$resArray['uid']]['###COUNT_VOLUMES###'] = htmlspecialchars($volumes[$resArray['uid']].$labelVolumes);
 
 			}
 
 			$entry = $this->cObj->getSubpart($this->template, '###ENTRY###');
 
-			foreach ($markerArray as $_markerArray) {
+			foreach ($markerArray as $marker) {
 
-				$content .= $this->cObj->substituteMarkerArray($entry, $_markerArray);
+				$content .= $this->cObj->substituteMarkerArray($entry, $marker);
 
 			}
 
@@ -271,9 +275,9 @@
 		// Process results.
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			if (empty($_metadata)) {
+			if (empty($listMetadata)) {
 
-				$_metadata = array (
+				$listMetadata = array (
 					'label' => htmlspecialchars($resArray['collLabel']),
 					'description' => $this->pi_RTEcssText($resArray['collDesc']),
 					'options' => array (
@@ -379,7 +383,7 @@
 
 		$list->add(array_values($toplevel));
 
-		$list->metadata = $_metadata;
+		$list->metadata = $listMetadata;
 
 		$list->save();
 
 
=== modified file 'dlf/plugins/feeds/class.tx_dlf_feeds.php'
--- dlf/plugins/feeds/class.tx_dlf_feeds.php	2012-03-24 09:05:28 +0000
+++ dlf/plugins/feeds/class.tx_dlf_feeds.php	2012-08-17 07:00:27 +0000
@@ -77,7 +77,7 @@
 
 		}
 
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_libraries.label AS label',
 			'tx_dlf_libraries',
 			'tx_dlf_libraries.pid='.intval($this->conf['pages']).' AND tx_dlf_libraries.uid='.intval($this->conf['library']).tx_dlf_helper::whereClause('tx_dlf_libraries'),
@@ -86,11 +86,11 @@
 			'1'
 		);
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($_result)) {
-
-			$_resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result);
-
-			$channel->appendChild($rss->createElement('copyright', htmlspecialchars($_resArray['label'], ENT_NOQUOTES, 'UTF-8')));
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+
+			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+
+			$channel->appendChild($rss->createElement('copyright', htmlspecialchars($resArray['label'], ENT_NOQUOTES, 'UTF-8')));
 
 		}
 
 
=== modified file 'dlf/plugins/listview/class.tx_dlf_listview.php'
--- dlf/plugins/listview/class.tx_dlf_listview.php	2012-08-07 15:30:34 +0000
+++ dlf/plugins/listview/class.tx_dlf_listview.php	2012-08-17 07:00:27 +0000
@@ -162,71 +162,71 @@
 
 		$element = $this->list->elements[$number];
 
-		foreach ($this->metadata as $_index_name => $_metaConf) {
-
-			$value = '';
-
-			$fieldwrap = $this->parseTS($_metaConf['wrap']);
+		foreach ($this->metadata as $index_name => $metaConf) {
+
+			$parsedValue = '';
+
+			$fieldwrap = $this->parseTS($metaConf['wrap']);
 
 			do {
 
-				$_value = @array_shift($element['metadata'][$_index_name]);
+				$value = @array_shift($element['metadata'][$index_name]);
 
 				// Link title to pageview.
-				if ($_index_name == 'title') {
+				if ($index_name == 'title') {
 
 					// Get title of parent document if needed.
-					if (empty($_value) && $this->conf['getTitle']) {
+					if (empty($value) && $this->conf['getTitle']) {
 
-						$_value = '['.tx_dlf_document::getTitle($element['uid'], TRUE).']';
+						$value = '['.tx_dlf_document::getTitle($element['uid'], TRUE).']';
 
 					}
 
 					// Set fake title if still not present.
-					if (empty($_value)) {
+					if (empty($value)) {
 
-						$_value = $this->pi_getLL('noTitle');
+						$value = $this->pi_getLL('noTitle');
 
 					}
 
-					$_value = $this->pi_linkTP(htmlspecialchars($_value), array ($this->prefixId => array ('id' => $this->list->elements[$number]['uid'], 'page' => $element['page'], 'pointer' => $this->piVars['pointer'])), TRUE, $this->conf['targetPid']);
+					$value = $this->pi_linkTP(htmlspecialchars($value), array ($this->prefixId => array ('id' => $this->list->elements[$number]['uid'], 'page' => $element['page'], 'pointer' => $this->piVars['pointer'])), TRUE, $this->conf['targetPid']);
 
 				// Translate name of holding library.
-				} elseif ($_index_name == 'owner' && !empty($_value)) {
+				} elseif ($index_name == 'owner' && !empty($value)) {
 
-					$_value = htmlspecialchars(tx_dlf_helper::translate($_value, 'tx_dlf_libraries', $this->conf['pages']));
+					$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
 
 				// Translate document type.
-				} elseif ($_index_name == 'type' && !empty($_value)) {
+				} elseif ($index_name == 'type' && !empty($value)) {
 
-					$_value = htmlspecialchars(tx_dlf_helper::translate($_value, 'tx_dlf_structures', $this->conf['pages']));
+					$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
 
 				// Translate ISO 639 language code.
-				} elseif ($_index_name == 'language' && !empty($_value)) {
-
-					$_value = htmlspecialchars(tx_dlf_helper::getLanguageName($_value));
-
-				} elseif (!empty($_value)) {
-
-					$_value = htmlspecialchars($_value);
-
-				}
-
-				$_value = $this->cObj->stdWrap($_value, $fieldwrap['value.']);
-
-				if (!empty($_value)) {
-
-					$value .= $_value;
-
-				}
-
-			} while (count($element['metadata'][$_index_name]));
-
-			if (!empty($value)) {
-
-				$field = $this->cObj->stdWrap(htmlspecialchars($_metaConf['label']), $fieldwrap['key.']);
-
-				$field .= $value;
+				} elseif ($index_name == 'language' && !empty($value)) {
+
+					$value = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
+
+				} elseif (!empty($value)) {
+
+					$value = htmlspecialchars($value);
+
+				}
+
+				$value = $this->cObj->stdWrap($value, $fieldwrap['value.']);
+
+				if (!empty($value)) {
+
+					$parsedValue .= $value;
+
+				}
+
+			} while (count($element['metadata'][$index_name]));
+
+			if (!empty($parsedValue)) {
+
+				$field = $this->cObj->stdWrap(htmlspecialchars($metaConf['label']), $fieldwrap['key.']);
+
+				$field .= $parsedValue;
 
 				$markerArray['###METADATA###'] .= $this->cObj->stdWrap($field, $fieldwrap['all.']);
 
@@ -276,13 +276,20 @@
 
 		}
 
-		$_uniqId = uniqid($prefix.'-');
-
-		$sorting .= '<label for="'.$_uniqId.'">'.$this->pi_getLL('orderBy', '', TRUE).'</label><select id="'.$_uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();"><option value=""></option>';
+		$uniqId = uniqid($prefix.'-');
+
+		$sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('orderBy', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();">';
+
+		// Add relevance sorting if this is a search result list.
+		if ($this->list->metadata['options']['source'] == 'search') {
+
+			$sorting .= '<option value="relevance"'.(($this->list->metadata['options']['order'] == 'relevance') ? ' selected="selected"' : '').'>'.$this->pi_getLL('relevance', '', TRUE).'</option>';
+
+		}
 
 		foreach ($this->sortables as $index_name => $label) {
 
-			$sorting .= '<option value="'.$index_name.'"'.(($this->piVars['order'] == $index_name) ? ' selected="selected"' : '').'>'.htmlspecialchars($label).'</option>';
+			$sorting .= '<option value="'.$index_name.'"'.(($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '').'>'.htmlspecialchars($label).'</option>';
 
 		}
 
@@ -310,71 +317,71 @@
 
 			$markerArray['###SUBMETADATA###'] = '';
 
-			foreach ($this->metadata as $_index_name => $_metaConf) {
-
-				$value = '';
-
-				$fieldwrap = $this->parseTS($_metaConf['wrap']);
+			foreach ($this->metadata as $index_name => $metaConf) {
+
+				$parsedValue = '';
+
+				$fieldwrap = $this->parseTS($metaConf['wrap']);
 
 				do {
 
-					$_value = @array_shift($subpart['metadata'][$_index_name]);
+					$value = @array_shift($subpart['metadata'][$index_name]);
 
 					// Link title to pageview.
-					if ($_index_name == 'title') {
+					if ($index_name == 'title') {
 
 						// Get title of parent document if needed.
-						if (empty($_value) && $this->conf['getTitle']) {
+						if (empty($value) && $this->conf['getTitle']) {
 
-							$_value = '['.tx_dlf_document::getTitle($subpart['uid'], TRUE).']';
+							$value = '['.tx_dlf_document::getTitle($subpart['uid'], TRUE).']';
 
 						}
 
 						// Set fake title if still not present.
-						if (empty($_value)) {
+						if (empty($value)) {
 
-							$_value = $this->pi_getLL('noTitle');
+							$value = $this->pi_getLL('noTitle');
 
 						}
 
-						$_value = $this->pi_linkTP(htmlspecialchars($_value), array ($this->prefixId => array ('id' => $subpart['uid'], 'page' => $subpart['page'], 'pointer' => $this->piVars['pointer'])), TRUE, $this->conf['targetPid']);
+						$value = $this->pi_linkTP(htmlspecialchars($value), array ($this->prefixId => array ('id' => $subpart['uid'], 'page' => $subpart['page'], 'pointer' => $this->piVars['pointer'])), TRUE, $this->conf['targetPid']);
 
 					// Translate name of holding library.
-					} elseif ($_index_name == 'owner' && !empty($_value)) {
+					} elseif ($index_name == 'owner' && !empty($value)) {
 
-						$_value = htmlspecialchars(tx_dlf_helper::translate($_value, 'tx_dlf_libraries', $this->conf['pages']));
+						$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
 
 					// Translate document type.
-					} elseif ($_index_name == 'type' && !empty($_value)) {
+					} elseif ($index_name == 'type' && !empty($value)) {
 
-						$_value = $this->pi_getLL($_value, tx_dlf_helper::translate($_value, 'tx_dlf_structures', $this->conf['pages']), FALSE);
+						$value = $this->pi_getLL($value, tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']), FALSE);
 
 					// Translate ISO 639 language code.
-					} elseif ($_index_name == 'language' && !empty($_value)) {
-
-						$_value = htmlspecialchars(tx_dlf_helper::getLanguageName($_value));
-
-					} elseif (!empty($_value)) {
-
-						$_value = htmlspecialchars($_value);
-
-					}
-
-					$_value = $this->cObj->stdWrap($_value, $fieldwrap['value.']);
-
-					if (!empty($_value)) {
-
-						$value .= $_value;
-
-					}
-
-				} while (count($subpart['metadata'][$_index_name]));
-
-				if (!empty($value)) {
-
-					$field = $this->cObj->stdWrap(htmlspecialchars($_metaConf['label']), $fieldwrap['key.']);
-
-					$field .= $value;
+					} elseif ($index_name == 'language' && !empty($value)) {
+
+						$value = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
+
+					} elseif (!empty($value)) {
+
+						$value = htmlspecialchars($value);
+
+					}
+
+					$value = $this->cObj->stdWrap($value, $fieldwrap['value.']);
+
+					if (!empty($value)) {
+
+						$parsedValue .= $value;
+
+					}
+
+				} while (count($subpart['metadata'][$index_name]));
+
+				if (!empty($parsedValue)) {
+
+					$field = $this->cObj->stdWrap(htmlspecialchars($metaConf['label']), $fieldwrap['key.']);
+
+					$field .= $parsedValue;
 
 					$markerArray['###SUBMETADATA###'] .= $this->cObj->stdWrap($field, $fieldwrap['all.']);
 
@@ -399,7 +406,7 @@
 	 */
 	protected function loadConfig() {
 
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.wrap AS wrap,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.is_sortable AS is_sortable',
 			'tx_dlf_metadata',
 			'(tx_dlf_metadata.is_listed=1 OR tx_dlf_metadata.is_sortable=1) AND tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
@@ -408,7 +415,7 @@
 			''
 		);
 
-		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 			if ($resArray['is_listed']) {
 
@@ -456,11 +463,11 @@
 			$this->list->sort($this->piVars['order'], TRUE);
 
 			// Update list's metadata.
-			$_metadata = $this->list->metadata;
-
-			$_metadata['options']['order'] = $this->piVars['order'];
-
-			$this->list->metadata = $_metadata;
+			$listMetadata = $this->list->metadata;
+
+			$listMetadata['options']['order'] = $this->piVars['order'];
+
+			$this->list->metadata = $listMetadata;
 
 			// Save updated list.
 			$this->list->save();
 
=== modified file 'dlf/plugins/listview/locallang.xml'
--- dlf/plugins/listview/locallang.xml	2011-11-10 16:20:57 +0000
+++ dlf/plugins/listview/locallang.xml	2012-08-17 07:00:27 +0000
@@ -19,6 +19,7 @@
 			<label index="separator"> - </label>
 			<label index="skip">...</label>
 			<label index="orderBy">Order by: </label>
+			<label index="relevance">relevance</label>
 			<label index="noTitle">[no title]</label>
 		</languageKey>
 		<languageKey index="de" type="array">
@@ -35,6 +36,7 @@
 			<label index="separator"> - </label>
 			<label index="skip">...</label>
 			<label index="orderBy">Sortieren nach: </label>
+			<label index="relevance">Relevanz</label>
 			<label index="noTitle">[kein Titel]</label>
 		</languageKey>
 	</data>
 
=== modified file 'dlf/plugins/metadata/class.tx_dlf_metadata.php'
--- dlf/plugins/metadata/class.tx_dlf_metadata.php	2012-08-07 15:15:45 +0000
+++ dlf/plugins/metadata/class.tx_dlf_metadata.php	2012-08-17 07:00:27 +0000
@@ -68,36 +68,36 @@
 		if ($this->conf['rootline'] < 2) {
 
 			// Get current structure's @ID.
-			$_ids = array ();
+			$ids = array ();
 
 			if (!empty($this->doc->physicalPages[$this->piVars['page']]) && !empty($this->doc->smLinks['p2l'][$this->doc->physicalPages[$this->piVars['page']]])) {
 
-				foreach ($this->doc->smLinks['p2l'][$this->doc->physicalPages[$this->piVars['page']]] as $_logId) {
-
-					$_count = count($this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$_logId.'"]/ancestor::*'));
-
-					$_ids[$_count][] = $_logId;
+				foreach ($this->doc->smLinks['p2l'][$this->doc->physicalPages[$this->piVars['page']]] as $logId) {
+
+					$count = count($this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$logId.'"]/ancestor::*'));
+
+					$ids[$count][] = $logId;
 
 				}
 
 			}
 
-			ksort($_ids);
+			ksort($ids);
 
-			reset($_ids);
+			reset($ids);
 
 			// Check if we should display all metadata up to the root.
 			if ($this->conf['rootline'] == 1) {
 
-				foreach ($_ids as $_id) {
-
-					foreach ($_id as $id) {
-
-						$_data = $this->doc->getMetadata($id, $this->conf['pages']);
-
-						$_data['_id'] = $id;
-
-						$metadata[] = $_data;
+				foreach ($ids as $id) {
+
+					foreach ($id as $sid) {
+
+						$data = $this->doc->getMetadata($sid, $this->conf['pages']);
+
+						$data['_id'] = $sid;
+
+						$metadata[] = $data;
 
 					}
 
@@ -105,17 +105,17 @@
 
 			} else {
 
-				$_id = array_pop($_ids);
-
-				if (is_array($_id)) {
-
-					foreach ($_id as $id) {
-
-						$_data = $this->doc->getMetadata($id, $this->conf['pages']);
-
-						$_data['_id'] = $id;
-
-						$metadata[] = $_data;
+				$id = array_pop($ids);
+
+				if (is_array($id)) {
+
+					foreach ($id as $sid) {
+
+						$data = $this->doc->getMetadata($sid, $this->conf['pages']);
+
+						$data['_id'] = $sid;
+
+						$metadata[] = $data;
 
 					}
 
@@ -128,17 +128,21 @@
 		// Get titledata?
 		if (empty($metadata)) {
 
-			$_data = $this->doc->getTitleData($this->conf['pages']);
-
-			$_data['_id'] = '';
-
-			$metadata[] = $_data;
+			$data = $this->doc->getTitleData($this->conf['pages']);
+
+			$data['_id'] = $this->doc->toplevelId;
+
+			$metadata[] = $data;
 
 		}
 
 		if (empty($metadata)) {
 
-			trigger_error('No metadata found', E_USER_WARNING);
+			if (TYPO3_DLOG) {
+
+				t3lib_div::devLog('[tx_dlf_metadata->main('.$content.', [data])] No metadata found for document with UID "'.$this->doc->uid.'"', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+
+			}
 
 			return $content;
 
@@ -157,11 +161,11 @@
 	 *
 	 * @access	protected
 	 *
-	 * @param	array		$metadata: The metadata array
+	 * @param	array		$metadataArray: The metadata array
 	 *
 	 * @return	string		The metadata array ready for output
 	 */
-	protected function printMetadata(array $metadata) {
+	protected function printMetadata(array $metadataArray) {
 
 		// Load template file.
 		if (!empty($this->conf['templateFile'])) {
@@ -181,7 +185,7 @@
 		// Get list of metadata to show.
 		$metaList = array ();
 
-		$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.wrap AS wrap',
 			'tx_dlf_metadata',
 			'tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
@@ -190,7 +194,7 @@
 			''
 		);
 
-		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 			if ($this->conf['showFull'] || $resArray['is_listed']) {
 
@@ -207,7 +211,7 @@
 		$cObjData = $this->cObj->data;
 
 		// Parse the metadata arrays.
-		foreach ($metadata as $_metadata) {
+		foreach ($metadataArray as $metadata) {
 
 			$markerArray['###METADATA###'] = '';
 
@@ -215,92 +219,92 @@
 			$this->cObj->data = $cObjData;
 
 			// Load all the metadata values into the content object's data array.
-			foreach ($_metadata as $_index_name => $_value) {
-
-				if (is_array($_value)) {
-
-					$this->cObj->data[$_index_name] = implode($this->conf['separator'], $_value);
+			foreach ($metadata as $index_name => $value) {
+
+				if (is_array($value)) {
+
+					$this->cObj->data[$index_name] = implode($this->conf['separator'], $value);
 
 				} else {
 
-					$this->cObj->data[$_index_name] = $_value;
+					$this->cObj->data[$index_name] = $value;
 
 				}
 
 			}
 
 			// Process each metadate.
-			foreach ($metaList as $_index_name => $_metaConf) {
-
-				$value = '';
-
-				$fieldwrap = $this->parseTS($_metaConf['wrap']);
+			foreach ($metaList as $index_name => $metaConf) {
+
+				$parsedValue = '';
+
+				$fieldwrap = $this->parseTS($metaConf['wrap']);
 
 				do {
 
-					$_value = @array_shift($_metadata[$_index_name]);
+					$value = @array_shift($metadata[$index_name]);
 
-					if ($_index_name == 'title') {
+					if ($index_name == 'title') {
 
 						// Get title of parent document if needed.
-						if (empty($_value) && $this->conf['getTitle'] && $this->doc->parentid) {
+						if (empty($value) && $this->conf['getTitle'] && $this->doc->parentid) {
 
-							$_value = '['.tx_dlf_document::getTitle($this->doc->parentid, TRUE).']';
+							$value = '['.tx_dlf_document::getTitle($this->doc->parentid, TRUE).']';
 
 						}
 
-						if (!empty($_value)) {
+						if (!empty($value)) {
 
-							$_value = htmlspecialchars($_value);
+							$value = htmlspecialchars($value);
 
 							// Link title to pageview.
-							if ($this->conf['linkTitle'] && $_metadata['_id']) {
-
-								$details = $this->doc->getLogicalStructure($_metadata['_id']);
-
-								$_value = $this->pi_linkTP(htmlspecialchars($_value), array ($this->prefixId => array ('id' => $this->doc->uid, 'page' => (!empty($details['points']) ? intval($details['points']) : 1))), TRUE, $this->conf['targetPid']);
+							if ($this->conf['linkTitle'] && $metadata['_id']) {
+
+								$details = $this->doc->getLogicalStructure($metadata['_id']);
+
+								$value = $this->pi_linkTP(htmlspecialchars($value), array ($this->prefixId => array ('id' => $this->doc->uid, 'page' => (!empty($details['points']) ? intval($details['points']) : 1))), TRUE, $this->conf['targetPid']);
 
 							}
 
 						}
 
-					} elseif ($_index_name == 'owner' && !empty($_value)) {
+					} elseif ($index_name == 'owner' && !empty($value)) {
 
 						// Translate name of holding library.
-						$_value = htmlspecialchars(tx_dlf_helper::translate($_value, 'tx_dlf_libraries', $this->conf['pages']));
+						$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
 
-					} elseif ($_index_name == 'type' && !empty($_value)) {
+					} elseif ($index_name == 'type' && !empty($value)) {
 
 						// Translate document type.
-						$_value = htmlspecialchars(tx_dlf_helper::translate($_value, 'tx_dlf_structures', $this->conf['pages']));
+						$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
 
-					} elseif ($_index_name == 'language' && !empty($_value)) {
+					} elseif ($index_name == 'language' && !empty($value)) {
 
 						// Translate ISO 639 language code.
-						$_value = htmlspecialchars(tx_dlf_helper::getLanguageName($_value));
+						$value = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
 
-					} elseif (!empty($_value)) {
+					} elseif (!empty($value)) {
 
 						// Sanitize value for output.
-						$_value = htmlspecialchars($_value);
-
-					}
-
-					$_value = $this->cObj->stdWrap($_value, $fieldwrap['value.']);
-
-					if (!empty($_value)) {
-
-						$value .= $_value;