kitodo / kitodo-presentation

dlf/common/class.tx_dlf_solr.php

Indentation +514 added lines, -514 removed lines

@@ -20,711 +20,711 @@
  */
 class tx_dlf_solr {
 
-	/**
-	 * This holds the core name
-	 *
-	 * @var	string
-	 * @access protected
-	 */
-	protected $core = '';
-
-	/**
-	 * This holds the PID for the configuration
-	 *
-	 * @var	integer
-	 * @access protected
-	 */
-	protected $cPid = 0;
-
-	/**
-	 * The extension key
-	 *
-	 * @var	string
-	 * @access public
-	 */
-	public static $extKey = 'dlf';
-
-	/**
-	 * This holds the max results
-	 *
-	 * @var	integer
-	 * @access protected
-	 */
-	protected $limit = 50000;
-
-	/**
-	 * This holds the number of hits for last search
-	 *
-	 * @var	integer
-	 * @access protected
-	 */
-	protected $numberOfHits = 0;
-
-	/**
-	 * This holds the additional query parameters
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $params = array ();
-
-	/**
-	 * Is the search instantiated successfully?
-	 *
-	 * @var	boolean
-	 * @access protected
-	 */
-	protected $ready = FALSE;
-
-	/**
-	 * This holds the singleton search objects with their core as array key
-	 *
-	 * @var	array(tx_dlf_solr)
-	 * @access protected
-	 */
-	protected static $registry = array ();
-
-	/**
-	 * This holds the Solr service object
-	 *
-	 * @var	Apache_Solr_Service
-	 * @access protected
-	 */
-	protected $service;
-
-	/**
-	 * Escape all special characters in a query string
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$query: The query string
-	 *
-	 * @return	string		The escaped query string
-	 */
-	public static function escapeQuery($query) {
-
-		// Load class.
-		if (!class_exists('Apache_Solr_Service')) {
-
-			require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Service.php'));
-
-		}
-
-		// Escape query phrase or term.
-		if (preg_match('/^".*"$/', $query)) {
-
-			return '"'.Apache_Solr_Service::escapePhrase(trim($query, '"')).'"';
+    /**
+     * This holds the core name
+     *
+     * @var	string
+     * @access protected
+     */
+    protected $core = '';
+
+    /**
+     * This holds the PID for the configuration
+     *
+     * @var	integer
+     * @access protected
+     */
+    protected $cPid = 0;
+
+    /**
+     * The extension key
+     *
+     * @var	string
+     * @access public
+     */
+    public static $extKey = 'dlf';
+
+    /**
+     * This holds the max results
+     *
+     * @var	integer
+     * @access protected
+     */
+    protected $limit = 50000;
+
+    /**
+     * This holds the number of hits for last search
+     *
+     * @var	integer
+     * @access protected
+     */
+    protected $numberOfHits = 0;
+
+    /**
+     * This holds the additional query parameters
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $params = array ();
+
+    /**
+     * Is the search instantiated successfully?
+     *
+     * @var	boolean
+     * @access protected
+     */
+    protected $ready = FALSE;
+
+    /**
+     * This holds the singleton search objects with their core as array key
+     *
+     * @var	array(tx_dlf_solr)
+     * @access protected
+     */
+    protected static $registry = array ();
+
+    /**
+     * This holds the Solr service object
+     *
+     * @var	Apache_Solr_Service
+     * @access protected
+     */
+    protected $service;
+
+    /**
+     * Escape all special characters in a query string
+     *
+     * @access	public
+     *
+     * @param	string		$query: The query string
+     *
+     * @return	string		The escaped query string
+     */
+    public static function escapeQuery($query) {
+
+        // Load class.
+        if (!class_exists('Apache_Solr_Service')) {
+
+            require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Service.php'));
+
+        }
+
+        // Escape query phrase or term.
+        if (preg_match('/^".*"$/', $query)) {
+
+            return '"'.Apache_Solr_Service::escapePhrase(trim($query, '"')).'"';
 
-		} else {
+        } else {
 
-			return Apache_Solr_Service::escape($query);
+            return Apache_Solr_Service::escape($query);
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Escape all special characters in a query string while retaining valid field queries
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$query: The query string
-	 * @param	integer		$pid: The PID for the field configuration
-	 *
-	 * @return	string		The escaped query string
-	 */
-	public static function escapeQueryKeepField($query, $pid) {
+    /**
+     * Escape all special characters in a query string while retaining valid field queries
+     *
+     * @access	public
+     *
+     * @param	string		$query: The query string
+     * @param	integer		$pid: The PID for the field configuration
+     *
+     * @return	string		The escaped query string
+     */
+    public static function escapeQueryKeepField($query, $pid) {
 
-		// Is there a field query?
-		if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(.*\)$/', $query)) {
+        // Is there a field query?
+        if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(.*\)$/', $query)) {
 
-			// Get all indexed fields.
-			$fields = array();
+            // Get all indexed fields.
+            $fields = array();
 
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'tx_dlf_metadata.index_name,tx_dlf_metadata.index_tokenized,tx_dlf_metadata.index_stored',
-				'tx_dlf_metadata',
-				'tx_dlf_metadata.index_indexed=1 AND tx_dlf_metadata.pid=' . intval($pid) . ' AND (tx_dlf_metadata.sys_language_uid IN (-1,0) OR tx_dlf_metadata.l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
-				'',
-				'',
-				''
-			);
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'tx_dlf_metadata.index_name,tx_dlf_metadata.index_tokenized,tx_dlf_metadata.index_stored',
+                'tx_dlf_metadata',
+                'tx_dlf_metadata.index_indexed=1 AND tx_dlf_metadata.pid=' . intval($pid) . ' AND (tx_dlf_metadata.sys_language_uid IN (-1,0) OR tx_dlf_metadata.l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                '',
+                '',
+                ''
+            );
 
-			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_row($result)) {
+                while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-					$fields[] = $resArray[0].'_'.($resArray[1] ? 't' : 'u').($resArray[2] ? 's' : 'u').'i';
+                    $fields[] = $resArray[0].'_'.($resArray[1] ? 't' : 'u').($resArray[2] ? 's' : 'u').'i';
 
-				}
+                }
 
-			}
+            }
 
-			// Check if queried field is valid.
-			$splitQuery = explode(':', $query, 2);
+            // Check if queried field is valid.
+            $splitQuery = explode(':', $query, 2);
 
-			if (in_array($splitQuery[0], $fields)) {
+            if (in_array($splitQuery[0], $fields)) {
 
-				$query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
+                $query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
 
-			} else {
+            } else {
 
-				$query = self::escapeQuery($query);
+                $query = self::escapeQuery($query);
 
-			}
+            }
 
-		} elseif (!empty($query) && $query !== '*') {
+        } elseif (!empty($query) && $query !== '*') {
 
-			// Don't escape plain asterisk search.
-			$query = self::escapeQuery($query);
+            // Don't escape plain asterisk search.
+            $query = self::escapeQuery($query);
 
-		}
+        }
 
-		return $query;
+        return $query;
 
-	}
+    }
 
-	/**
-	 * This is a singleton class, thus instances must be created by this method
-	 *
-	 * @access	public
-	 *
-	 * @param	mixed		$core: Name or UID of the core to load
-	 *
-	 * @return	tx_dlf_solr		Instance of this class
-	 */
-	public static function getInstance($core) {
+    /**
+     * This is a singleton class, thus instances must be created by this method
+     *
+     * @access	public
+     *
+     * @param	mixed		$core: Name or UID of the core to load
+     *
+     * @return	tx_dlf_solr		Instance of this class
+     */
+    public static function getInstance($core) {
 
-		// Save parameter for logging purposes.
-		$_core = $core;
+        // Save parameter for logging purposes.
+        $_core = $core;
 
-		// Get core name if UID is given.
-		if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($core)) {
+        // Get core name if UID is given.
+        if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($core)) {
 
-			$core = tx_dlf_helper::getIndexName($core, 'tx_dlf_solrcores');
+            $core = tx_dlf_helper::getIndexName($core, 'tx_dlf_solrcores');
 
-		}
+        }
 
-		// Check if core is set.
-		if (empty($core)) {
+        // Check if core is set.
+        if (empty($core)) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance('.$_core.')] Invalid core name "'.$core.'" for Apache Solr', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance('.$_core.')] Invalid core name "'.$core.'" for Apache Solr', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-		// Check if there is an instance in the registry already.
-		if (is_object(self::$registry[$core]) && self::$registry[$core] instanceof self) {
+        // Check if there is an instance in the registry already.
+        if (is_object(self::$registry[$core]) && self::$registry[$core] instanceof self) {
 
-			// Return singleton instance if available.
-			return self::$registry[$core];
+            // Return singleton instance if available.
+            return self::$registry[$core];
 
-		}
+        }
 
-		// Create new instance...
-		$instance = new self($core);
+        // Create new instance...
+        $instance = new self($core);
 
-		// ...and save it to registry.
-		if ($instance->ready) {
+        // ...and save it to registry.
+        if ($instance->ready) {
 
-			self::$registry[$core] = $instance;
+            self::$registry[$core] = $instance;
 
-			// Return new instance.
-			return $instance;
+            // Return new instance.
+            return $instance;
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance('.$_core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance('.$_core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Returns the connection information a specific Solr core
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$core: Name of the core to load
-	 *
-	 * @return	string		The connection parameters for a specific Solr core
-	 */
-	public static function getSolrConnectionInfo($core = '') {
+    /**
+     * Returns the connection information a specific Solr core
+     *
+     * @access	public
+     *
+     * @param	string		$core: Name of the core to load
+     *
+     * @return	string		The connection parameters for a specific Solr core
+     */
+    public static function getSolrConnectionInfo($core = '') {
 
-		$solrInfo = array ();
+        $solrInfo = array ();
 
-		// Extract extension configuration.
-		$conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
+        // Extract extension configuration.
+        $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
-		// Derive Solr host name.
-		$solrInfo['host'] = ($conf['solrHost'] ? $conf['solrHost'] : '127.0.0.1');
+        // Derive Solr host name.
+        $solrInfo['host'] = ($conf['solrHost'] ? $conf['solrHost'] : '127.0.0.1');
 
-		// Prepend username and password to hostname.
-		if ($conf['solrUser'] && $conf['solrPass']) {
+        // Prepend username and password to hostname.
+        if ($conf['solrUser'] && $conf['solrPass']) {
 
-			$solrInfo['host'] = $conf['solrUser'].':'.$conf['solrPass'].'@'.$solrInfo['host'];
+            $solrInfo['host'] = $conf['solrUser'].':'.$conf['solrPass'].'@'.$solrInfo['host'];
 
-		}
+        }
 
-		// Set port if not set.
-		$solrInfo['port'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrPort'], 1, 65535, 8180);
+        // Set port if not set.
+        $solrInfo['port'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrPort'], 1, 65535, 8180);
 
-		// Append core name to path.
-		$solrInfo['path'] = trim($conf['solrPath'], '/').'/'.$core;
+        // Append core name to path.
+        $solrInfo['path'] = trim($conf['solrPath'], '/').'/'.$core;
 
-		return $solrInfo;
+        return $solrInfo;
 
-	}
+    }
 
-	/**
-	 * Returns the request URL for a specific Solr core
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$core: Name of the core to load
-	 *
-	 * @return	string		The request URL for a specific Solr core
-	 */
-	public static function getSolrUrl($core = '') {
+    /**
+     * Returns the request URL for a specific Solr core
+     *
+     * @access	public
+     *
+     * @param	string		$core: Name of the core to load
+     *
+     * @return	string		The request URL for a specific Solr core
+     */
+    public static function getSolrUrl($core = '') {
 
-		// Get Solr connection information.
-		$solrInfo = self::getSolrConnectionInfo($core);
+        // Get Solr connection information.
+        $solrInfo = self::getSolrConnectionInfo($core);
 
-		// Return entire request URL.
-		return 'http://'.$solrInfo['host'].':'.$solrInfo['port'].'/'.$solrInfo['path'];
+        // Return entire request URL.
+        return 'http://'.$solrInfo['host'].':'.$solrInfo['port'].'/'.$solrInfo['path'];
 
-	}
+    }
 
-	/**
-	 * Get next unused Solr core number
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$start: Number to start with
-	 *
-	 * @return	integer		First unused core number found
-	 */
-	public static function solrGetCoreNumber($start = 0) {
+    /**
+     * Get next unused Solr core number
+     *
+     * @access	public
+     *
+     * @param	integer		$start: Number to start with
+     *
+     * @return	integer		First unused core number found
+     */
+    public static function solrGetCoreNumber($start = 0) {
 
-		$start = max(intval($start), 0);
+        $start = max(intval($start), 0);
 
-		// Check if core already exists.
-		if (self::getInstance('dlfCore'.$start) === NULL) {
+        // Check if core already exists.
+        if (self::getInstance('dlfCore'.$start) === NULL) {
 
-			return $start;
+            return $start;
 
-		} else {
+        } else {
 
-			return self::solrGetCoreNumber($start + 1);
+            return self::solrGetCoreNumber($start + 1);
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Processes a search request.
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$query: The search query
-	 *
-	 * @return	tx_dlf_list		The result list
-	 */
-	public function search($query = '') {
+    /**
+     * Processes a search request.
+     *
+     * @access	public
+     *
+     * @param	string		$query: The search query
+     *
+     * @return	tx_dlf_list		The result list
+     */
+    public function search($query = '') {
 
-		// Perform search.
-		$results = $this->service->search((string) $query, 0, $this->limit, $this->params);
+        // Perform search.
+        $results = $this->service->search((string) $query, 0, $this->limit, $this->params);
 
-		$this->numberOfHits = count($results->response->docs);
+        $this->numberOfHits = count($results->response->docs);
 
-		$toplevel = array ();
+        $toplevel = array ();
 
-		$checks = array ();
+        $checks = array ();
 
-		// Get metadata configuration.
-		if ($this->numberOfHits > 0) {
+        // Get metadata configuration.
+        if ($this->numberOfHits > 0) {
 
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'tx_dlf_metadata.index_name AS index_name',
-				'tx_dlf_metadata',
-				'tx_dlf_metadata.is_sortable=1 AND tx_dlf_metadata.pid='.intval($this->cPid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
-				'',
-				'',
-				''
-			);
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'tx_dlf_metadata.index_name AS index_name',
+                'tx_dlf_metadata',
+                'tx_dlf_metadata.is_sortable=1 AND tx_dlf_metadata.pid='.intval($this->cPid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                '',
+                '',
+                ''
+            );
 
-			$sorting = array ();
+            $sorting = array ();
 
-			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+            while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-				$sorting[$resArray['index_name']] = $resArray['index_name'].'_sorting';
+                $sorting[$resArray['index_name']] = $resArray['index_name'].'_sorting';
 
-			}
+            }
 
-		}
+        }
 
-		// Keep track of relevance.
-		$i = 0;
+        // Keep track of relevance.
+        $i = 0;
 
-		// Process results.
-		foreach ($results->response->docs as $doc) {
+        // Process results.
+        foreach ($results->response->docs as $doc) {
 
-			// Split toplevel documents from subparts.
-			if ($doc->toplevel == 1) {
+            // Split toplevel documents from subparts.
+            if ($doc->toplevel == 1) {
 
-				// Prepare document's metadata for sorting.
-				$docSorting = array ();
+                // Prepare document's metadata for sorting.
+                $docSorting = array ();
 
-				foreach ($sorting as $index_name => $solr_name) {
+                foreach ($sorting as $index_name => $solr_name) {
 
-					if (!empty($doc->$solr_name)) {
+                    if (!empty($doc->$solr_name)) {
 
-						$docSorting[$index_name] = (is_array($doc->$solr_name) ? $doc->$solr_name[0] : $doc->$solr_name);
+                        $docSorting[$index_name] = (is_array($doc->$solr_name) ? $doc->$solr_name[0] : $doc->$solr_name);
 
-					}
+                    }
 
-				}
+                }
 
-				// Preserve relevance ranking.
-				if (!empty($toplevel[$doc->uid]['s']['relevance'])) {
+                // Preserve relevance ranking.
+                if (!empty($toplevel[$doc->uid]['s']['relevance'])) {
 
-					$docSorting['relevance'] = $toplevel[$doc->uid]['s']['relevance'];
+                    $docSorting['relevance'] = $toplevel[$doc->uid]['s']['relevance'];
 
-				}
+                }
 
-				$toplevel[$doc->uid] = array (
-					'u' => $doc->uid,
-					'h' => '',
-					's' => $docSorting,
-					'p' => (!empty($toplevel[$doc->uid]['p']) ? $toplevel[$doc->uid]['p'] : array ())
-				);
+                $toplevel[$doc->uid] = array (
+                    'u' => $doc->uid,
+                    'h' => '',
+                    's' => $docSorting,
+                    'p' => (!empty($toplevel[$doc->uid]['p']) ? $toplevel[$doc->uid]['p'] : array ())
+                );
 
-			} else {
+            } else {
 
-				$toplevel[$doc->uid]['p'][] = array (
-					'u' => $doc->id,
-					'h' => (!empty($results->highlighting->{$doc->id}->fulltext) ? $results->highlighting->{$doc->id}->fulltext[0] : '')
-				);
+                $toplevel[$doc->uid]['p'][] = array (
+                    'u' => $doc->id,
+                    'h' => (!empty($results->highlighting->{$doc->id}->fulltext) ? $results->highlighting->{$doc->id}->fulltext[0] : '')
+                );
 
-				if (!in_array($doc->uid, $checks)) {
+                if (!in_array($doc->uid, $checks)) {
 
-					$checks[] = $doc->uid;
+                    $checks[] = $doc->uid;
 
-				}
+                }
 
-			}
+            }
 
-			// Add relevance to sorting values.
-			if (empty($toplevel[$doc->uid]['s']['relevance'])) {
+            // Add relevance to sorting values.
+            if (empty($toplevel[$doc->uid]['s']['relevance'])) {
 
-				$toplevel[$doc->uid]['s']['relevance'] = str_pad($i, 6, '0', STR_PAD_LEFT);
+                $toplevel[$doc->uid]['s']['relevance'] = str_pad($i, 6, '0', STR_PAD_LEFT);
 
-			}
+            }
 
-			$i++;
+            $i++;
 
-		}
+        }
 
-		// Check if the toplevel documents have metadata.
-		foreach ($checks as $check) {
+        // Check if the toplevel documents have metadata.
+        foreach ($checks as $check) {
 
-			if (empty($toplevel[$check]['u'])) {
+            if (empty($toplevel[$check]['u'])) {
 
-				// Get information for toplevel document.
-				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-					'tx_dlf_documents.uid AS uid,tx_dlf_documents.metadata_sorting AS metadata_sorting',
-					'tx_dlf_documents',
-					'tx_dlf_documents.uid='.intval($check).tx_dlf_helper::whereClause('tx_dlf_documents'),
-					'',
-					'',
-					'1'
-				);
+                // Get information for toplevel document.
+                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                    'tx_dlf_documents.uid AS uid,tx_dlf_documents.metadata_sorting AS metadata_sorting',
+                    'tx_dlf_documents',
+                    'tx_dlf_documents.uid='.intval($check).tx_dlf_helper::whereClause('tx_dlf_documents'),
+                    '',
+                    '',
+                    '1'
+                );
 
-				// Process results.
-				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+                // Process results.
+                if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-					$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+                    $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-					// Prepare document's metadata for sorting.
-					$sorting = unserialize($resArray['metadata_sorting']);
+                    // Prepare document's metadata for sorting.
+                    $sorting = unserialize($resArray['metadata_sorting']);
 
-					if (!empty($sorting['type']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['type'])) {
+                    if (!empty($sorting['type']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['type'])) {
 
-						$sorting['type'] = tx_dlf_helper::getIndexName($sorting['type'], 'tx_dlf_structures', $this->cPid);
+                        $sorting['type'] = tx_dlf_helper::getIndexName($sorting['type'], 'tx_dlf_structures', $this->cPid);
 
-					}
+                    }
 
-					if (!empty($sorting['owner']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['owner'])) {
+                    if (!empty($sorting['owner']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['owner'])) {
 
-						$sorting['owner'] = tx_dlf_helper::getIndexName($sorting['owner'], 'tx_dlf_libraries', $this->cPid);
+                        $sorting['owner'] = tx_dlf_helper::getIndexName($sorting['owner'], 'tx_dlf_libraries', $this->cPid);
 
-					}
+                    }
 
-					if (!empty($sorting['collection']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['collection'])) {
+                    if (!empty($sorting['collection']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['collection'])) {
 
-						$sorting['collection'] = tx_dlf_helper::getIndexName($sorting['collection'], 'tx_dlf_collections', $this->cPid);
+                        $sorting['collection'] = tx_dlf_helper::getIndexName($sorting['collection'], 'tx_dlf_collections', $this->cPid);
 
-					}
+                    }
 
-					// Preserve relevance ranking.
-					if (!empty($toplevel[$check]['s']['relevance'])) {
+                    // Preserve relevance ranking.
+                    if (!empty($toplevel[$check]['s']['relevance'])) {
 
-						$sorting['relevance'] = $toplevel[$check]['s']['relevance'];
+                        $sorting['relevance'] = $toplevel[$check]['s']['relevance'];
 
-					}
+                    }
 
-					$toplevel[$check] = array (
-						'u' => $resArray['uid'],
-						'h' => '',
-						's' => $sorting,
-						'p' => $toplevel[$check]['p']
-					);
+                    $toplevel[$check] = array (
+                        'u' => $resArray['uid'],
+                        'h' => '',
+                        's' => $sorting,
+                        'p' => $toplevel[$check]['p']
+                    );
 
-				} else {
+                } else {
 
-					// Clear entry if there is no (accessible) toplevel document.
-					unset ($toplevel[$check]);
+                    // Clear entry if there is no (accessible) toplevel document.
+                    unset ($toplevel[$check]);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// Save list of documents.
-		$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+        // Save list of documents.
+        $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-		$list->reset();
+        $list->reset();
 
-		$list->add(array_values($toplevel));
+        $list->add(array_values($toplevel));
 
-		// Set metadata for search.
-		$list->metadata = array (
-			'label' => '',
-			'description' => '',
-			'options' => array (
-				'source' => 'search',
-				'engine' => 'solr',
-				'select' => $query,
-				'userid' => 0,
-				'params' => $this->params,
-				'core' => $this->core,
-				'pid' => $this->cPid,
-				'order' => 'relevance',
-				'order.asc' => TRUE,
-			)
-		);
+        // Set metadata for search.
+        $list->metadata = array (
+            'label' => '',
+            'description' => '',
+            'options' => array (
+                'source' => 'search',
+                'engine' => 'solr',
+                'select' => $query,
+                'userid' => 0,
+                'params' => $this->params,
+                'core' => $this->core,
+                'pid' => $this->cPid,
+                'order' => 'relevance',
+                'order.asc' => TRUE,
+            )
+        );
 
-		return $list;
+        return $list;
 
-	}
+    }
 
-	/**
-	 * This returns $this->limit via __get()
-	 *
-	 * @access	protected
-	 *
-	 * @return	integer		The max number of results
-	 */
-	protected function _getLimit() {
+    /**
+     * This returns $this->limit via __get()
+     *
+     * @access	protected
+     *
+     * @return	integer		The max number of results
+     */
+    protected function _getLimit() {
 
-		return $this->limit;
+        return $this->limit;
 
-	}
+    }
 
-	/**
-	 * This returns $this->numberOfHits via __get()
-	 *
-	 * @access	protected
-	 *
-	 * @return	integer		Total number of hits for last search
-	 */
-	protected function _getNumberOfHits() {
+    /**
+     * This returns $this->numberOfHits via __get()
+     *
+     * @access	protected
+     *
+     * @return	integer		Total number of hits for last search
+     */
+    protected function _getNumberOfHits() {
 
-		return $this->numberOfHits;
+        return $this->numberOfHits;
 
-	}
+    }
 
-	/**
-	 * This returns $this->ready via __get()
-	 *
-	 * @access	protected
-	 *
-	 * @return	boolean		Is the search instantiated successfully?
-	 */
-	protected function _getReady() {
+    /**
+     * This returns $this->ready via __get()
+     *
+     * @access	protected
+     *
+     * @return	boolean		Is the search instantiated successfully?
+     */
+    protected function _getReady() {
 
-		return $this->ready;
+        return $this->ready;
 
-	}
+    }
 
-	/**
-	 * This returns $this->service via __get()
-	 *
-	 * @access	protected
-	 *
-	 * @return	Apache_Solr_Service		Apache Solr service object
-	 */
-	protected function _getService() {
+    /**
+     * This returns $this->service via __get()
+     *
+     * @access	protected
+     *
+     * @return	Apache_Solr_Service		Apache Solr service object
+     */
+    protected function _getService() {
 
-		return $this->service;
+        return $this->service;
 
-	}
+    }
 
-	/**
-	 * This sets $this->cPid via __set()
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$value: The new PID for the metadata definitions
-	 *
-	 * @return	void
-	 */
-	protected function _setCPid($value) {
+    /**
+     * This sets $this->cPid via __set()
+     *
+     * @access	protected
+     *
+     * @param	integer		$value: The new PID for the metadata definitions
+     *
+     * @return	void
+     */
+    protected function _setCPid($value) {
 
-		$this->cPid = max(intval($value), 0);
+        $this->cPid = max(intval($value), 0);
 
-	}
+    }
 
-	/**
-	 * This sets $this->limit via __set()
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$value: The max number of results
-	 *
-	 * @return	void
-	 */
-	protected function _setLimit($value) {
+    /**
+     * This sets $this->limit via __set()
+     *
+     * @access	protected
+     *
+     * @param	integer		$value: The max number of results
+     *
+     * @return	void
+     */
+    protected function _setLimit($value) {
 
-		$this->limit = max(intval($value), 0);
+        $this->limit = max(intval($value), 0);
 
-	}
+    }
 
-	/**
-	 * This sets $this->params via __set()
-	 *
-	 * @access	protected
-	 *
-	 * @param	array		$value: The query parameters
-	 *
-	 * @return	void
-	 */
-	protected function _setParams(array $value) {
+    /**
+     * This sets $this->params via __set()
+     *
+     * @access	protected
+     *
+     * @param	array		$value: The query parameters
+     *
+     * @return	void
+     */
+    protected function _setParams(array $value) {
 
-		$this->params = $value;
+        $this->params = $value;
 
-	}
+    }
 
-	/**
-	 * This magic method is called each time an invisible property is referenced from the object
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$var: Name of variable to get
-	 *
-	 * @return	mixed		Value of $this->$var
-	 */
-	public function __get($var) {
+    /**
+     * This magic method is called each time an invisible property is referenced from the object
+     *
+     * @access	public
+     *
+     * @param	string		$var: Name of variable to get
+     *
+     * @return	mixed		Value of $this->$var
+     */
+    public function __get($var) {
 
-		$method = '_get'.ucfirst($var);
+        $method = '_get'.ucfirst($var);
 
-		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+        if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__get('.$var.')] There is no getter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__get('.$var.')] There is no getter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
-			}
+            }
 
-			return;
+            return;
 
-		} else {
+        } else {
 
-			return $this->$method();
+            return $this->$method();
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This magic method is called each time an invisible property is referenced from the object
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$var: Name of variable to set
-	 * @param	mixed		$value: New value of variable
-	 *
-	 * @return	void
-	 */
-	public function __set($var, $value) {
+    /**
+     * This magic method is called each time an invisible property is referenced from the object
+     *
+     * @access	public
+     *
+     * @param	string		$var: Name of variable to set
+     * @param	mixed		$value: New value of variable
+     *
+     * @return	void
+     */
+    public function __set($var, $value) {
 
-		$method = '_set'.ucfirst($var);
+        $method = '_set'.ucfirst($var);
 
-		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+        if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__set('.$var.', [data])] There is no setter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING, $value);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__set('.$var.', [data])] There is no setter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING, $value);
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$this->$method($value);
+            $this->$method($value);
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This is a singleton class, thus the constructor should be private/protected
-	 *
-	 * @access	protected
-	 *
-	 * @param	string		$core: The name of the core to use
-	 *
-	 * @return	void
-	 */
-	protected function __construct($core) {
+    /**
+     * This is a singleton class, thus the constructor should be private/protected
+     *
+     * @access	protected
+     *
+     * @param	string		$core: The name of the core to use
+     *
+     * @return	void
+     */
+    protected function __construct($core) {
 
-		// Load class.
-		if (!class_exists('Apache_Solr_Service')) {
+        // Load class.
+        if (!class_exists('Apache_Solr_Service')) {
 
-			require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Service.php'));
+            require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Service.php'));
 
-		}
+        }
 
-		$solrInfo = self::getSolrConnectionInfo($core);
+        $solrInfo = self::getSolrConnectionInfo($core);
 
-		// Instantiate Apache_Solr_Service class.
-		$this->service = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Apache_Solr_Service', $solrInfo['host'], $solrInfo['port'], $solrInfo['path']);
+        // Instantiate Apache_Solr_Service class.
+        $this->service = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Apache_Solr_Service', $solrInfo['host'], $solrInfo['port'], $solrInfo['path']);
 
-		// Check if connection is established.
-		if ($this->service->ping() !== FALSE) {
+        // Check if connection is established.
+        if ($this->service->ping() !== FALSE) {
 
-			// Do not collapse single value arrays.
-			$this->service->setCollapseSingleValueArrays = FALSE;
+            // Do not collapse single value arrays.
+            $this->service->setCollapseSingleValueArrays = FALSE;
 
-			// Set core name.
-			$this->core = $core;
+            // Set core name.
+            $this->core = $core;
 
-			// Instantiation successful!
-			$this->ready = TRUE;
+            // Instantiation successful!
+            $this->ready = TRUE;
 
-		}
+        }
 
-	}
+    }
 
 }

dlf/common/class.tx_dlf_mods.php

Indentation +88 added lines, -88 removed lines

@@ -19,159 +19,159 @@
  */
 class tx_dlf_mods implements tx_dlf_format {
 
-	/**
-	 * This extracts the essential MODS metadata from XML
-	 *
-	 * @access	public
-	 *
-	 * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
-	 * @param	array		&$metadata: The metadata array to fill
-	 *
-	 * @return	void
-	 */
-	public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
+    /**
+     * This extracts the essential MODS metadata from XML
+     *
+     * @access	public
+     *
+     * @param	SimpleXMLElement		$xml: The XML to extract the metadata from
+     * @param	array		&$metadata: The metadata array to fill
+     *
+     * @return	void
+     */
+    public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
 
-		$xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
+        $xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 
-		// Get "author" and "author_sorting".
-		$authors = $xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="aut"]');
+        // Get "author" and "author_sorting".
+        $authors = $xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="aut"]');
 
-		// Get "author" and "author_sorting" again if that was to sophisticated.
-		if (!$authors) {
+        // Get "author" and "author_sorting" again if that was to sophisticated.
+        if (!$authors) {
 
-			// Get all names which do not have any role term assigned and assume these are authors.
-			$authors = $xml->xpath('./mods:name[not(./mods:role)]');
+            // Get all names which do not have any role term assigned and assume these are authors.
+            $authors = $xml->xpath('./mods:name[not(./mods:role)]');
 
-		}
+        }
 
-		if (is_array($authors)) {
+        if (is_array($authors)) {
 
-			for ($i = 0, $j = count($authors); $i < $j; $i++) {
+            for ($i = 0, $j = count($authors); $i < $j; $i++) {
 
-				$authors[$i]->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
+                $authors[$i]->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 
-				// Check if there is a display form.
-				if (($displayForm = $authors[$i]->xpath('./mods:displayForm'))) {
+                // Check if there is a display form.
+                if (($displayForm = $authors[$i]->xpath('./mods:displayForm'))) {
 
-					$metadata['author'][$i] = (string) $displayForm[0];
+                    $metadata['author'][$i] = (string) $displayForm[0];
 
-				} elseif (($nameParts = $authors[$i]->xpath('./mods:namePart'))) {
+                } elseif (($nameParts = $authors[$i]->xpath('./mods:namePart'))) {
 
-					$name = array ();
+                    $name = array ();
 
-					$k = 4;
+                    $k = 4;
 
-					foreach ($nameParts as $namePart) {
+                    foreach ($nameParts as $namePart) {
 
-						if (isset($namePart['type']) && (string) $namePart['type'] == 'family') {
+                        if (isset($namePart['type']) && (string) $namePart['type'] == 'family') {
 
-							$name[0] = (string) $namePart;
+                            $name[0] = (string) $namePart;
 
-						} elseif (isset($namePart['type']) && (string) $namePart['type'] == 'given') {
+                        } elseif (isset($namePart['type']) && (string) $namePart['type'] == 'given') {
 
-							$name[1] = (string) $namePart;
+                            $name[1] = (string) $namePart;
 
-						} elseif (isset($namePart['type']) && (string) $namePart['type'] == 'termsOfAddress') {
+                        } elseif (isset($namePart['type']) && (string) $namePart['type'] == 'termsOfAddress') {
 
-							$name[2] = (string) $namePart;
+                            $name[2] = (string) $namePart;
 
-						} elseif (isset($namePart['type']) && (string) $namePart['type'] == 'date') {
+                        } elseif (isset($namePart['type']) && (string) $namePart['type'] == 'date') {
 
-							$name[3] = (string) $namePart;
+                            $name[3] = (string) $namePart;
 
-						} else {
+                        } else {
 
-							$name[$k] = (string) $namePart;
+                            $name[$k] = (string) $namePart;
 
-						}
+                        }
 
-						$k++;
+                        $k++;
 
-					}
+                    }
 
-					ksort($name);
+                    ksort($name);
 
-					$metadata['author'][$i] = trim(implode(', ', $name));
+                    $metadata['author'][$i] = trim(implode(', ', $name));
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// Get "place" and "place_sorting".
-		$places = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:place/mods:placeTerm');
+        // Get "place" and "place_sorting".
+        $places = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:place/mods:placeTerm');
 
-		// Get "place" and "place_sorting" again if that was to sophisticated.
-		if (!$places) {
+        // Get "place" and "place_sorting" again if that was to sophisticated.
+        if (!$places) {
 
-			// Get all places and assume these are places of publication.
-			$places = $xml->xpath('./mods:originInfo/mods:place/mods:placeTerm');
+            // Get all places and assume these are places of publication.
+            $places = $xml->xpath('./mods:originInfo/mods:place/mods:placeTerm');
 
-		}
+        }
 
-		if (is_array($places)) {
+        if (is_array($places)) {
 
-			foreach ($places as $place) {
+            foreach ($places as $place) {
 
-				$metadata['place'][] = (string) $place;
+                $metadata['place'][] = (string) $place;
 
-				if (!$metadata['place_sorting'][0]) {
+                if (!$metadata['place_sorting'][0]) {
 
-					$metadata['place_sorting'][0] = preg_replace('/[[:punct:]]/', '', (string) $place);
+                    $metadata['place_sorting'][0] = preg_replace('/[[:punct:]]/', '', (string) $place);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// Get "year_sorting".
-		if (($years_sorting = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateOther[@type="order" and @encoding="w3cdtf"]'))) {
+        // Get "year_sorting".
+        if (($years_sorting = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateOther[@type="order" and @encoding="w3cdtf"]'))) {
 
-			foreach ($years_sorting as $year_sorting) {
+            foreach ($years_sorting as $year_sorting) {
 
-				$metadata['year_sorting'][0] = intval($year_sorting);
+                $metadata['year_sorting'][0] = intval($year_sorting);
 
-			}
+            }
 
-		}
+        }
 
-		// Get "year" and "year_sorting" if not specified separately.
-		$years = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateIssued[@keyDate="yes"]');
+        // Get "year" and "year_sorting" if not specified separately.
+        $years = $xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateIssued[@keyDate="yes"]');
 
-		// Get "year" and "year_sorting" again if that was to sophisticated.
-		if (!$years) {
+        // Get "year" and "year_sorting" again if that was to sophisticated.
+        if (!$years) {
 
-			// Get all dates and assume these are dates of publication.
-			$years = $xml->xpath('./mods:originInfo/mods:dateIssued');
+            // Get all dates and assume these are dates of publication.
+            $years = $xml->xpath('./mods:originInfo/mods:dateIssued');
 
-		}
+        }
 
-		if (is_array($years)) {
+        if (is_array($years)) {
 
-			foreach ($years as $year) {
+            foreach ($years as $year) {
 
-				$metadata['year'][] = (string) $year;
+                $metadata['year'][] = (string) $year;
 
-				if (!$metadata['year_sorting'][0]) {
+                if (!$metadata['year_sorting'][0]) {
 
-					$year_sorting = str_ireplace('x', '5', preg_replace('/[^\d.x]/i', '', (string) $year));
+                    $year_sorting = str_ireplace('x', '5', preg_replace('/[^\d.x]/i', '', (string) $year));
 
-					if (strpos($year_sorting, '.') || strlen($year_sorting) < 3) {
+                    if (strpos($year_sorting, '.') || strlen($year_sorting) < 3) {
 
-						$year_sorting = ((intval(trim($year_sorting, '.')) - 1) * 100) + 50;
+                        $year_sorting = ((intval(trim($year_sorting, '.')) - 1) * 100) + 50;
 
-					}
+                    }
 
-					$metadata['year_sorting'][0] = intval($year_sorting);
+                    $metadata['year_sorting'][0] = intval($year_sorting);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
 }

dlf/common/class.tx_dlf_list.php

Indentation +634 added lines, -634 removed lines

@@ -19,893 +19,893 @@
  */
 class tx_dlf_list implements ArrayAccess, Countable, Iterator, \TYPO3\CMS\Core\SingletonInterface {
 
-	/**
-	 * This holds the number of documents in the list
-	 * @see Countable
-	 *
-	 * @var	integer
-	 * @access protected
-	 */
-	protected $count = 0;
-
-	/**
-	 * This holds the list entries in sorted order
-	 * @see ArrayAccess
-	 *
-	 * @var	array()
-	 * @access protected
-	 */
-	protected $elements = array ();
-
-	/**
-	 * This holds the list's metadata
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $metadata = array ();
-
-	/**
-	 * This holds the current list position
-	 * @see Iterator
-	 *
-	 * @var	integer
-	 * @access protected
-	 */
-	protected $position = 0;
-
-	/**
-	 * This holds the full records of already processed list elements
-	 *
-	 * @var	array()
-	 * @access protected
-	 */
-	protected $records = array ();
-
-	/**
-	 * Instance of Apache_Solr_Service class
-	 *
-	 * @var	Apache_Solr_Service
-	 * @access protected
-	 */
-	protected $solr;
-
-	/**
-	 * This holds the Solr metadata configuration
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $solrConfig = array ();
-
-	/**
-	 * This adds an array of elements at the given position to the list
-	 *
-	 * @access	public
-	 *
-	 * @param	array		$elements: Array of elements to add to list
-	 * @param	integer		$position: Numeric position for including
-	 *
-	 * @return	void
-	 */
-	public function add(array $elements, $position = -1) {
-
-		$position = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($position, 0, $this->count, $this->count);
-
-		if (!empty($elements)) {
-
-			array_splice($this->elements, $position, 0, $elements);
-
-			$this->count = count($this->elements);
-
-		}
-
-	}
-
-	/**
-	 * This counts the elements
-	 * @see Countable::count()
-	 *
-	 * @access	public
-	 *
-	 * @return	integer		The number of elements in the list
-	 */
-	public function count() {
+    /**
+     * This holds the number of documents in the list
+     * @see Countable
+     *
+     * @var	integer
+     * @access protected
+     */
+    protected $count = 0;
+
+    /**
+     * This holds the list entries in sorted order
+     * @see ArrayAccess
+     *
+     * @var	array()
+     * @access protected
+     */
+    protected $elements = array ();
+
+    /**
+     * This holds the list's metadata
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $metadata = array ();
+
+    /**
+     * This holds the current list position
+     * @see Iterator
+     *
+     * @var	integer
+     * @access protected
+     */
+    protected $position = 0;
+
+    /**
+     * This holds the full records of already processed list elements
+     *
+     * @var	array()
+     * @access protected
+     */
+    protected $records = array ();
+
+    /**
+     * Instance of Apache_Solr_Service class
+     *
+     * @var	Apache_Solr_Service
+     * @access protected
+     */
+    protected $solr;
+
+    /**
+     * This holds the Solr metadata configuration
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $solrConfig = array ();
+
+    /**
+     * This adds an array of elements at the given position to the list
+     *
+     * @access	public
+     *
+     * @param	array		$elements: Array of elements to add to list
+     * @param	integer		$position: Numeric position for including
+     *
+     * @return	void
+     */
+    public function add(array $elements, $position = -1) {
+
+        $position = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($position, 0, $this->count, $this->count);
+
+        if (!empty($elements)) {
+
+            array_splice($this->elements, $position, 0, $elements);
+
+            $this->count = count($this->elements);
+
+        }
+
+    }
+
+    /**
+     * This counts the elements
+     * @see Countable::count()
+     *
+     * @access	public
+     *
+     * @return	integer		The number of elements in the list
+     */
+    public function count() {
 
-		return $this->count;
+        return $this->count;
 
-	}
+    }
 
-	/**
-	 * This returns the current element
-	 * @see Iterator::current()
-	 *
-	 * @access	public
-	 *
-	 * @return	array		The current element
-	 */
-	public function current() {
+    /**
+     * This returns the current element
+     * @see Iterator::current()
+     *
+     * @access	public
+     *
+     * @return	array		The current element
+     */
+    public function current() {
 
-		if ($this->valid()) {
+        if ($this->valid()) {
 
-			return $this->getRecord($this->elements[$this->position]);
+            return $this->getRecord($this->elements[$this->position]);
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->current()] Invalid position "'.$this->position.'" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->current()] Invalid position "'.$this->position.'" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This returns the full record of any list element
-	 *
-	 * @access	protected
-	 *
-	 * @param	mixed		$element: The list element
-	 *
-	 * @return	mixed		The element's full record
-	 */
-	protected function getRecord($element) {
+    /**
+     * This returns the full record of any list element
+     *
+     * @access	protected
+     *
+     * @param	mixed		$element: The list element
+     *
+     * @return	mixed		The element's full record
+     */
+    protected function getRecord($element) {
 
-		if (is_array($element) && array_keys($element) == array ('u', 'h', 's', 'p')) {
+        if (is_array($element) && array_keys($element) == array ('u', 'h', 's', 'p')) {
 
-			// Return already processed record if possible.
-			if (!empty($this->records[$element['u']])) {
+            // Return already processed record if possible.
+            if (!empty($this->records[$element['u']])) {
 
-				return $this->records[$element['u']];
+                return $this->records[$element['u']];
 
-			}
+            }
 
-			$record = array (
-				'uid' => $element['u'],
-				'page' => 1,
-				'preview' => '',
-				'subparts' => $element['p']
-			);
+            $record = array (
+                'uid' => $element['u'],
+                'page' => 1,
+                'preview' => '',
+                'subparts' => $element['p']
+            );
 
-			// Check if it's a list of database records or Solr documents.
-			if (!empty($this->metadata['options']['source']) && $this->metadata['options']['source'] == 'collection') {
+            // Check if it's a list of database records or Solr documents.
+            if (!empty($this->metadata['options']['source']) && $this->metadata['options']['source'] == 'collection') {
 
-				// Get document's thumbnail and metadata from database.
-				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-					'tx_dlf_documents.uid AS uid,tx_dlf_documents.thumbnail AS thumbnail,tx_dlf_documents.metadata AS metadata',
-					'tx_dlf_documents',
-					'(tx_dlf_documents.uid='.intval($record['uid']).' OR tx_dlf_documents.partof='.intval($record['uid']).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
-					'',
-					'',
-					''
-				);
+                // Get document's thumbnail and metadata from database.
+                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                    'tx_dlf_documents.uid AS uid,tx_dlf_documents.thumbnail AS thumbnail,tx_dlf_documents.metadata AS metadata',
+                    'tx_dlf_documents',
+                    '(tx_dlf_documents.uid='.intval($record['uid']).' OR tx_dlf_documents.partof='.intval($record['uid']).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+                    '',
+                    '',
+                    ''
+                );
 
-				// Process results.
-				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+                // Process results.
+                while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-					// Prepare document's metadata.
-					$metadata = unserialize($resArray['metadata']);
+                    // Prepare document's metadata.
+                    $metadata = unserialize($resArray['metadata']);
 
-					if (!empty($metadata['type'][0]) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($metadata['type'][0])) {
+                    if (!empty($metadata['type'][0]) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($metadata['type'][0])) {
 
-						$metadata['type'][0] = tx_dlf_helper::getIndexName($metadata['type'][0], 'tx_dlf_structures', $this->metadata['options']['pid']);
+                        $metadata['type'][0] = tx_dlf_helper::getIndexName($metadata['type'][0], 'tx_dlf_structures', $this->metadata['options']['pid']);
 
-					}
+                    }
 
-					if (!empty($metadata['owner'][0]) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($metadata['owner'][0])) {
+                    if (!empty($metadata['owner'][0]) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($metadata['owner'][0])) {
 
-						$metadata['owner'][0] = tx_dlf_helper::getIndexName($metadata['owner'][0], 'tx_dlf_libraries', $this->metadata['options']['pid']);
+                        $metadata['owner'][0] = tx_dlf_helper::getIndexName($metadata['owner'][0], 'tx_dlf_libraries', $this->metadata['options']['pid']);
 
-					}
+                    }
 
-					if (!empty($metadata['collection']) && is_array($metadata['collection'])) {
+                    if (!empty($metadata['collection']) && is_array($metadata['collection'])) {
 
-						foreach ($metadata['collection'] as $i => $collection) {
+                        foreach ($metadata['collection'] as $i => $collection) {
 
-							if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($collection)) {
+                            if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($collection)) {
 
-								$metadata['collection'][$i] = tx_dlf_helper::getIndexName($metadata['collection'][$i], 'tx_dlf_collections', $this->metadata['options']['pid']);
+                                $metadata['collection'][$i] = tx_dlf_helper::getIndexName($metadata['collection'][$i], 'tx_dlf_collections', $this->metadata['options']['pid']);
 
-							}
+                            }
 
-						}
+                        }
 
-					}
+                    }
 
-					// Add metadata to list element.
-					if ($resArray['uid'] == $record['uid']) {
+                    // Add metadata to list element.
+                    if ($resArray['uid'] == $record['uid']) {
 
-						$record['thumbnail'] = $resArray['thumbnail'];
+                        $record['thumbnail'] = $resArray['thumbnail'];
 
-						$record['metadata'] = $metadata;
+                        $record['metadata'] = $metadata;
 
-					} elseif (($key = tx_dlf_helper::array_search_recursive($resArray['uid'], $record['subparts'], TRUE)) !== FALSE) {
+                    } elseif (($key = tx_dlf_helper::array_search_recursive($resArray['uid'], $record['subparts'], TRUE)) !== FALSE) {
 
-						$record['subparts'][$key] = array (
-							'uid' => $resArray['uid'],
-							'page' => 1,
-							'preview' => (!empty($record['subparts'][$key]['h']) ? $record['subparts'][$key]['h'] : ''),
-							'thumbnail' => $resArray['thumbnail'],
-							'metadata' => $metadata
-						);
+                        $record['subparts'][$key] = array (
+                            'uid' => $resArray['uid'],
+                            'page' => 1,
+                            'preview' => (!empty($record['subparts'][$key]['h']) ? $record['subparts'][$key]['h'] : ''),
+                            'thumbnail' => $resArray['thumbnail'],
+                            'metadata' => $metadata
+                        );
 
-					}
+                    }
 
-				}
+                }
 
-			} elseif (!empty($this->metadata['options']['source']) && $this->metadata['options']['source'] == 'search') {
+            } elseif (!empty($this->metadata['options']['source']) && $this->metadata['options']['source'] == 'search') {
 
-				if ($this->solrConnect()) {
+                if ($this->solrConnect()) {
 
-					// Get document's thumbnail and metadata from Solr index.
-					$result = $this->solr->service->search('uid:'.tx_dlf_solr::escapeQuery($record['uid']), 0, $this->solr->limit);
+                    // Get document's thumbnail and metadata from Solr index.
+                    $result = $this->solr->service->search('uid:'.tx_dlf_solr::escapeQuery($record['uid']), 0, $this->solr->limit);
 
-					// Process results.
-					foreach ($result->response->docs as $resArray) {
+                    // Process results.
+                    foreach ($result->response->docs as $resArray) {
 
-						// Prepare document's metadata.
-						$metadata = array ();
+                        // Prepare document's metadata.
+                        $metadata = array ();
 
-						foreach ($this->solrConfig as $index_name => $solr_name) {
+                        foreach ($this->solrConfig as $index_name => $solr_name) {
 
-							if (!empty($resArray->$solr_name)) {
+                            if (!empty($resArray->$solr_name)) {
 
-								$metadata[$index_name] = (is_array($resArray->$solr_name) ? $resArray->$solr_name : array ($resArray->$solr_name));
+                                $metadata[$index_name] = (is_array($resArray->$solr_name) ? $resArray->$solr_name : array ($resArray->$solr_name));
 
-							}
+                            }
 
-						}
+                        }
 
-						// Add metadata to list elements.
-						if ($resArray->toplevel) {
+                        // Add metadata to list elements.
+                        if ($resArray->toplevel) {
 
-							$record['thumbnail'] = $resArray->thumbnail;
+                            $record['thumbnail'] = $resArray->thumbnail;
 
-							$record['metadata'] = $metadata;
+                            $record['metadata'] = $metadata;
 
-						} elseif (($key = tx_dlf_helper::array_search_recursive($resArray->id, $record['subparts'], TRUE)) !== FALSE) {
+                        } elseif (($key = tx_dlf_helper::array_search_recursive($resArray->id, $record['subparts'], TRUE)) !== FALSE) {
 
-							$record['subparts'][$key] = array (
-								'uid' => $resArray->uid,
-								'page' => $resArray->page,
-								'preview' => (!empty($record['subparts'][$key]['h']) ? $record['subparts'][$key]['h'] : ''),
-								'thumbnail' => $resArray->thumbnail,
-								'metadata' => $metadata
-							);
+                            $record['subparts'][$key] = array (
+                                'uid' => $resArray->uid,
+                                'page' => $resArray->page,
+                                'preview' => (!empty($record['subparts'][$key]['h']) ? $record['subparts'][$key]['h'] : ''),
+                                'thumbnail' => $resArray->thumbnail,
+                                'metadata' => $metadata
+                            );
 
-						}
+                        }
 
-					}
+                    }
 
-				}
+                }
 
-			}
+            }
 
-			// Save record for later usage.
-			$this->records[$element['u']] = $record;
+            // Save record for later usage.
+            $this->records[$element['u']] = $record;
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->getRecord([data])] No UID of list element to fetch full record', $this->extKey, SYSLOG_SEVERITY_NOTICE, $element);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->getRecord([data])] No UID of list element to fetch full record', $this->extKey, SYSLOG_SEVERITY_NOTICE, $element);
 
-			}
+            }
 
-			$record = $element;
+            $record = $element;
 
-		}
+        }
 
-		return $record;
+        return $record;
 
-	}
+    }
 
-	/**
-	 * This returns the current position
-	 * @see Iterator::key()
-	 *
-	 * @access	public
-	 *
-	 * @return	integer		The current position
-	 */
-	public function key() {
+    /**
+     * This returns the current position
+     * @see Iterator::key()
+     *
+     * @access	public
+     *
+     * @return	integer		The current position
+     */
+    public function key() {
 
-		return $this->position;
+        return $this->position;
 
-	}
+    }
 
 
 
-	/**
-	 * This moves the element at the given position up or down
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$position: Numeric position for moving
-	 * @param	integer		$steps: Amount of steps to move up or down
-	 *
-	 * @return	void
-	 */
-	public function move($position, $steps) {
+    /**
+     * This moves the element at the given position up or down
+     *
+     * @access	public
+     *
+     * @param	integer		$position: Numeric position for moving
+     * @param	integer		$steps: Amount of steps to move up or down
+     *
+     * @return	void
+     */
+    public function move($position, $steps) {
 
-		// Save parameters for logging purposes.
-		$_position = $position;
+        // Save parameters for logging purposes.
+        $_position = $position;
 
-		$_steps = $steps;
+        $_steps = $steps;
 
-		$position = intval($position);
+        $position = intval($position);
 
-		// Check if list position is valid.
-		if ($position < 0 || $position >= $this->count) {
+        // Check if list position is valid.
+        if ($position < 0 || $position >= $this->count) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid position "'.$position.'" for element moving', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid position "'.$position.'" for element moving', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-		$steps = intval($steps);
+        $steps = intval($steps);
 
-		// Check if moving given amount of steps is possible.
-		if (($position + $steps) < 0 || ($position + $steps) >= $this->count) {
+        // Check if moving given amount of steps is possible.
+        if (($position + $steps) < 0 || ($position + $steps) >= $this->count) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid steps "'.$steps.'" for moving element at position "'.$position.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid steps "'.$steps.'" for moving element at position "'.$position.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-		$element = $this->remove($position);
+        $element = $this->remove($position);
 
-		$this->add(array ($element), $position + $steps);
+        $this->add(array ($element), $position + $steps);
 
-	}
+    }
 
-	/**
-	 * This moves the element at the given position up
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$position: Numeric position for moving
-	 *
-	 * @return	void
-	 */
-	public function moveUp($position) {
+    /**
+     * This moves the element at the given position up
+     *
+     * @access	public
+     *
+     * @param	integer		$position: Numeric position for moving
+     *
+     * @return	void
+     */
+    public function moveUp($position) {
 
-		$this->move($position, -1);
+        $this->move($position, -1);
 
-	}
+    }
 
-	/**
-	 * This moves the element at the given position down
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$position: Numeric position for moving
-	 *
-	 * @return	void
-	 */
-	public function moveDown($position) {
+    /**
+     * This moves the element at the given position down
+     *
+     * @access	public
+     *
+     * @param	integer		$position: Numeric position for moving
+     *
+     * @return	void
+     */
+    public function moveDown($position) {
 
-		$this->move($position, 1);
+        $this->move($position, 1);
 
-	}
+    }
 
-	/**
-	 * This increments the current list position
-	 * @see Iterator::next()
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function next() {
+    /**
+     * This increments the current list position
+     * @see Iterator::next()
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function next() {
 
-		$this->position++;
+        $this->position++;
 
-	}
+    }
 
-	/**
-	 * This checks if an offset exists
-	 * @see ArrayAccess::offsetExists()
-	 *
-	 * @access	public
-	 *
-	 * @param	mixed		$offset: The offset to check
-	 *
-	 * @return	boolean		Does the given offset exist?
-	 */
-	public function offsetExists($offset) {
+    /**
+     * This checks if an offset exists
+     * @see ArrayAccess::offsetExists()
+     *
+     * @access	public
+     *
+     * @param	mixed		$offset: The offset to check
+     *
+     * @return	boolean		Does the given offset exist?
+     */
+    public function offsetExists($offset) {
 
-		return isset($this->elements[$offset]);
+        return isset($this->elements[$offset]);
 
-	}
+    }
 
-	/**
-	 * This returns the element at the given offset
-	 * @see ArrayAccess::offsetGet()
-	 *
-	 * @access	public
-	 *
-	 * @param	mixed		$offset: The offset to return
-	 *
-	 * @return	array		The element at the given offset
-	 */
-	public function offsetGet($offset) {
+    /**
+     * This returns the element at the given offset
+     * @see ArrayAccess::offsetGet()
+     *
+     * @access	public
+     *
+     * @param	mixed		$offset: The offset to return
+     *
+     * @return	array		The element at the given offset
+     */
+    public function offsetGet($offset) {
 
-		if ($this->offsetExists($offset)) {
+        if ($this->offsetExists($offset)) {
 
-			return $this->getRecord($this->elements[$offset]);
+            return $this->getRecord($this->elements[$offset]);
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->offsetGet('.$offset.')] Invalid offset "'.$offset.'" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->offsetGet('.$offset.')] Invalid offset "'.$offset.'" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This sets the element at the given offset
-	 * @see ArrayAccess::offsetSet()
-	 *
-	 * @access	public
-	 *
-	 * @param	mixed		$offset: The offset to set (non-integer offsets will be appended)
-	 * @param	mixed		$value: The value to set
-	 *
-	 * @return	void
-	 */
-	public function offsetSet($offset, $value) {
+    /**
+     * This sets the element at the given offset
+     * @see ArrayAccess::offsetSet()
+     *
+     * @access	public
+     *
+     * @param	mixed		$offset: The offset to set (non-integer offsets will be appended)
+     * @param	mixed		$value: The value to set
+     *
+     * @return	void
+     */
+    public function offsetSet($offset, $value) {
 
-		if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($offset)) {
+        if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($offset)) {
 
-			$this->elements[$offset] = $value;
+            $this->elements[$offset] = $value;
 
-		} else {
+        } else {
 
-			$this->elements[] = $value;
+            $this->elements[] = $value;
 
-		}
+        }
 
-		// Re-number the elements.
-		$this->elements = array_values($this->elements);
+        // Re-number the elements.
+        $this->elements = array_values($this->elements);
 
-		$this->count = count($this->elements);
+        $this->count = count($this->elements);
 
-	}
+    }
 
-	/**
-	 * This removes the element at the given position from the list
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$position: Numeric position for removing
-	 *
-	 * @return	array		The removed element
-	 */
-	public function remove($position) {
+    /**
+     * This removes the element at the given position from the list
+     *
+     * @access	public
+     *
+     * @param	integer		$position: Numeric position for removing
+     *
+     * @return	array		The removed element
+     */
+    public function remove($position) {
 
-		// Save parameter for logging purposes.
-		$_position = $position;
+        // Save parameter for logging purposes.
+        $_position = $position;
 
-		$position = intval($position);
+        $position = intval($position);
 
-		if ($position < 0 || $position >= $this->count) {
+        if ($position < 0 || $position >= $this->count) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->remove('.$_position.')] Invalid position "'.$position.'" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->remove('.$_position.')] Invalid position "'.$position.'" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-			}
+            }
 
-			return;
+            return;
 
-		}
+        }
 
-		$removed = array_splice($this->elements, $position, 1);
+        $removed = array_splice($this->elements, $position, 1);
 
-		$this->count = count($this->elements);
+        $this->count = count($this->elements);
 
-		return $this->getRecord($removed[0]);
+        return $this->getRecord($removed[0]);
 
-	}
+    }
 
-	/**
-	 * This clears the current list
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function reset() {
+    /**
+     * This clears the current list
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function reset() {
 
-		$this->elements = array ();
+        $this->elements = array ();
 
-		$this->records = array ();
+        $this->records = array ();
 
-		$this->metadata = array ();
+        $this->metadata = array ();
 
-		$this->count = 0;
+        $this->count = 0;
 
-		$this->position = 0;
+        $this->position = 0;
 
-	}
+    }
 
-	/**
-	 * This resets the list position
-	 * @see Iterator::rewind()
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function rewind() {
+    /**
+     * This resets the list position
+     * @see Iterator::rewind()
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function rewind() {
 
-		$this->position = 0;
+        $this->position = 0;
 
-	}
+    }
 
-	/**
-	 * This saves the current list
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$pid: PID for saving in database
-	 *
-	 * @return	void
-	 */
-	public function save($pid = 0) {
+    /**
+     * This saves the current list
+     *
+     * @access	public
+     *
+     * @param	integer		$pid: PID for saving in database
+     *
+     * @return	void
+     */
+    public function save($pid = 0) {
 
-		$pid = max(intval($pid), 0);
+        $pid = max(intval($pid), 0);
 
-		// If no PID is given, save to the user's session instead
-		if ($pid > 0) {
+        // If no PID is given, save to the user's session instead
+        if ($pid > 0) {
 
-			// TODO: Liste in Datenbank speichern (inkl. Sichtbarkeit, Beschreibung, etc.)
+            // TODO: Liste in Datenbank speichern (inkl. Sichtbarkeit, Beschreibung, etc.)
 
-		} else {
+        } else {
 
-			tx_dlf_helper::saveToSession(array ($this->elements, $this->metadata), get_class($this));
+            tx_dlf_helper::saveToSession(array ($this->elements, $this->metadata), get_class($this));
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Connects to Solr server.
-	 *
-	 * @access	protected
-	 *
-	 * @return	boolean		TRUE on success or FALSE on failure
-	 */
-	protected function solrConnect() {
+    /**
+     * Connects to Solr server.
+     *
+     * @access	protected
+     *
+     * @return	boolean		TRUE on success or FALSE on failure
+     */
+    protected function solrConnect() {
 
-		// Get Solr instance.
-		if (!$this->solr) {
+        // Get Solr instance.
+        if (!$this->solr) {
 
-			// Connect to Solr server.
-			if ($this->solr = tx_dlf_solr::getInstance($this->metadata['options']['core'])) {
+            // Connect to Solr server.
+            if ($this->solr = tx_dlf_solr::getInstance($this->metadata['options']['core'])) {
 
-				// Load index configuration.
-				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-						'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_indexed AS index_indexed',
-						'tx_dlf_metadata',
-						'tx_dlf_metadata.is_listed=1 AND tx_dlf_metadata.pid='.intval($this->metadata['options']['pid']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
-						'',
-						'tx_dlf_metadata.sorting ASC',
-						''
-				);
+                // Load index configuration.
+                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                        'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_indexed AS index_indexed',
+                        'tx_dlf_metadata',
+                        'tx_dlf_metadata.is_listed=1 AND tx_dlf_metadata.pid='.intval($this->metadata['options']['pid']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                        '',
+                        'tx_dlf_metadata.sorting ASC',
+                        ''
+                );
 
-				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+                while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-					$this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u');
+                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u');
 
-				}
+                }
 
-				// Add static fields.
-				$this->solrConfig['type'] = 'type';
+                // Add static fields.
+                $this->solrConfig['type'] = 'type';
 
-			} else {
+            } else {
 
-				return FALSE;
+                return FALSE;
 
-			}
+            }
 
-		}
+        }
 
-		return TRUE;
+        return TRUE;
 
-	}
+    }
 
-	/**
-	 * This sorts the current list by the given field
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$by: Sort the list by this field
-	 * @param	boolean		$asc: Sort ascending?
-	 *
-	 * @return	void
-	 */
-	public function sort($by, $asc = TRUE) {
+    /**
+     * This sorts the current list by the given field
+     *
+     * @access	public
+     *
+     * @param	string		$by: Sort the list by this field
+     * @param	boolean		$asc: Sort ascending?
+     *
+     * @return	void
+     */
+    public function sort($by, $asc = TRUE) {
 
-		$newOrder = array ();
+        $newOrder = array ();
 
-		$nonSortable = array ();
+        $nonSortable = array ();
 
-		foreach ($this->elements as $num => $element) {
+        foreach ($this->elements as $num => $element) {
 
-			// Is this element sortable?
-			if (!empty($element['s'][$by])) {
+            // Is this element sortable?
+            if (!empty($element['s'][$by])) {
 
-				$newOrder[$element['s'][$by].str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
+                $newOrder[$element['s'][$by].str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
 
-			} else {
+            } else {
 
-				$nonSortable[] = $element;
+                $nonSortable[] = $element;
 
-			}
+            }
 
-		}
+        }
 
-		// Reorder elements.
-		if ($asc) {
+        // Reorder elements.
+        if ($asc) {
 
-			ksort($newOrder, SORT_LOCALE_STRING);
+            ksort($newOrder, SORT_LOCALE_STRING);
 
-		} else {
+        } else {
 
-			krsort($newOrder, SORT_LOCALE_STRING);
+            krsort($newOrder, SORT_LOCALE_STRING);
 
-		}
+        }
 
-		// Add non sortable elements to the end of the list.
-		$newOrder = array_merge(array_values($newOrder), $nonSortable);
+        // Add non sortable elements to the end of the list.
+        $newOrder = array_merge(array_values($newOrder), $nonSortable);
 
-		// Check if something is missing.
-		if ($this->count == count($newOrder)) {
+        // Check if something is missing.
+        if ($this->count == count($newOrder)) {
 
-			$this->elements = $newOrder;
+            $this->elements = $newOrder;
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->sort('.$by.', ['.($asc ? 'TRUE' : 'FALSE').'])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->sort('.$by.', ['.($asc ? 'TRUE' : 'FALSE').'])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This unsets the element at the given offset
-	 * @see ArrayAccess::offsetUnset()
-	 *
-	 * @access	public
-	 *
-	 * @param	mixed		$offset: The offset to unset
-	 *
-	 * @return	void
-	 */
-	public function offsetUnset($offset) {
+    /**
+     * This unsets the element at the given offset
+     * @see ArrayAccess::offsetUnset()
+     *
+     * @access	public
+     *
+     * @param	mixed		$offset: The offset to unset
+     *
+     * @return	void
+     */
+    public function offsetUnset($offset) {
 
-		unset ($this->elements[$offset]);
+        unset ($this->elements[$offset]);
 
-		// Re-number the elements.
-		$this->elements = array_values($this->elements);
+        // Re-number the elements.
+        $this->elements = array_values($this->elements);
 
-		$this->count = count($this->elements);
+        $this->count = count($this->elements);
 
-	}
+    }
 
-	/**
-	 * This checks if the current list position is valid
-	 * @see Iterator::valid()
-	 *
-	 * @access	public
-	 *
-	 * @return	boolean		Is the current list position valid?
-	 */
-	public function valid() {
+    /**
+     * This checks if the current list position is valid
+     * @see Iterator::valid()
+     *
+     * @access	public
+     *
+     * @return	boolean		Is the current list position valid?
+     */
+    public function valid() {
 
-		return isset($this->elements[$this->position]);
+        return isset($this->elements[$this->position]);
 
-	}
+    }
 
-	/**
-	 * This returns $this->metadata via __get()
-	 *
-	 * @access	protected
-	 *
-	 * @return	array		The list's metadata
-	 */
-	protected function _getMetadata() {
+    /**
+     * This returns $this->metadata via __get()
+     *
+     * @access	protected
+     *
+     * @return	array		The list's metadata
+     */
+    protected function _getMetadata() {
 
-		return $this->metadata;
+        return $this->metadata;
 
-	}
+    }
 
-	/**
-	 * This sets $this->metadata via __set()
-	 *
-	 * @access	protected
-	 *
-	 * @param	array		$metadata: Array of new metadata
-	 *
-	 * @return	void
-	 */
-	protected function _setMetadata(array $metadata = array ()) {
+    /**
+     * This sets $this->metadata via __set()
+     *
+     * @access	protected
+     *
+     * @param	array		$metadata: Array of new metadata
+     *
+     * @return	void
+     */
+    protected function _setMetadata(array $metadata = array ()) {
 
-		$this->metadata = $metadata;
+        $this->metadata = $metadata;
 
-	}
+    }
 
-	/**
-	 * This is the constructor
-	 *
-	 * @access	public
-	 *
-	 * @param	array		$elements: Array of documents initially setting up the list
-	 * @param	array		$metadata: Array of initial metadata
-	 *
-	 * @return	void
-	 */
-	public function __construct(array $elements = array (), array $metadata = array ()) {
+    /**
+     * This is the constructor
+     *
+     * @access	public
+     *
+     * @param	array		$elements: Array of documents initially setting up the list
+     * @param	array		$metadata: Array of initial metadata
+     *
+     * @return	void
+     */
+    public function __construct(array $elements = array (), array $metadata = array ()) {
 
-		if (empty($elements) && empty($metadata)) {
+        if (empty($elements) && empty($metadata)) {
 
-			// Let's check the user's session.
-			$sessionData = tx_dlf_helper::loadFromSession(get_class($this));
+            // Let's check the user's session.
+            $sessionData = tx_dlf_helper::loadFromSession(get_class($this));
 
-			// Restore list from session data.
-			if (is_array($sessionData)) {
+            // Restore list from session data.
+            if (is_array($sessionData)) {
 
-				if (is_array($sessionData[0])) {
+                if (is_array($sessionData[0])) {
 
-					$this->elements = $sessionData[0];
+                    $this->elements = $sessionData[0];
 
-				}
+                }
 
-				if (is_array($sessionData[1])) {
+                if (is_array($sessionData[1])) {
 
-					$this->metadata = $sessionData[1];
+                    $this->metadata = $sessionData[1];
 
-				}
+                }
 
-			}
+            }
 
-		} else {
+        } else {
 
-			// Add metadata to the list.
-			$this->metadata = $metadata;
+            // Add metadata to the list.
+            $this->metadata = $metadata;
 
-			// Add initial set of elements to the list.
-			$this->elements = $elements;
+            // Add initial set of elements to the list.
+            $this->elements = $elements;
 
-		}
+        }
 
-		$this->count = count($this->elements);
+        $this->count = count($this->elements);
 
-	}
+    }
 
-	/**
-	 * This magic method is invoked each time a clone is called on the object variable
-	 * (This method is defined as private/protected because singleton objects should not be cloned)
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function __clone() {}
+    /**
+     * This magic method is invoked each time a clone is called on the object variable
+     * (This method is defined as private/protected because singleton objects should not be cloned)
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function __clone() {}
 
-	/**
-	 * This magic method is called each time an invisible property is referenced from the object
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$var: Name of variable to get
-	 *
-	 * @return	mixed		Value of $this->$var
-	 */
-	public function __get($var) {
+    /**
+     * This magic method is called each time an invisible property is referenced from the object
+     *
+     * @access	public
+     *
+     * @param	string		$var: Name of variable to get
+     *
+     * @return	mixed		Value of $this->$var
+     */
+    public function __get($var) {
 
-		$method = '_get'.ucfirst($var);
+        $method = '_get'.ucfirst($var);
 
-		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+        if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__get('.$var.')] There is no getter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__get('.$var.')] There is no getter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-			}
+            }
 
-			return;
+            return;
 
-		} else {
+        } else {
 
-			return $this->$method();
+            return $this->$method();
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This magic method is called each time an invisible property is referenced from the object
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$var: Name of variable to set
-	 * @param	mixed		$value: New value of variable
-	 *
-	 * @return	void
-	 */
-	public function __set($var, $value) {
+    /**
+     * This magic method is called each time an invisible property is referenced from the object
+     *
+     * @access	public
+     *
+     * @param	string		$var: Name of variable to set
+     * @param	mixed		$value: New value of variable
+     *
+     * @return	void
+     */
+    public function __set($var, $value) {
 
-		$method = '_set'.ucfirst($var);
+        $method = '_set'.ucfirst($var);
 
-		if (!property_exists($this, $var) || !method_exists($this, $method)) {
+        if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__set('.$var.', [data])] There is no setter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING, $value);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__set('.$var.', [data])] There is no setter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING, $value);
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$this->$method($value);
+            $this->$method($value);
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * This magic method is executed prior to any serialization of the object
-	 * @see __wakeup()
-	 *
-	 * @access	public
-	 *
-	 * @return	array		Properties to be serialized
-	 */
-	public function __sleep() {
+    /**
+     * This magic method is executed prior to any serialization of the object
+     * @see __wakeup()
+     *
+     * @access	public
+     *
+     * @return	array		Properties to be serialized
+     */
+    public function __sleep() {
 
-		return array ('elements', 'metadata');
+        return array ('elements', 'metadata');
 
-	}
+    }
 
-	/**
-	 * This magic method is executed after the object is deserialized
-	 * @see __sleep()
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function __wakeup() {
+    /**
+     * This magic method is executed after the object is deserialized
+     * @see __sleep()
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function __wakeup() {
 
-		$this->count = count($this->elements);
+        $this->count = count($this->elements);
 
-	}
+    }
 
 }

dlf/common/class.tx_dlf_plugin.php

Indentation +212 added lines, -212 removed lines

@@ -20,320 +20,320 @@
  */
 abstract class tx_dlf_plugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 
-	public $extKey = 'dlf';
+    public $extKey = 'dlf';
 
-	public $prefixId = 'tx_dlf';
+    public $prefixId = 'tx_dlf';
 
-	public $scriptRelPath = 'common/class.tx_dlf_plugin.php';
+    public $scriptRelPath = 'common/class.tx_dlf_plugin.php';
 
-	// Plugins are cached by default (@see setCache()).
-	public $pi_USER_INT_obj = FALSE;
+    // Plugins are cached by default (@see setCache()).
+    public $pi_USER_INT_obj = FALSE;
 
-	public $pi_checkCHash = TRUE;
+    public $pi_checkCHash = TRUE;
 
-	/**
-	 * This holds the current document
-	 *
-	 * @var	tx_dlf_document
-	 * @access protected
-	 */
-	protected $doc;
+    /**
+     * This holds the current document
+     *
+     * @var	tx_dlf_document
+     * @access protected
+     */
+    protected $doc;
 
-	/**
-	 * This holds the plugin's parsed template
-	 *
-	 * @var	string
-	 * @access protected
-	 */
-	protected $template = '';
+    /**
+     * This holds the plugin's parsed template
+     *
+     * @var	string
+     * @access protected
+     */
+    protected $template = '';
 
-	/**
-	 * All the needed configuration values are stored in class variables
-	 * Priority: Flexforms > TS-Templates > Extension Configuration > ext_localconf.php
-	 *
-	 * @access	protected
-	 *
-	 * @param	array		$conf: configuration array from TS-Template
-	 *
-	 * @return	void
-	 */
-	protected function init(array $conf) {
+    /**
+     * All the needed configuration values are stored in class variables
+     * Priority: Flexforms > TS-Templates > Extension Configuration > ext_localconf.php
+     *
+     * @access	protected
+     *
+     * @param	array		$conf: configuration array from TS-Template
+     *
+     * @return	void
+     */
+    protected function init(array $conf) {
 
-		// Read FlexForm configuration.
-		$flexFormConf = array ();
+        // Read FlexForm configuration.
+        $flexFormConf = array ();
 
-		$this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf);
+        $this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf);
 
-		if (!empty($flexFormConf)) {
+        if (!empty($flexFormConf)) {
 
-			$conf = tx_dlf_helper::array_merge_recursive_overrule($flexFormConf, $conf);
+            $conf = tx_dlf_helper::array_merge_recursive_overrule($flexFormConf, $conf);
 
-		}
+        }
 
-		// Read plugin TS configuration.
-		$pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][get_class($this).'.'];
+        // Read plugin TS configuration.
+        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][get_class($this).'.'];
 
-		if (is_array($pluginConf)) {
+        if (is_array($pluginConf)) {
 
-			$conf = tx_dlf_helper::array_merge_recursive_overrule($pluginConf, $conf);
+            $conf = tx_dlf_helper::array_merge_recursive_overrule($pluginConf, $conf);
 
-		}
+        }
 
-		// Read general TS configuration.
-		$generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId.'.'];
+        // Read general TS configuration.
+        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId.'.'];
 
-		if (is_array($generalConf)) {
+        if (is_array($generalConf)) {
 
-			$conf = tx_dlf_helper::array_merge_recursive_overrule($generalConf, $conf);
+            $conf = tx_dlf_helper::array_merge_recursive_overrule($generalConf, $conf);
 
-		}
+        }
 
-		// Read extension configuration.
-		$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]);
+        // Read extension configuration.
+        $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]);
 
-		if (is_array($extConf)) {
+        if (is_array($extConf)) {
 
-			$conf = tx_dlf_helper::array_merge_recursive_overrule($extConf, $conf);
+            $conf = tx_dlf_helper::array_merge_recursive_overrule($extConf, $conf);
 
-		}
+        }
 
-		// Read TYPO3_CONF_VARS configuration.
-		$varsConf = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->extKey];
+        // Read TYPO3_CONF_VARS configuration.
+        $varsConf = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->extKey];
 
-		if (is_array($varsConf)) {
+        if (is_array($varsConf)) {
 
-			$conf = tx_dlf_helper::array_merge_recursive_overrule($varsConf, $conf);
+            $conf = tx_dlf_helper::array_merge_recursive_overrule($varsConf, $conf);
 
-		}
+        }
 
-		$this->conf = $conf;
+        $this->conf = $conf;
 
-		// Set default plugin variables.
-		$this->pi_setPiVarDefaults();
+        // Set default plugin variables.
+        $this->pi_setPiVarDefaults();
 
-		// Load translation files.
-		$this->pi_loadLL();
+        // Load translation files.
+        $this->pi_loadLL();
 
-	}
+    }
 
-	/**
-	 * Loads the current document into $this->doc
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function loadDocument() {
+    /**
+     * Loads the current document into $this->doc
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function loadDocument() {
 
-		// Check for required variable.
-		if (!empty($this->piVars['id']) && !empty($this->conf['pages'])) {
+        // Check for required variable.
+        if (!empty($this->piVars['id']) && !empty($this->conf['pages'])) {
 
-			// Should we exclude documents from other pages than $this->conf['pages']?
-			$pid = (!empty($this->conf['excludeOther']) ? intval($this->conf['pages']) : 0);
+            // Should we exclude documents from other pages than $this->conf['pages']?
+            $pid = (!empty($this->conf['excludeOther']) ? intval($this->conf['pages']) : 0);
 
-			// Get instance of tx_dlf_document.
-			$this->doc =& tx_dlf_document::getInstance($this->piVars['id'], $pid);
+            // Get instance of tx_dlf_document.
+            $this->doc =& tx_dlf_document::getInstance($this->piVars['id'], $pid);
 
-			if (!$this->doc->ready) {
+            if (!$this->doc->ready) {
 
-				// Destroy the incomplete object.
-				$this->doc = NULL;
+                // Destroy the incomplete object.
+                $this->doc = NULL;
 
-				if (TYPO3_DLOG) {
+                if (TYPO3_DLOG) {
 
-					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
-				}
+                }
 
-			} else {
+            } else {
 
-				// Set configuration PID.
-				$this->doc->cPid = $this->conf['pages'];
+                // Set configuration PID.
+                $this->doc->cPid = $this->conf['pages'];
 
-			}
+            }
 
-		} elseif (!empty($this->piVars['recordId'])) {
+        } elseif (!empty($this->piVars['recordId'])) {
 
-			// 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'
-			);
+            // 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'
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
 
-				list ($this->piVars['id']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+                list ($this->piVars['id']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-				// Set superglobal $_GET array.
-				$_GET[$this->prefixId]['id'] = $this->piVars['id'];
+                // Set superglobal $_GET array.
+                $_GET[$this->prefixId]['id'] = $this->piVars['id'];
 
-				// Unset variable to avoid infinite looping.
-				unset ($this->piVars['recordId'], $_GET[$this->prefixId]['recordId']);
+                // Unset variable to avoid infinite looping.
+                unset ($this->piVars['recordId'], $_GET[$this->prefixId]['recordId']);
 
-				// Try to load document.
-				$this->loadDocument();
+                // Try to load document.
+                $this->loadDocument();
 
-			} else {
+            } else {
 
-				if (TYPO3_DLOG) {
+                if (TYPO3_DLOG) {
 
-					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
-				}
+                }
 
-			}
+            }
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Invalid UID "'.$this->piVars['id'].'" or PID "'.$this->conf['pages'].'" for document loading', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Invalid UID "'.$this->piVars['id'].'" or PID "'.$this->conf['pages'].'" for document loading', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * The main method of the PlugIn
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$content: The PlugIn content
-	 * @param	array		$conf: The PlugIn configuration
-	 *
-	 * @abstract
-	 *
-	 * @return	string		The content that is displayed on the website
-	 */
-	abstract public function main($content, $conf);
+    /**
+     * The main method of the PlugIn
+     *
+     * @access	public
+     *
+     * @param	string		$content: The PlugIn content
+     * @param	array		$conf: The PlugIn configuration
+     *
+     * @abstract
+     *
+     * @return	string		The content that is displayed on the website
+     */
+    abstract public function main($content, $conf);
 
-	/**
-	 * Sets default plugin variables from Typoscript
-	 * (stdWrap backport from TYPO3 6.2)
-	 * @see http://forge.typo3.org/issues/22045
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function pi_setPiVarDefaults() {
+    /**
+     * Sets default plugin variables from Typoscript
+     * (stdWrap backport from TYPO3 6.2)
+     * @see http://forge.typo3.org/issues/22045
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function pi_setPiVarDefaults() {
 
-		if (is_array($this->conf['_DEFAULT_PI_VARS.'])) {
+        if (is_array($this->conf['_DEFAULT_PI_VARS.'])) {
 
-			foreach ($this->conf['_DEFAULT_PI_VARS.'] as $GPkey => $GPval) {
+            foreach ($this->conf['_DEFAULT_PI_VARS.'] as $GPkey => $GPval) {
 
-				if (strpos($GPkey,'.')) {
+                if (strpos($GPkey,'.')) {
 
-					$GPkey = substr($GPkey, 0, -1);
+                    $GPkey = substr($GPkey, 0, -1);
 
-				}
+                }
 
-				if (is_array($this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.'])) {
+                if (is_array($this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.'])) {
 
-					$GPval = $GPval ? $GPval : '';
+                    $GPval = $GPval ? $GPval : '';
 
-					$this->conf['_DEFAULT_PI_VARS.'][$GPkey] = $this->cObj->stdWrap($GPval, $this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.']);
+                    $this->conf['_DEFAULT_PI_VARS.'][$GPkey] = $this->cObj->stdWrap($GPval, $this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.']);
 
-					unset ($this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.']);
+                    unset ($this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.']);
 
-				}
+                }
 
-			}
+            }
 
-			$this->piVars = tx_dlf_helper::array_merge_recursive_overrule($this->conf['_DEFAULT_PI_VARS.'], is_array($this->piVars) ? $this->piVars : array());
+            $this->piVars = tx_dlf_helper::array_merge_recursive_overrule($this->conf['_DEFAULT_PI_VARS.'], is_array($this->piVars) ? $this->piVars : array());
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Wraps the input string in a tag with the class attribute set to the class name
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$content: HTML content to wrap in the div-tags with the "main class" of the plugin
-	 *
-	 * @return	string		HTML content wrapped, ready to return to the parent object.
-	 */
-	public function pi_wrapInBaseClass($content) {
+    /**
+     * Wraps the input string in a tag with the class attribute set to the class name
+     *
+     * @access	public
+     *
+     * @param	string		$content: HTML content to wrap in the div-tags with the "main class" of the plugin
+     *
+     * @return	string		HTML content wrapped, ready to return to the parent object.
+     */
+    public function pi_wrapInBaseClass($content) {
 
-		if (!$GLOBALS['TSFE']->config['config']['disableWrapInBaseClass']) {
-			// Use get_class($this) instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
-			$content = '<div class="'.str_replace('_', '-', get_class($this)).'">'.$content.'</div>';
+        if (!$GLOBALS['TSFE']->config['config']['disableWrapInBaseClass']) {
+            // Use get_class($this) instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
+            $content = '<div class="'.str_replace('_', '-', get_class($this)).'">'.$content.'</div>';
 
-			if (!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
+            if (!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
 
-				$content = "\n\n<!-- BEGIN: Content of extension '".$this->extKey."', plugin '".get_class($this)."' -->\n\n".$content."\n\n<!-- END: Content of extension '".$this->extKey."', plugin '".get_class($this)."' -->\n\n";
+                $content = "\n\n<!-- BEGIN: Content of extension '".$this->extKey."', plugin '".get_class($this)."' -->\n\n".$content."\n\n<!-- END: Content of extension '".$this->extKey."', plugin '".get_class($this)."' -->\n\n";
 
-			}
-		}
+            }
+        }
 
-		return $content;
+        return $content;
 
-	}
+    }
 
-	/**
-	 * Parses a string into a Typoscript array
-	 *
-	 * @access	protected
-	 *
-	 * @param	string		$string: The string to parse
-	 *
-	 * @return	array		The resulting typoscript array
-	 */
-	protected function parseTS($string = '') {
+    /**
+     * Parses a string into a Typoscript array
+     *
+     * @access	protected
+     *
+     * @param	string		$string: The string to parse
+     *
+     * @return	array		The resulting typoscript array
+     */
+    protected function parseTS($string = '') {
 
-		$parser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
+        $parser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
 
-		$parser->parse($string);
+        $parser->parse($string);
 
-		return $parser->setup;
+        return $parser->setup;
 
-	}
+    }
 
-	/**
-	 * Sets some configuration variables if the plugin is cached.
-	 *
-	 * @access	protected
-	 *
-	 * @param	boolean		$cache: Should the plugin be cached?
-	 *
-	 * @return	void
-	 */
-	protected function setCache($cache = TRUE) {
+    /**
+     * Sets some configuration variables if the plugin is cached.
+     *
+     * @access	protected
+     *
+     * @param	boolean		$cache: Should the plugin be cached?
+     *
+     * @return	void
+     */
+    protected function setCache($cache = TRUE) {
 
-		if ($cache) {
+        if ($cache) {
 
-			// Set cObject type to "USER" (default).
-			$this->pi_USER_INT_obj = FALSE;
+            // Set cObject type to "USER" (default).
+            $this->pi_USER_INT_obj = FALSE;
 
-			$this->pi_checkCHash = TRUE;
+            $this->pi_checkCHash = TRUE;
 
-			if (count($this->piVars)) {
+            if (count($this->piVars)) {
 
-				// Check cHash or disable caching.
-				$GLOBALS['TSFE']->reqCHash();
+                // Check cHash or disable caching.
+                $GLOBALS['TSFE']->reqCHash();
 
-			}
+            }
 
-		} else {
+        } else {
 
-			// Set cObject type to "USER_INT".
-			$this->pi_USER_INT_obj = TRUE;
+            // Set cObject type to "USER_INT".
+            $this->pi_USER_INT_obj = TRUE;
 
-			$this->pi_checkCHash = FALSE;
+            $this->pi_checkCHash = FALSE;
 
-			// Plugins are of type "USER" by default, so convert it to "USER_INT".
-			$this->cObj->convertToUserIntObject();
+            // Plugins are of type "USER" by default, so convert it to "USER_INT".
+            $this->cObj->convertToUserIntObject();
 
-		}
+        }
 
-	}
+    }
 
 }

dlf/common/class.tx_dlf_indexing.php

Indentation +553 added lines, -553 removed lines

@@ -19,860 +19,860 @@
  */
 class tx_dlf_indexing {
 
-	/**
-	 * The extension key
-	 *
-	 * @var	string
-	 * @access public
-	 */
-	public static $extKey = 'dlf';
-
-	/**
-	 * Array of metadata fields' configuration
-	 * @see loadIndexConf()
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected static $fields = array (
-		'autocomplete' => array (),
-		'facets' => array (),
-		'sortables' => array (),
-		'indexed' => array (),
-		'stored' => array (),
-		'tokenized' => array (),
-		'fieldboost' => array ()
-	);
+    /**
+     * The extension key
+     *
+     * @var	string
+     * @access public
+     */
+    public static $extKey = 'dlf';
+
+    /**
+     * Array of metadata fields' configuration
+     * @see loadIndexConf()
+     *
+     * @var	array
+     * @access protected
+     */
+    protected static $fields = array (
+        'autocomplete' => array (),
+        'facets' => array (),
+        'sortables' => array (),
+        'indexed' => array (),
+        'stored' => array (),
+        'tokenized' => array (),
+        'fieldboost' => array ()
+    );
 
-	/**
-	 * Is the index configuration loaded?
-	 * @see $fields
-	 *
-	 * @var	boolean
-	 * @access protected
-	 */
-	protected static $fieldsLoaded = FALSE;
+    /**
+     * Is the index configuration loaded?
+     * @see $fields
+     *
+     * @var	boolean
+     * @access protected
+     */
+    protected static $fieldsLoaded = FALSE;
 
-	/**
-	 * List of already processed documents
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected static $processedDocs = array ();
+    /**
+     * List of already processed documents
+     *
+     * @var	array
+     * @access protected
+     */
+    protected static $processedDocs = array ();
 
-	/**
-	 * Instance of Apache_Solr_Service class
-	 *
-	 * @var	Apache_Solr_Service
-	 * @access protected
-	 */
-	protected static $solr;
+    /**
+     * Instance of Apache_Solr_Service class
+     *
+     * @var	Apache_Solr_Service
+     * @access protected
+     */
+    protected static $solr;
 
-	/**
-	 * Array of toplevel structure elements
-	 * @see loadIndexConf()
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected static $toplevel = array ();
+    /**
+     * Array of toplevel structure elements
+     * @see loadIndexConf()
+     *
+     * @var	array
+     * @access protected
+     */
+    protected static $toplevel = array ();
 
-	/**
-	 * Insert given document into Solr index
-	 *
-	 * @access	public
-	 *
-	 * @param	tx_dlf_document		&$doc: The document to add
-	 * @param	integer		$core: UID of the Solr core to use
-	 *
-	 * @return	integer		0 on success or 1 on failure
-	 */
-	public static function add(tx_dlf_document &$doc, $core = 0) {
+    /**
+     * Insert given document into Solr index
+     *
+     * @access	public
+     *
+     * @param	tx_dlf_document		&$doc: The document to add
+     * @param	integer		$core: UID of the Solr core to use
+     *
+     * @return	integer		0 on success or 1 on failure
+     */
+    public static function add(tx_dlf_document &$doc, $core = 0) {
 
-		if (in_array($doc->uid, self::$processedDocs)) {
+        if (in_array($doc->uid, self::$processedDocs)) {
 
-			return 0;
+            return 0;
 
-		} elseif (self::solrConnect($core, $doc->pid)) {
+        } elseif (self::solrConnect($core, $doc->pid)) {
 
-			$errors = 0;
+            $errors = 0;
 
-			// Handle multi-volume documents.
-			if ($doc->parentId) {
+            // Handle multi-volume documents.
+            if ($doc->parentId) {
 
-				$parent =& tx_dlf_document::getInstance($doc->parentId, 0, TRUE);
+                $parent =& tx_dlf_document::getInstance($doc->parentId, 0, TRUE);
 
-				if ($parent->ready) {
+                if ($parent->ready) {
 
-					$errors = self::add($parent, $core);
+                    $errors = self::add($parent, $core);
 
-				} else {
+                } else {
 
-					if (TYPO3_DLOG) {
+                    if (TYPO3_DLOG) {
 
-						\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentId.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentId.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-					}
+                    }
 
-					return 1;
+                    return 1;
 
-				}
+                }
 
-			}
+            }
 
-			try {
+            try {
 
-				// Add document to list of processed documents.
-				self::$processedDocs[] = $doc->uid;
+                // Add document to list of processed documents.
+                self::$processedDocs[] = $doc->uid;
 
-				// Delete old Solr documents.
-				self::$solr->service->deleteByQuery('uid:'.$doc->uid);
+                // Delete old Solr documents.
+                self::$solr->service->deleteByQuery('uid:'.$doc->uid);
 
-				// Index every logical unit as separate Solr document.
-				foreach ($doc->tableOfContents as $logicalUnit) {
+                // Index every logical unit as separate Solr document.
+                foreach ($doc->tableOfContents as $logicalUnit) {
 
-					if (!$errors) {
+                    if (!$errors) {
 
-						$errors = self::processLogical($doc, $logicalUnit);
+                        $errors = self::processLogical($doc, $logicalUnit);
 
-					} else {
+                    } else {
 
-						break;
+                        break;
 
-					}
+                    }
 
-				}
+                }
 
-				// Index fulltext files if available.
-				if ($doc->hasFulltext) {
+                // Index fulltext files if available.
+                if ($doc->hasFulltext) {
 
-					foreach ($doc->physicalStructure as $pageNumber => $xmlId) {
+                    foreach ($doc->physicalStructure as $pageNumber => $xmlId) {
 
-						if (!$errors) {
+                        if (!$errors) {
 
-							$errors = self::processPhysical($doc, $pageNumber, $doc->physicalStructureInfo[$xmlId]);
+                            $errors = self::processPhysical($doc, $pageNumber, $doc->physicalStructureInfo[$xmlId]);
 
-						} else {
+                        } else {
 
-							break;
+                            break;
 
-						}
+                        }
 
-					}
+                    }
 
-				}
+                }
 
-				self::$solr->service->commit();
+                self::$solr->service->commit();
 
-				// Get document title from database.
-				$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'),
-					'',
-					'',
-					'1'
-				);
+                // Get document title from database.
+                $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'),
+                    '',
+                    '',
+                    '1'
+                );
 
-				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+                $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-				if (!defined('TYPO3_cliMode')) {
+                if (!defined('TYPO3_cliMode')) {
 
-					if (!$errors) {
+                    if (!$errors) {
 
-						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-							htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentIndexed'), $resArray['title'], $doc->uid)),
-							tx_dlf_helper::getLL('flash.done', TRUE),
-							\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-							TRUE
-						);
+                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                            htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentIndexed'), $resArray['title'], $doc->uid)),
+                            tx_dlf_helper::getLL('flash.done', TRUE),
+                            \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                            TRUE
+                        );
 
-					} else {
+                    } else {
 
-						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-							htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentNotIndexed'), $resArray['title'], $doc->uid)),
-							tx_dlf_helper::getLL('flash.error', TRUE),
-							\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-							TRUE
-						);
+                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                            htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentNotIndexed'), $resArray['title'], $doc->uid)),
+                            tx_dlf_helper::getLL('flash.error', TRUE),
+                            \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                            TRUE
+                        );
 
-					}
+                    }
 
-					tx_dlf_helper::addMessage($message);
+                    tx_dlf_helper::addMessage($message);
 
-				}
+                }
 
-				return $errors;
+                return $errors;
 
-			} catch (Exception $e) {
+            } catch (Exception $e) {
 
-				if (!defined('TYPO3_cliMode')) {
+                if (!defined('TYPO3_cliMode')) {
 
-					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-						tx_dlf_helper::getLL('flash.error', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-						TRUE
-					);
+                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.error', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                        TRUE
+                    );
 
-					tx_dlf_helper::addMessage($message);
+                    tx_dlf_helper::addMessage($message);
 
-				}
+                }
 
-				if (TYPO3_DLOG) {
+                if (TYPO3_DLOG) {
 
-					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-				}
+                }
 
-				return 1;
+                return 1;
 
-			}
+            }
 
-		} else {
+        } else {
 
-			if (!defined('TYPO3_cliMode')) {
+            if (!defined('TYPO3_cliMode')) {
 
-				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
-					tx_dlf_helper::getLL('flash.warning', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-					TRUE
-				);
+                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
+                    tx_dlf_helper::getLL('flash.warning', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+                    TRUE
+                );
 
-				tx_dlf_helper::addMessage($message);
+                tx_dlf_helper::addMessage($message);
 
-			}
+            }
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-			return 1;
+            return 1;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Delete document from Solr index
-	 *
-	 * @access	public
-	 *
-	 * @param	integer		$uid: UID of the document to delete
-	 *
-	 * @return	integer		0 on success or 1 on failure
-	 */
-	public static function delete($uid) {
+    /**
+     * Delete document from Solr index
+     *
+     * @access	public
+     *
+     * @param	integer		$uid: UID of the document to delete
+     *
+     * @return	integer		0 on success or 1 on failure
+     */
+    public static function delete($uid) {
 
-		// Save parameter for logging purposes.
-		$_uid = $uid;
+        // Save parameter for logging purposes.
+        $_uid = $uid;
 
-		// Sanitize input.
-		$uid = max(intval($uid), 0);
+        // Sanitize input.
+        $uid = max(intval($uid), 0);
 
-		// Get Solr core for document.
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_solrcores.uid AS uid,tx_dlf_documents.title AS title',
-			'tx_dlf_solrcores,tx_dlf_documents',
-			'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-			'',
-			'',
-			'1'
-		);
+        // Get Solr core for document.
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_solrcores.uid AS uid,tx_dlf_documents.title AS title',
+            'tx_dlf_solrcores,tx_dlf_documents',
+            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+            '',
+            '',
+            '1'
+        );
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-			list ($core, $title) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+            list ($core, $title) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-			// Establish Solr connection.
-			if (self::solrConnect($core)) {
+            // Establish Solr connection.
+            if (self::solrConnect($core)) {
 
-				try {
+                try {
 
-					// Delete Solr document.
-					self::$solr->service->deleteByQuery('uid:'.$uid);
+                    // Delete Solr document.
+                    self::$solr->service->deleteByQuery('uid:'.$uid);
 
-					self::$solr->service->commit();
+                    self::$solr->service->commit();
 
-				} catch (Exception $e) {
+                } catch (Exception $e) {
 
-					if (!defined('TYPO3_cliMode')) {
+                    if (!defined('TYPO3_cliMode')) {
 
-						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-							tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-							tx_dlf_helper::getLL('flash.error', TRUE),
-							\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-							TRUE
-						);
+                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                            tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                            tx_dlf_helper::getLL('flash.error', TRUE),
+                            \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                            TRUE
+                        );
 
-						tx_dlf_helper::addMessage($message);
+                        tx_dlf_helper::addMessage($message);
 
-					}
+                    }
 
-					if (TYPO3_DLOG) {
+                    if (TYPO3_DLOG) {
 
-						\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-					}
+                    }
 
-					return 1;
+                    return 1;
 
-				}
+                }
 
-			} else {
+            } else {
 
-				if (!defined('TYPO3_cliMode')) {
+                if (!defined('TYPO3_cliMode')) {
 
-					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
-						tx_dlf_helper::getLL('flash.error', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-						TRUE
-					);
+                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        tx_dlf_helper::getLL('flash.solrNoConnection', TRUE),
+                        tx_dlf_helper::getLL('flash.error', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                        TRUE
+                    );
 
-					tx_dlf_helper::addMessage($message);
+                    tx_dlf_helper::addMessage($message);
 
-				}
+                }
 
-				if (TYPO3_DLOG) {
+                if (TYPO3_DLOG) {
 
-					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-				}
+                }
 
-				return 1;
+                return 1;
 
-			}
+            }
 
-			if (!defined('TYPO3_cliMode')) {
+            if (!defined('TYPO3_cliMode')) {
 
-				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentDeleted'), $title, $uid)),
-					tx_dlf_helper::getLL('flash.done', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-					TRUE
-				);
+                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentDeleted'), $title, $uid)),
+                    tx_dlf_helper::getLL('flash.done', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                    TRUE
+                );
 
-				tx_dlf_helper::addMessage($message);
+                tx_dlf_helper::addMessage($message);
 
-			}
+            }
 
-			return 0;
+            return 0;
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-			return 1;
+            return 1;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Returns the dynamic index field name for the given metadata field.
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$index_name: The metadata field's name in database
-	 * @param	integer		$pid: UID of the configuration page
-	 *
-	 * @return	string		The field's dynamic index name
-	 */
-	public static function getIndexFieldName($index_name, $pid = 0) {
+    /**
+     * Returns the dynamic index field name for the given metadata field.
+     *
+     * @access	public
+     *
+     * @param	string		$index_name: The metadata field's name in database
+     * @param	integer		$pid: UID of the configuration page
+     *
+     * @return	string		The field's dynamic index name
+     */
+    public static function getIndexFieldName($index_name, $pid = 0) {
 
-		// Save parameter for logging purposes.
-		$_pid = $pid;
+        // Save parameter for logging purposes.
+        $_pid = $pid;
 
-		// Sanitize input.
-		$pid = max(intval($pid), 0);
+        // Sanitize input.
+        $pid = max(intval($pid), 0);
 
-		if (!$pid) {
+        if (!$pid) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName('.$index_name.', '.$_pid.')] Invalid PID "'.$pid.'" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName('.$index_name.', '.$_pid.')] Invalid PID "'.$pid.'" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
-			}
+            }
 
-			return '';
+            return '';
 
-		}
+        }
 
-		// Load metadata configuration.
-		self::loadIndexConf($pid);
+        // Load metadata configuration.
+        self::loadIndexConf($pid);
 
-		// Build field's suffix.
-		$suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
+        // Build field's suffix.
+        $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['stored']) ? 's' : 'u');
 
-		$suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
+        $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
 
-		$index_name .= '_'.$suffix;
+        $index_name .= '_'.$suffix;
 
-		return $index_name;
+        return $index_name;
 
-	}
+    }
 
-	/**
-	 * Load indexing configuration
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$pid: The configuration page's UID
-	 *
-	 * @return	void
-	 */
-	protected static function loadIndexConf($pid) {
+    /**
+     * Load indexing configuration
+     *
+     * @access	protected
+     *
+     * @param	integer		$pid: The configuration page's UID
+     *
+     * @return	void
+     */
+    protected static function loadIndexConf($pid) {
 
-		if (!self::$fieldsLoaded) {
+        if (!self::$fieldsLoaded) {
 
-			// Get the list of toplevel structures.
-			$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'),
-				'',
-				'',
-				''
-			);
+            // Get the list of toplevel structures.
+            $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'),
+                '',
+                '',
+                ''
+            );
 
-			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(
-				'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_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.index_autocomplete AS index_autocomplete,tx_dlf_metadata.index_boost AS index_boost',
-				'tx_dlf_metadata',
-				'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
-				'',
-				'',
-				''
-			);
+            // Get the metadata indexing options.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_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.index_autocomplete AS index_autocomplete,tx_dlf_metadata.index_boost AS index_boost',
+                'tx_dlf_metadata',
+                'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                '',
+                '',
+                ''
+            );
 
-			while ($indexing = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+            while ($indexing = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-				if ($indexing['index_tokenized']) {
+                if ($indexing['index_tokenized']) {
 
-					self::$fields['tokenized'][] = $indexing['index_name'];
+                    self::$fields['tokenized'][] = $indexing['index_name'];
 
-				}
+                }
 
-				if ($indexing['index_stored'] || $indexing['is_listed']) {
+                if ($indexing['index_stored'] || $indexing['is_listed']) {
 
-					self::$fields['stored'][] = $indexing['index_name'];
+                    self::$fields['stored'][] = $indexing['index_name'];
 
-				}
+                }
 
-				if ($indexing['index_indexed'] || $indexing['index_autocomplete']) {
+                if ($indexing['index_indexed'] || $indexing['index_autocomplete']) {
 
-					self::$fields['indexed'][] = $indexing['index_name'];
+                    self::$fields['indexed'][] = $indexing['index_name'];
 
-				}
+                }
 
-				if ($indexing['is_sortable']) {
+                if ($indexing['is_sortable']) {
 
-					self::$fields['sortables'][] = $indexing['index_name'];
+                    self::$fields['sortables'][] = $indexing['index_name'];
 
-				}
+                }
 
-				if ($indexing['is_facet']) {
+                if ($indexing['is_facet']) {
 
-					self::$fields['facets'][] = $indexing['index_name'];
+                    self::$fields['facets'][] = $indexing['index_name'];
 
-				}
+                }
 
-				if ($indexing['index_autocomplete']) {
+                if ($indexing['index_autocomplete']) {
 
-					self::$fields['autocomplete'][] = $indexing['index_name'];
+                    self::$fields['autocomplete'][] = $indexing['index_name'];
 
-				}
+                }
 
-				if ($indexing['index_boost'] > 0.0) {
+                if ($indexing['index_boost'] > 0.0) {
 
-					self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['index_boost']);
+                    self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['index_boost']);
 
-				} else {
+                } else {
 
-					self::$fields['fieldboost'][$indexing['index_name']] = FALSE;
+                    self::$fields['fieldboost'][$indexing['index_name']] = FALSE;
 
-				}
+                }
 
-			}
+            }
 
-			self::$fieldsLoaded = TRUE;
+            self::$fieldsLoaded = TRUE;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Processes a logical unit (and its children) for the Solr index
-	 *
-	 * @access	protected
-	 *
-	 * @param	tx_dlf_document		&$doc: The METS document
-	 * @param	array		$logicalUnit: Array of the logical unit to process
-	 *
-	 * @return	integer		0 on success or 1 on failure
-	 */
-	protected static function processLogical(tx_dlf_document &$doc, array $logicalUnit) {
+    /**
+     * Processes a logical unit (and its children) for the Solr index
+     *
+     * @access	protected
+     *
+     * @param	tx_dlf_document		&$doc: The METS document
+     * @param	array		$logicalUnit: Array of the logical unit to process
+     *
+     * @return	integer		0 on success or 1 on failure
+     */
+    protected static function processLogical(tx_dlf_document &$doc, array $logicalUnit) {
 
-		$errors = 0;
+        $errors = 0;
 
-		// Get metadata for logical unit.
-		$metadata = $doc->metadataArray[$logicalUnit['id']];
+        // Get metadata for logical unit.
+        $metadata = $doc->metadataArray[$logicalUnit['id']];
 
-		if (!empty($metadata)) {
+        if (!empty($metadata)) {
 
-			// Load class.
-			if (!class_exists('Apache_Solr_Document')) {
+            // Load class.
+            if (!class_exists('Apache_Solr_Document')) {
 
-				require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
+                require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
 
-			}
+            }
 
-			// Create new Solr document.
-			$solrDoc = new Apache_Solr_Document();
+            // Create new Solr document.
+            $solrDoc = new Apache_Solr_Document();
 
-			// Create unique identifier from document's UID and unit's XML ID.
-			$solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
+            // Create unique identifier from document's UID and unit's XML ID.
+            $solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
 
-			$solrDoc->setField('uid', $doc->uid);
+            $solrDoc->setField('uid', $doc->uid);
 
-			$solrDoc->setField('pid', $doc->pid);
+            $solrDoc->setField('pid', $doc->pid);
 
-			if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($logicalUnit['points'])) {
+            if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($logicalUnit['points'])) {
 
-				$solrDoc->setField('page', $logicalUnit['points']);
+                $solrDoc->setField('page', $logicalUnit['points']);
 
-			}
+            }
 
-			if ($logicalUnit['id'] == $doc->toplevelId) {
+            if ($logicalUnit['id'] == $doc->toplevelId) {
 
-				$solrDoc->setField('thumbnail', $doc->thumbnail);
+                $solrDoc->setField('thumbnail', $doc->thumbnail);
 
-			} elseif (!empty($logicalUnit['thumbnailId'])) {
+            } elseif (!empty($logicalUnit['thumbnailId'])) {
 
-				$solrDoc->setField('thumbnail', $doc->getFileLocation($logicalUnit['thumbnailId']));
+                $solrDoc->setField('thumbnail', $doc->getFileLocation($logicalUnit['thumbnailId']));
 
-			}
+            }
 
-			$solrDoc->setField('partof', $doc->parentId);
+            $solrDoc->setField('partof', $doc->parentId);
 
-			$solrDoc->setField('root', $doc->rootId);
+            $solrDoc->setField('root', $doc->rootId);
 
-			$solrDoc->setField('sid', $logicalUnit['id']);
+            $solrDoc->setField('sid', $logicalUnit['id']);
 
-			$solrDoc->setField('toplevel', in_array($logicalUnit['type'], self::$toplevel));
+            $solrDoc->setField('toplevel', in_array($logicalUnit['type'], self::$toplevel));
 
-			$solrDoc->setField('type', $logicalUnit['type'], self::$fields['fieldboost']['type']);
+            $solrDoc->setField('type', $logicalUnit['type'], self::$fields['fieldboost']['type']);
 
-			$solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
+            $solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
 
-			$solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
+            $solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
 
-			$autocomplete = array ();
+            $autocomplete = array ();
 
-			foreach ($metadata as $index_name => $data) {
+            foreach ($metadata as $index_name => $data) {
 
-				if (!empty($data) && substr($index_name, -8) !== '_sorting') {
+                if (!empty($data) && substr($index_name, -8) !== '_sorting') {
 
-					$solrDoc->setField(self::getIndexFieldName($index_name, $doc->pid), $data, self::$fields['fieldboost'][$index_name]);
+                    $solrDoc->setField(self::getIndexFieldName($index_name, $doc->pid), $data, self::$fields['fieldboost'][$index_name]);
 
-					if (in_array($index_name, self::$fields['sortables'])) {
+                    if (in_array($index_name, self::$fields['sortables'])) {
 
-						// Add sortable fields to index.
-						$solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
+                        // Add sortable fields to index.
+                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
 
-					}
+                    }
 
-					if (in_array($index_name, self::$fields['facets'])) {
+                    if (in_array($index_name, self::$fields['facets'])) {
 
-						// Add facets to index.
-						$solrDoc->setField($index_name.'_faceting', $data);
+                        // Add facets to index.
+                        $solrDoc->setField($index_name.'_faceting', $data);
 
-					}
+                    }
 
-					if (in_array($index_name, self::$fields['autocomplete'])) {
+                    if (in_array($index_name, self::$fields['autocomplete'])) {
 
-						$autocomplete = array_merge($autocomplete, $data);
+                        $autocomplete = array_merge($autocomplete, $data);
 
-					}
+                    }
 
-				}
+                }
 
-			}
+            }
 
-			// Add autocomplete values to index.
-			if (!empty($autocomplete)) {
+            // Add autocomplete values to index.
+            if (!empty($autocomplete)) {
 
-				$solrDoc->setField('autocomplete', $autocomplete);
+                $solrDoc->setField('autocomplete', $autocomplete);
 
-			}
+            }
 
-			// Add collection information to logical sub-elements if applicable.
-			if (in_array('collection', self::$fields['facets'])
-				&& empty($metadata['collection'])
-				&& !empty($doc->metadataArray[$doc->toplevelId]['collection'])) {
+            // Add collection information to logical sub-elements if applicable.
+            if (in_array('collection', self::$fields['facets'])
+                && empty($metadata['collection'])
+                && !empty($doc->metadataArray[$doc->toplevelId]['collection'])) {
 
-				$solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
+                $solrDoc->setField('collection_faceting', $doc->metadataArray[$doc->toplevelId]['collection']);
 
-			}
+            }
 
-			try {
+            try {
 
-				self::$solr->service->addDocument($solrDoc);
+                self::$solr->service->addDocument($solrDoc);
 
-			} catch (Exception $e) {
+            } catch (Exception $e) {
 
-				if (!defined('TYPO3_cliMode')) {
+                if (!defined('TYPO3_cliMode')) {
 
-					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-						tx_dlf_helper::getLL('flash.error', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-						TRUE
-					);
+                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.error', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                        TRUE
+                    );
 
-					tx_dlf_helper::addMessage($message);
+                    tx_dlf_helper::addMessage($message);
 
-				}
+                }
 
-				return 1;
+                return 1;
 
-			}
+            }
 
-		}
+        }
 
-		// Check for child elements...
-		if (!empty($logicalUnit['children'])) {
+        // Check for child elements...
+        if (!empty($logicalUnit['children'])) {
 
-			foreach ($logicalUnit['children'] as $child) {
+            foreach ($logicalUnit['children'] as $child) {
 
-				if (!$errors) {
+                if (!$errors) {
 
-					// ...and process them, too.
-					$errors = self::processLogical($doc, $child);
+                    // ...and process them, too.
+                    $errors = self::processLogical($doc, $child);
 
-				} else {
+                } else {
 
-					break;
+                    break;
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		return $errors;
+        return $errors;
 
-	}
+    }
 
-	/**
-	 * Processes a physical unit for the Solr index
-	 *
-	 * @access	protected
-	 *
-	 * @param	tx_dlf_document		&$doc: The METS document
-	 * @param	integer		$page: The page number
-	 * @param	array		$physicalUnit: Array of the physical unit to process
-	 *
-	 * @return	integer		0 on success or 1 on failure
-	 */
-	protected static function processPhysical(tx_dlf_document &$doc, $page, array $physicalUnit) {
+    /**
+     * Processes a physical unit for the Solr index
+     *
+     * @access	protected
+     *
+     * @param	tx_dlf_document		&$doc: The METS document
+     * @param	integer		$page: The page number
+     * @param	array		$physicalUnit: Array of the physical unit to process
+     *
+     * @return	integer		0 on success or 1 on failure
+     */
+    protected static function processPhysical(tx_dlf_document &$doc, $page, array $physicalUnit) {
 
-		$errors = 0;
+        $errors = 0;
 
-		// Read extension configuration.
-		$extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
+        // Read extension configuration.
+        $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
-		if (!empty($physicalUnit['files'][$extConf['fileGrpFulltext']])) {
+        if (!empty($physicalUnit['files'][$extConf['fileGrpFulltext']])) {
 
-			$file = $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpFulltext']]);
+            $file = $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpFulltext']]);
 
-			// Load XML file.
-			if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($file)) {
+            // Load XML file.
+            if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($file)) {
 
-				// Set user-agent to identify self when fetching XML data.
-				if (!empty($extConf['useragent'])) {
+                // Set user-agent to identify self when fetching XML data.
+                if (!empty($extConf['useragent'])) {
 
-					@ini_set('user_agent', $extConf['useragent']);
+                    @ini_set('user_agent', $extConf['useragent']);
 
-				}
+                }
 
-				// Turn off libxml's error logging.
-				$libxmlErrors = libxml_use_internal_errors(TRUE);
+                // Turn off libxml's error logging.
+                $libxmlErrors = libxml_use_internal_errors(TRUE);
 
-				// disable entity loading
-				$previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
+                // disable entity loading
+                $previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
 
-				// Load XML from file.
-				$xml = simplexml_load_string(\TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($file));
+                // Load XML from file.
+                $xml = simplexml_load_string(\TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($file));
 
-				// reset entity loader setting
-				libxml_disable_entity_loader($previousValueOfEntityLoader);
+                // reset entity loader setting
+                libxml_disable_entity_loader($previousValueOfEntityLoader);
 
-				// Reset libxml's error logging.
-				libxml_use_internal_errors($libxmlErrors);
+                // Reset libxml's error logging.
+                libxml_use_internal_errors($libxmlErrors);
 
-				if ($xml === FALSE) {
+                if ($xml === FALSE) {
 
-					return 1;
+                    return 1;
 
-				}
+                }
 
-			} else {
+            } else {
 
-				return 1;
+                return 1;
 
-			}
+            }
 
-			// Load class.
-			if (!class_exists('Apache_Solr_Document')) {
+            // Load class.
+            if (!class_exists('Apache_Solr_Document')) {
 
-				require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
+                require_once(\TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:'.self::$extKey.'/lib/SolrPhpClient/Apache/Solr/Document.php'));
 
-			}
+            }
 
-			// Create new Solr document.
-			$solrDoc = new Apache_Solr_Document();
+            // Create new Solr document.
+            $solrDoc = new Apache_Solr_Document();
 
-			// Create unique identifier from document's UID and unit's XML ID.
-			$solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
+            // Create unique identifier from document's UID and unit's XML ID.
+            $solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
 
-			$solrDoc->setField('uid', $doc->uid);
+            $solrDoc->setField('uid', $doc->uid);
 
-			$solrDoc->setField('pid', $doc->pid);
+            $solrDoc->setField('pid', $doc->pid);
 
-			$solrDoc->setField('page', $page);
+            $solrDoc->setField('page', $page);
 
-			if (!empty($physicalUnit['files'][$extConf['fileGrpThumbs']])) {
+            if (!empty($physicalUnit['files'][$extConf['fileGrpThumbs']])) {
 
-				$solrDoc->setField('thumbnail', $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpThumbs']]));
+                $solrDoc->setField('thumbnail', $doc->getFileLocation($physicalUnit['files'][$extConf['fileGrpThumbs']]));
 
-			}
+            }
 
-			$solrDoc->setField('partof', $doc->parentId);
+            $solrDoc->setField('partof', $doc->parentId);
 
-			$solrDoc->setField('root', $doc->rootId);
+            $solrDoc->setField('root', $doc->rootId);
 
-			$solrDoc->setField('sid', $physicalUnit['id']);
+            $solrDoc->setField('sid', $physicalUnit['id']);
 
-			$solrDoc->setField('toplevel', FALSE);
+            $solrDoc->setField('toplevel', FALSE);
 
-			$solrDoc->setField('type', $physicalUnit['type'], self::$fields['fieldboost']['type']);
+            $solrDoc->setField('type', $physicalUnit['type'], self::$fields['fieldboost']['type']);
 
-			$solrDoc->setField('fulltext', tx_dlf_alto::getRawText($xml));
+            $solrDoc->setField('fulltext', tx_dlf_alto::getRawText($xml));
 
-			// Add faceting information to physical sub-elements if applicable.
-			foreach ($doc->metadataArray[$doc->toplevelId] as $index_name => $data) {
+            // Add faceting information to physical sub-elements if applicable.
+            foreach ($doc->metadataArray[$doc->toplevelId] as $index_name => $data) {
 
-				if (!empty($data) && substr($index_name, -8) !== '_sorting') {
+                if (!empty($data) && substr($index_name, -8) !== '_sorting') {
 
-					if (in_array($index_name, self::$fields['facets'])) {
+                    if (in_array($index_name, self::$fields['facets'])) {
 
-						// Add facets to index.
-						$solrDoc->setField($index_name.'_faceting', $data);
+                        // Add facets to index.
+                        $solrDoc->setField($index_name.'_faceting', $data);
 
-					}
+                    }
 
-				}
+                }
 
-			}
+            }
 
-			try {
+            try {
 
-				self::$solr->service->addDocument($solrDoc);
+                self::$solr->service->addDocument($solrDoc);
 
-			} catch (Exception $e) {
+            } catch (Exception $e) {
 
-				if (!defined('TYPO3_cliMode')) {
+                if (!defined('TYPO3_cliMode')) {
 
-					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
-						tx_dlf_helper::getLL('flash.error', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-						TRUE
-					);
+                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.error', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                        TRUE
+                    );
 
-					tx_dlf_helper::addMessage($message);
+                    tx_dlf_helper::addMessage($message);
 
-				}
+                }
 
-				return 1;
+                return 1;
 
-			}
+            }
 
-		}
+        }
 
-		return $errors;
+        return $errors;
 
-	}
+    }
 
-	/**
-	 * Connects to Solr server.
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$core: UID of the Solr core
-	 * @param	integer		$pid: UID of the configuration page
-	 *
-	 * @return	boolean		TRUE on success or FALSE on failure
-	 */
-	protected static function solrConnect($core, $pid = 0) {
+    /**
+     * Connects to Solr server.
+     *
+     * @access	protected
+     *
+     * @param	integer		$core: UID of the Solr core
+     * @param	integer		$pid: UID of the configuration page
+     *
+     * @return	boolean		TRUE on success or FALSE on failure
+     */
+    protected static function solrConnect($core, $pid = 0) {
 
-		// Get Solr instance.
-		if (!self::$solr) {
+        // Get Solr instance.
+        if (!self::$solr) {
 
-			// Connect to Solr server.
-			if (self::$solr = tx_dlf_solr::getInstance($core)) {
+            // Connect to Solr server.
+            if (self::$solr = tx_dlf_solr::getInstance($core)) {
 
-				// Load indexing configuration if needed.
-				if ($pid) {
+                // Load indexing configuration if needed.
+                if ($pid) {
 
-					self::loadIndexConf($pid);
+                    self::loadIndexConf($pid);
 
-				}
+                }
 
-			} else {
+            } else {
 
-				return FALSE;
+                return FALSE;
 
-			}
+            }
 
-		}
+        }
 
-		return TRUE;
+        return TRUE;
 
-	}
+    }
 
-	/**
-	 * This is a static class, thus no instances should be created
-	 *
-	 * @access private
-	 */
-	private function __construct() {}
+    /**
+     * This is a static class, thus no instances should be created
+     *
+     * @access private
+     */
+    private function __construct() {}
 
 }

dlf/Configuration/TCA/tx_dlf_structures.php

Indentation +151 added lines, -151 removed lines

@@ -10,155 +10,155 @@
  */
 
 return 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',
-		),
-		'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'res/icons/txdlfstructures.png',
-		'rootLevel'	=> 0,
-		'dividers2tabs' => 2,
-		'searchFields' => 'label,index_name,oai_name',
-		'requestUpdate' => 'toplevel',
-	),
-	'feInterface' => array (
-		'fe_admin_fieldList' => '',
-	),
-	'interface' => array (
-		'showRecordFieldList' => 'label,index_name,oai_name,toplevel',
-	),
-	'columns' => array (
-		'sys_language_uid' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'foreign_table' => 'sys_language',
-				'foreign_table_where' => 'ORDER BY sys_language.title',
-				'items' => array (
-					array ('LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1),
-					array ('LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0),
-				),
-				'default' => 0
-			),
-		),
-		'l18n_parent' => array (
-			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'items' => array (
-					array ('', 0),
-				),
-				'foreign_table' => 'tx_dlf_structures',
-				'foreign_table_where' => 'AND tx_dlf_structures.pid=###CURRENT_PID### AND tx_dlf_structures.sys_language_uid IN (-1,0) ORDER BY label ASC',
-			),
-		),
-		'l18n_diffsource' => array (
-			'config' => array (
-				'type' => 'passthrough',
-			),
-		),
-		'hidden' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
-			'config' => array (
-				'type' => 'check',
-				'default' => 0,
-			),
-		),
-		'toplevel' => array (
-			'exclude' => 1,
-			'l10n_mode' => 'exclude',
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.toplevel',
-			'config' => array (
-				'type' => 'check',
-				'default' => 0,
-			),
-		),
-		'label' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.label',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'required,trim',
-			),
-		),
-		'index_name' => array (
-			'exclude' => 1,
-			'l10n_mode' => 'exclude',
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.index_name',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'required,nospace,alphanum_x,uniqueInPid',
-			),
-		),
-		'oai_name' => array (
-			'exclude' => 1,
-			'l10n_mode' => 'exclude',
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.oai_name',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'trim',
-			),
-		),
-		'thumbnail' => array (
-			'exclude' => 1,
-			'l10n_mode' => 'exclude',
-			'displayCond' => 'FIELD:toplevel:REQ:true',
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.thumbnail',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'items' => array (
-					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_structures.thumbnail.self', 0),
-				),
-				'foreign_table' => 'tx_dlf_structures',
-				'foreign_table_where' => 'AND tx_dlf_structures.pid=###CURRENT_PID### AND tx_dlf_structures.toplevel=0 AND tx_dlf_structures.sys_language_uid IN (-1,0) ORDER BY tx_dlf_structures.label',
-				'size' => 1,
-				'minitems' => 0,
-				'maxitems' => 1,
-				'default' => 0,
-			),
-		),
-		'status' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.status',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'items' => array (
-					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_structures.status.default', 0),
-				),
-				'size' => 1,
-				'minitems' => 1,
-				'maxitems' => 1,
-				'default' => 0,
-			),
-		),
-	),
-	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab1, toplevel;;;;1-1-1, label,--palette--;;1, thumbnail, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
-	),
-	'palettes' => array (
-		'1' => array ('showitem' => 'index_name, --linebreak--, oai_name', 'canNotCollapse' => 1),
-	),
+    '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',
+        ),
+        'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'res/icons/txdlfstructures.png',
+        'rootLevel'	=> 0,
+        'dividers2tabs' => 2,
+        'searchFields' => 'label,index_name,oai_name',
+        'requestUpdate' => 'toplevel',
+    ),
+    'feInterface' => array (
+        'fe_admin_fieldList' => '',
+    ),
+    'interface' => array (
+        'showRecordFieldList' => 'label,index_name,oai_name,toplevel',
+    ),
+    'columns' => array (
+        'sys_language_uid' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'foreign_table' => 'sys_language',
+                'foreign_table_where' => 'ORDER BY sys_language.title',
+                'items' => array (
+                    array ('LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1),
+                    array ('LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0),
+                ),
+                'default' => 0
+            ),
+        ),
+        'l18n_parent' => array (
+            'displayCond' => 'FIELD:sys_language_uid:>:0',
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => array (
+                    array ('', 0),
+                ),
+                'foreign_table' => 'tx_dlf_structures',
+                'foreign_table_where' => 'AND tx_dlf_structures.pid=###CURRENT_PID### AND tx_dlf_structures.sys_language_uid IN (-1,0) ORDER BY label ASC',
+            ),
+        ),
+        'l18n_diffsource' => array (
+            'config' => array (
+                'type' => 'passthrough',
+            ),
+        ),
+        'hidden' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'config' => array (
+                'type' => 'check',
+                'default' => 0,
+            ),
+        ),
+        'toplevel' => array (
+            'exclude' => 1,
+            'l10n_mode' => 'exclude',
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.toplevel',
+            'config' => array (
+                'type' => 'check',
+                'default' => 0,
+            ),
+        ),
+        'label' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.label',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'required,trim',
+            ),
+        ),
+        'index_name' => array (
+            'exclude' => 1,
+            'l10n_mode' => 'exclude',
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.index_name',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'required,nospace,alphanum_x,uniqueInPid',
+            ),
+        ),
+        'oai_name' => array (
+            'exclude' => 1,
+            'l10n_mode' => 'exclude',
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.oai_name',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'trim',
+            ),
+        ),
+        'thumbnail' => array (
+            'exclude' => 1,
+            'l10n_mode' => 'exclude',
+            'displayCond' => 'FIELD:toplevel:REQ:true',
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.thumbnail',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => array (
+                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_structures.thumbnail.self', 0),
+                ),
+                'foreign_table' => 'tx_dlf_structures',
+                'foreign_table_where' => 'AND tx_dlf_structures.pid=###CURRENT_PID### AND tx_dlf_structures.toplevel=0 AND tx_dlf_structures.sys_language_uid IN (-1,0) ORDER BY tx_dlf_structures.label',
+                'size' => 1,
+                'minitems' => 0,
+                'maxitems' => 1,
+                'default' => 0,
+            ),
+        ),
+        'status' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_structures.status',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => array (
+                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_structures.status.default', 0),
+                ),
+                'size' => 1,
+                'minitems' => 1,
+                'maxitems' => 1,
+                'default' => 0,
+            ),
+        ),
+    ),
+    'types' => array (
+        '0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab1, toplevel;;;;1-1-1, label,--palette--;;1, thumbnail, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_structures.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
+    ),
+    'palettes' => array (
+        '1' => array ('showitem' => 'index_name, --linebreak--, oai_name', 'canNotCollapse' => 1),
+    ),
 );

dlf/Configuration/TCA/tx_dlf_mail.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     'ctrl' => array (
         'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_mail',
         'label'     => 'label',
-    	'sortby' => 'sorting',
+        'sortby' => 'sorting',
         'delete'	=> 'deleted',
         'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'res/icons/txdlfemail.png',
         'rootLevel'	=> 0,

dlf/Configuration/TCA/tx_dlf_documents.php

Indentation +324 added lines, -324 removed lines

@@ -10,328 +10,328 @@
  */
 
 return 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',
-			'starttime' => 'starttime',
-			'endtime' => 'endtime',
-			'fe_group' => 'fe_group',
-		),
-		'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'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' => '',
-	),
-	'interface' => array (
-		'showRecordFieldList' => 'title,volume,author,year,place,uid,prod_id,location,oai_id,opac_id,union_id,urn',
-		'maxDBListItems' => 25,
-		'maxSingleDBListItems' => 50,
-	),
-	'columns' => array (
-		'hidden' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
-			'config' => array (
-				'type' => 'check',
-				'default' => 0,
-			),
-		),
-		'starttime' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.starttime',
-			'config' => array (
-				'type' => 'input',
-				'size' => '13',
-				'max' => '20',
-				'eval' => 'datetime',
-				'default' => '0',
-			),
-		),
-		'endtime' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.endtime',
-			'config' => array (
-				'type' => 'input',
-				'size' => '13',
-				'max' => '20',
-				'eval' => 'datetime',
-				'default' => '0',
-			),
-		),
-		'fe_group' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.fe_group',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectMultipleSideBySide',
-				'items' => array (
-					array ('LLL:EXT:lang/locallang_general.xml:LGL.hide_at_login', -1),
-					array ('LLL:EXT:lang/locallang_general.xml:LGL.any_login', -2),
-					array ('LLL:EXT:lang/locallang_general.xml:LGL.usergroups', '--div--'),
-				),
-				'foreign_table' => 'fe_groups',
-				'size' => 5,
-				'autoSizeMax' => 15,
-				'minitems' => 0,
-				'maxitems' => 20,
-				'exclusiveKeys' => '-1,-2',
-			),
-		),
-		'prod_id' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.prod_id',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'nospace',
-			),
-		),
-		'location' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.location',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 1024,
-				'eval' => 'required,uniqueInPid',
-			),
-		),
-		'record_id' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.record_id',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'nospace,uniqueInPid',
-			),
-		),
-		'opac_id' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.opac_id',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'nospace',
-			),
-		),
-		'union_id' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.union_id',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'nospace',
-			),
-		),
-		'urn' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.urn',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'nospace',
-			),
-		),
-		'purl' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.purl',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'nospace',
-			),
-		),
-		'title' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.title',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 1024,
-				'eval' => 'trim',
-			),
-		),
-		'title_sorting' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.title_sorting',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 1024,
-				'eval' => 'trim',
-			),
-		),
-		'author' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.author',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'trim',
-			),
-		),
-		'year' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.year',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'trim',
-			),
-		),
-		'place' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.place',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'trim',
-			),
-		),
-		'thumbnail' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.thumbnail',
-			'config' => array (
-				'type' => 'user',
-				'userFunc' => 'EXT:dlf/hooks/class.tx_dlf_tceforms.php:tx_dlf_tceforms->displayThumbnail',
-			),
-		),
-		'metadata' => array (
-			'config' => array (
-				'type' => 'passthrough',
-			),
-		),
-		'metadata_sorting' => array (
-			'config' => array (
-				'type' => 'passthrough',
-			),
-		),
-		'structure' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.structure',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'foreign_table' => 'tx_dlf_structures',
-				'foreign_table_where' => 'AND tx_dlf_structures.pid=###CURRENT_PID### AND tx_dlf_structures.sys_language_uid IN (-1,0) AND tx_dlf_structures.toplevel=1 ORDER BY tx_dlf_structures.label',
-				'size' => 1,
-				'minitems' => 1,
-				'maxitems' => 1,
-			),
-		),
-		'partof' => array (
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.partof',
-			'config' => array (
-				'type' => 'group',
-				'internal_type' => 'db',
-				'allowed' => 'tx_dlf_documents',
-				'prepend_tname' => 0,
-				'size' => 1,
-				'selectedListStyle' => 'width:400px;',
-				'minitems' => 0,
-				'maxitems' => 1,
-				'disable_controls' => 'browser,delete',
-				'default' => 0,
-				'readOnly' => 1,
-			),
-		),
-		'volume' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.volume',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'trim',
-			),
-		),
-		'volume_sorting' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.volume_sorting',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'trim',
-			),
-		),
-		'collections' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.collections',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectMultipleSideBySide',
-				'foreign_table' => 'tx_dlf_collections',
-				'foreign_table_where' => 'AND tx_dlf_collections.pid=###CURRENT_PID### AND tx_dlf_collections.sys_language_uid IN (-1,0) ORDER BY tx_dlf_collections.label',
-				'size' => 5,
-				'autoSizeMax' => 15,
-				'minitems' => 1,
-				'maxitems' => 1024,
-				'MM' => 'tx_dlf_relations',
-				'MM_match_fields' => array (
-					'ident' => 'docs_colls',
-				),
-			),
-		),
-		'owner' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.owner',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'foreign_table' => 'tx_dlf_libraries',
-				'foreign_table_where' => 'AND tx_dlf_libraries.sys_language_uid IN (-1,0) ORDER BY tx_dlf_libraries.label',
-				'size' => 1,
-				'minitems' => 0,
-				'maxitems' => 1,
-			),
-		),
-		'solrcore' => array (
-			'config' => array (
-				'type' => 'passthrough',
-			),
-		),
-		'status' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.status',
-			'config' => array (
-				'type' => 'select',
-				'renderType' => 'selectSingle',
-				'items' => array (
-					array ('LLL:EXT:dlf/locallang.xml:tx_dlf_documents.status.default', 0),
-				),
-				'size' => 1,
-				'minitems' => 1,
-				'maxitems' => 1,
-				'default' => 0,
-			),
-		),
-	),
-	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab1, title,--palette--;;1;;1-1-1, author, year, place, structure,--palette--;;2;;2-2-2, collections;;;;3-3-3, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab2, location;;;;1-1-1, record_id, prod_id;;;;2-2-2, oai_id;;;;3-3-3, opac_id, union_id, urn, purl;;;;4-4-4, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab3, hidden,--palette--;;3;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4'),
-	),
-	'palettes' => array (
-		'1' => array ('showitem' => 'title_sorting', 'canNotCollapse' => 1),
-		'2' => array ('showitem' => 'partof, thumbnail, --linebreak--, volume, volume_sorting', 'canNotCollapse' => 1),
-		'3' => array ('showitem' => 'starttime, endtime', 'canNotCollapse' => 1),
-	)
+    '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',
+        ),
+        'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'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' => '',
+    ),
+    'interface' => array (
+        'showRecordFieldList' => 'title,volume,author,year,place,uid,prod_id,location,oai_id,opac_id,union_id,urn',
+        'maxDBListItems' => 25,
+        'maxSingleDBListItems' => 50,
+    ),
+    'columns' => array (
+        'hidden' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+            'config' => array (
+                'type' => 'check',
+                'default' => 0,
+            ),
+        ),
+        'starttime' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.starttime',
+            'config' => array (
+                'type' => 'input',
+                'size' => '13',
+                'max' => '20',
+                'eval' => 'datetime',
+                'default' => '0',
+            ),
+        ),
+        'endtime' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.endtime',
+            'config' => array (
+                'type' => 'input',
+                'size' => '13',
+                'max' => '20',
+                'eval' => 'datetime',
+                'default' => '0',
+            ),
+        ),
+        'fe_group' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.fe_group',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectMultipleSideBySide',
+                'items' => array (
+                    array ('LLL:EXT:lang/locallang_general.xml:LGL.hide_at_login', -1),
+                    array ('LLL:EXT:lang/locallang_general.xml:LGL.any_login', -2),
+                    array ('LLL:EXT:lang/locallang_general.xml:LGL.usergroups', '--div--'),
+                ),
+                'foreign_table' => 'fe_groups',
+                'size' => 5,
+                'autoSizeMax' => 15,
+                'minitems' => 0,
+                'maxitems' => 20,
+                'exclusiveKeys' => '-1,-2',
+            ),
+        ),
+        'prod_id' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.prod_id',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'nospace',
+            ),
+        ),
+        'location' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.location',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 1024,
+                'eval' => 'required,uniqueInPid',
+            ),
+        ),
+        'record_id' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.record_id',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'nospace,uniqueInPid',
+            ),
+        ),
+        'opac_id' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.opac_id',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'nospace',
+            ),
+        ),
+        'union_id' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.union_id',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'nospace',
+            ),
+        ),
+        'urn' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.urn',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'nospace',
+            ),
+        ),
+        'purl' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.purl',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'nospace',
+            ),
+        ),
+        'title' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.title',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 1024,
+                'eval' => 'trim',
+            ),
+        ),
+        'title_sorting' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.title_sorting',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 1024,
+                'eval' => 'trim',
+            ),
+        ),
+        'author' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.author',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'trim',
+            ),
+        ),
+        'year' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.year',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'trim',
+            ),
+        ),
+        'place' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.place',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'trim',
+            ),
+        ),
+        'thumbnail' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.thumbnail',
+            'config' => array (
+                'type' => 'user',
+                'userFunc' => 'EXT:dlf/hooks/class.tx_dlf_tceforms.php:tx_dlf_tceforms->displayThumbnail',
+            ),
+        ),
+        'metadata' => array (
+            'config' => array (
+                'type' => 'passthrough',
+            ),
+        ),
+        'metadata_sorting' => array (
+            'config' => array (
+                'type' => 'passthrough',
+            ),
+        ),
+        'structure' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.structure',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'foreign_table' => 'tx_dlf_structures',
+                'foreign_table_where' => 'AND tx_dlf_structures.pid=###CURRENT_PID### AND tx_dlf_structures.sys_language_uid IN (-1,0) AND tx_dlf_structures.toplevel=1 ORDER BY tx_dlf_structures.label',
+                'size' => 1,
+                'minitems' => 1,
+                'maxitems' => 1,
+            ),
+        ),
+        'partof' => array (
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.partof',
+            'config' => array (
+                'type' => 'group',
+                'internal_type' => 'db',
+                'allowed' => 'tx_dlf_documents',
+                'prepend_tname' => 0,
+                'size' => 1,
+                'selectedListStyle' => 'width:400px;',
+                'minitems' => 0,
+                'maxitems' => 1,
+                'disable_controls' => 'browser,delete',
+                'default' => 0,
+                'readOnly' => 1,
+            ),
+        ),
+        'volume' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.volume',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'trim',
+            ),
+        ),
+        'volume_sorting' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.volume_sorting',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'trim',
+            ),
+        ),
+        'collections' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.collections',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectMultipleSideBySide',
+                'foreign_table' => 'tx_dlf_collections',
+                'foreign_table_where' => 'AND tx_dlf_collections.pid=###CURRENT_PID### AND tx_dlf_collections.sys_language_uid IN (-1,0) ORDER BY tx_dlf_collections.label',
+                'size' => 5,
+                'autoSizeMax' => 15,
+                'minitems' => 1,
+                'maxitems' => 1024,
+                'MM' => 'tx_dlf_relations',
+                'MM_match_fields' => array (
+                    'ident' => 'docs_colls',
+                ),
+            ),
+        ),
+        'owner' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.owner',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'foreign_table' => 'tx_dlf_libraries',
+                'foreign_table_where' => 'AND tx_dlf_libraries.sys_language_uid IN (-1,0) ORDER BY tx_dlf_libraries.label',
+                'size' => 1,
+                'minitems' => 0,
+                'maxitems' => 1,
+            ),
+        ),
+        'solrcore' => array (
+            'config' => array (
+                'type' => 'passthrough',
+            ),
+        ),
+        'status' => array (
+            'exclude' => 1,
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_documents.status',
+            'config' => array (
+                'type' => 'select',
+                'renderType' => 'selectSingle',
+                'items' => array (
+                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_documents.status.default', 0),
+                ),
+                'size' => 1,
+                'minitems' => 1,
+                'maxitems' => 1,
+                'default' => 0,
+            ),
+        ),
+    ),
+    'types' => array (
+        '0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab1, title,--palette--;;1;;1-1-1, author, year, place, structure,--palette--;;2;;2-2-2, collections;;;;3-3-3, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab2, location;;;;1-1-1, record_id, prod_id;;;;2-2-2, oai_id;;;;3-3-3, opac_id, union_id, urn, purl;;;;4-4-4, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_documents.tab3, hidden,--palette--;;3;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4'),
+    ),
+    'palettes' => array (
+        '1' => array ('showitem' => 'title_sorting', 'canNotCollapse' => 1),
+        '2' => array ('showitem' => 'partof, thumbnail, --linebreak--, volume, volume_sorting', 'canNotCollapse' => 1),
+        '3' => array ('showitem' => 'starttime, endtime', 'canNotCollapse' => 1),
+    )
 );

dlf/Configuration/TCA/tx_dlf_formats.php

Indentation +63 added lines, -63 removed lines

@@ -10,67 +10,67 @@
  */
 
 return 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',
-		'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'res/icons/txdlfformats.png',
-		'rootLevel'	=> 1,
-		'dividers2tabs' => 2,
-		'searchFields' => 'type,class',
-	),
-	'feInterface' => array (
-		'fe_admin_fieldList' => '',
-	),
-  'interface' => array (
-		'showRecordFieldList' => 'type,class',
-	),
-	'columns' => array (
-		'type' => array (
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.type',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'required,nospace,alphanum_x,unique',
-			),
-		),
-		'root' => array (
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.root',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 255,
-				'eval' => 'required,nospace,alphanum_x,unique',
-			),
-		),
-		'namespace' => array (
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.namespace',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 1024,
-				'eval' => 'required,nospace,unique',
-			),
-		),
-		'class' => array (
-			'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.class',
-			'config' => array (
-				'type' => 'input',
-				'size' => 30,
-				'max' => 1024,
-				'eval' => 'nospace,alphanum_x,unique',
-			),
-		),
-	),
-	'types' => array (
-		'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_formats.tab1, type;;;;1-1-1, root;;;;2-2-2, namespace, class;;;;3-3-3'),
-	),
-	'palettes' => array (
-		'1' => array ('showitem' => ''),
-	),
+    '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',
+        'iconfile'	=> \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('dlf').'res/icons/txdlfformats.png',
+        'rootLevel'	=> 1,
+        'dividers2tabs' => 2,
+        'searchFields' => 'type,class',
+    ),
+    'feInterface' => array (
+        'fe_admin_fieldList' => '',
+    ),
+    'interface' => array (
+        'showRecordFieldList' => 'type,class',
+    ),
+    'columns' => array (
+        'type' => array (
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.type',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'required,nospace,alphanum_x,unique',
+            ),
+        ),
+        'root' => array (
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.root',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 255,
+                'eval' => 'required,nospace,alphanum_x,unique',
+            ),
+        ),
+        'namespace' => array (
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.namespace',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 1024,
+                'eval' => 'required,nospace,unique',
+            ),
+        ),
+        'class' => array (
+            'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_formats.class',
+            'config' => array (
+                'type' => 'input',
+                'size' => 30,
+                'max' => 1024,
+                'eval' => 'nospace,alphanum_x,unique',
+            ),
+        ),
+    ),
+    'types' => array (
+        '0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_formats.tab1, type;;;;1-1-1, root;;;;2-2-2, namespace, class;;;;3-3-3'),
+    ),
+    'palettes' => array (
+        '1' => array ('showitem' => ''),
+    ),
 );