@@ -24,8 +24,7 @@ discard block |
||
| 24 | 24 | * @subpackage dlf |
| 25 | 25 | * @access public |
| 26 | 26 | */ |
| 27 | -class ResultDocument |
|
| 28 | -{ |
|
| 27 | +class ResultDocument { |
|
| 29 | 28 | |
| 30 | 29 | /** |
| 31 | 30 | * The identifier |
@@ -134,8 +133,7 @@ discard block |
||
| 134 | 133 | * |
| 135 | 134 | * @return void |
| 136 | 135 | */ |
| 137 | - public function __construct($record, $highlighting, $fields) |
|
| 138 | - { |
|
| 136 | + public function __construct($record, $highlighting, $fields) { |
|
| 139 | 137 | $this->id = $record[$fields['id']]; |
| 140 | 138 | $this->uid = $record[$fields['uid']]; |
| 141 | 139 | $this->page = $record[$fields['page']]; |
@@ -160,8 +158,7 @@ discard block |
||
| 160 | 158 | * |
| 161 | 159 | * @return string The result's record identifier |
| 162 | 160 | */ |
| 163 | - public function getId() |
|
| 164 | - { |
|
| 161 | + public function getId() { |
|
| 165 | 162 | return $this->id; |
| 166 | 163 | } |
| 167 | 164 | |
@@ -172,8 +169,7 @@ discard block |
||
| 172 | 169 | * |
| 173 | 170 | * @return string|null The result's record unified identifier |
| 174 | 171 | */ |
| 175 | - public function getUid() |
|
| 176 | - { |
|
| 172 | + public function getUid() { |
|
| 177 | 173 | return $this->uid; |
| 178 | 174 | } |
| 179 | 175 | |
@@ -184,8 +180,7 @@ discard block |
||
| 184 | 180 | * |
| 185 | 181 | * @return int The result's record page |
| 186 | 182 | */ |
| 187 | - public function getPage() |
|
| 188 | - { |
|
| 183 | + public function getPage() { |
|
| 189 | 184 | return $this->page; |
| 190 | 185 | } |
| 191 | 186 | |
@@ -196,8 +191,7 @@ discard block |
||
| 196 | 191 | * |
| 197 | 192 | * @return string All result's record snippets imploded to one string |
| 198 | 193 | */ |
| 199 | - public function getSnippets() |
|
| 200 | - { |
|
| 194 | + public function getSnippets() { |
|
| 201 | 195 | return $this->snippets; |
| 202 | 196 | } |
| 203 | 197 | |
@@ -208,8 +202,7 @@ discard block |
||
| 208 | 202 | * |
| 209 | 203 | * @return string |
| 210 | 204 | */ |
| 211 | - public function getThumbnail() |
|
| 212 | - { |
|
| 205 | + public function getThumbnail() { |
|
| 213 | 206 | return $this->thumbnail; |
| 214 | 207 | } |
| 215 | 208 | |
@@ -220,8 +213,7 @@ discard block |
||
| 220 | 213 | * |
| 221 | 214 | * @return string |
| 222 | 215 | */ |
| 223 | - public function getTitle() |
|
| 224 | - { |
|
| 216 | + public function getTitle() { |
|
| 225 | 217 | return $this->title; |
| 226 | 218 | } |
| 227 | 219 | |
@@ -232,8 +224,7 @@ discard block |
||
| 232 | 224 | * |
| 233 | 225 | * @return boolean |
| 234 | 226 | */ |
| 235 | - public function getToplevel() |
|
| 236 | - { |
|
| 227 | + public function getToplevel() { |
|
| 237 | 228 | return $this->toplevel; |
| 238 | 229 | } |
| 239 | 230 | |
@@ -244,8 +235,7 @@ discard block |
||
| 244 | 235 | * |
| 245 | 236 | * @return string |
| 246 | 237 | */ |
| 247 | - public function getType() |
|
| 248 | - { |
|
| 238 | + public function getType() { |
|
| 249 | 239 | return $this->type; |
| 250 | 240 | } |
| 251 | 241 | |
@@ -256,8 +246,7 @@ discard block |
||
| 256 | 246 | * |
| 257 | 247 | * @return array(Page) All result's pages which contain search phrase |
| 258 | 248 | */ |
| 259 | - public function getPages() |
|
| 260 | - { |
|
| 249 | + public function getPages() { |
|
| 261 | 250 | return $this->pages; |
| 262 | 251 | } |
| 263 | 252 | |
@@ -268,8 +257,7 @@ discard block |
||
| 268 | 257 | * |
| 269 | 258 | * @return array(Region) All result's regions which contain search phrase |
| 270 | 259 | */ |
| 271 | - public function getRegions() |
|
| 272 | - { |
|
| 260 | + public function getRegions() { |
|
| 273 | 261 | return $this->regions; |
| 274 | 262 | } |
| 275 | 263 | |
@@ -280,8 +268,7 @@ discard block |
||
| 280 | 268 | * |
| 281 | 269 | * @return array(Highlight) All result's highlights of search phrase |
| 282 | 270 | */ |
| 283 | - public function getHighlights() |
|
| 284 | - { |
|
| 271 | + public function getHighlights() { |
|
| 285 | 272 | return $this->highlights; |
| 286 | 273 | } |
| 287 | 274 | |
@@ -292,8 +279,7 @@ discard block |
||
| 292 | 279 | * |
| 293 | 280 | * @return array(string) All result's highlights of search phrase |
| 294 | 281 | */ |
| 295 | - public function getHighlightsIds() |
|
| 296 | - { |
|
| 282 | + public function getHighlightsIds() { |
|
| 297 | 283 | $highlightsIds = []; |
| 298 | 284 | foreach ($this->highlights as $highlight) { |
| 299 | 285 | array_push($highlightsIds, $highlight->getId()); |
@@ -309,8 +295,7 @@ discard block |
||
| 309 | 295 | * |
| 310 | 296 | * @return void |
| 311 | 297 | */ |
| 312 | - private function parseSnippets() |
|
| 313 | - { |
|
| 298 | + private function parseSnippets() { |
|
| 314 | 299 | $snippetArray = $this->getArrayByIndex('text'); |
| 315 | 300 | |
| 316 | 301 | $this->snippets = !empty($snippetArray) ? implode(' [...] ', $snippetArray) : ''; |
@@ -324,8 +309,7 @@ discard block |
||
| 324 | 309 | * |
| 325 | 310 | * @return void |
| 326 | 311 | */ |
| 327 | - private function parsePages() |
|
| 328 | - { |
|
| 312 | + private function parsePages() { |
|
| 329 | 313 | $pageArray = $this->getArrayByIndex('pages'); |
| 330 | 314 | |
| 331 | 315 | $i = 0; |
@@ -345,8 +329,7 @@ discard block |
||
| 345 | 329 | * |
| 346 | 330 | * @return void |
| 347 | 331 | */ |
| 348 | - private function parseRegions() |
|
| 349 | - { |
|
| 332 | + private function parseRegions() { |
|
| 350 | 333 | $regionArray = $this->getArrayByIndex('regions'); |
| 351 | 334 | |
| 352 | 335 | $i = 0; |
@@ -366,8 +349,7 @@ discard block |
||
| 366 | 349 | * |
| 367 | 350 | * @return void |
| 368 | 351 | */ |
| 369 | - private function parseHighlights() |
|
| 370 | - { |
|
| 352 | + private function parseHighlights() { |
|
| 371 | 353 | $highlightArray = $this->getArrayByIndex('highlights'); |
| 372 | 354 | |
| 373 | 355 | foreach ($highlightArray as $highlights) { |
@@ -388,8 +370,7 @@ discard block |
||
| 388 | 370 | * |
| 389 | 371 | * @return array |
| 390 | 372 | */ |
| 391 | - private function getArrayByIndex($index) |
|
| 392 | - { |
|
| 373 | + private function getArrayByIndex($index) { |
|
| 393 | 374 | $objectArray = []; |
| 394 | 375 | foreach ($this->snippetsForRecord as $snippet) { |
| 395 | 376 | if (!empty($snippet[$index])) { |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | * @var boolean |
| 82 | 82 | * @access private |
| 83 | 83 | */ |
| 84 | - private $toplevel = false; |
|
| 84 | + private $toplevel = FALSE; |
|
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | 87 | * The structure type |
@@ -32,8 +32,7 @@ discard block |
||
| 32 | 32 | * @subpackage dlf |
| 33 | 33 | * @access public |
| 34 | 34 | */ |
| 35 | -class Indexer |
|
| 36 | -{ |
|
| 35 | +class Indexer { |
|
| 37 | 36 | /** |
| 38 | 37 | * The extension key |
| 39 | 38 | * |
@@ -93,8 +92,7 @@ discard block |
||
| 93 | 92 | * |
| 94 | 93 | * @return bool true on success or false on failure |
| 95 | 94 | */ |
| 96 | - public static function add(Document $document) |
|
| 97 | - { |
|
| 95 | + public static function add(Document $document) { |
|
| 98 | 96 | if (in_array($document->getUid(), self::$processedDocs)) { |
| 99 | 97 | return true; |
| 100 | 98 | } elseif (self::solrConnect($document->getSolrcore(), $document->getPid())) { |
@@ -209,8 +207,7 @@ discard block |
||
| 209 | 207 | * |
| 210 | 208 | * @return string The field's dynamic index name |
| 211 | 209 | */ |
| 212 | - public static function getIndexFieldName($index_name, $pid = 0) |
|
| 213 | - { |
|
| 210 | + public static function getIndexFieldName($index_name, $pid = 0) { |
|
| 214 | 211 | // Sanitize input. |
| 215 | 212 | $pid = max(intval($pid), 0); |
| 216 | 213 | if (!$pid) { |
@@ -236,8 +233,7 @@ discard block |
||
| 236 | 233 | * |
| 237 | 234 | * @return void |
| 238 | 235 | */ |
| 239 | - protected static function loadIndexConf($pid) |
|
| 240 | - { |
|
| 236 | + protected static function loadIndexConf($pid) { |
|
| 241 | 237 | if (!self::$fieldsLoaded) { |
| 242 | 238 | $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) |
| 243 | 239 | ->getQueryBuilderForTable('tx_dlf_metadata'); |
@@ -307,8 +303,7 @@ discard block |
||
| 307 | 303 | * |
| 308 | 304 | * @return bool true on success or false on failure |
| 309 | 305 | */ |
| 310 | - protected static function processLogical(Document $document, array $logicalUnit) |
|
| 311 | - { |
|
| 306 | + protected static function processLogical(Document $document, array $logicalUnit) { |
|
| 312 | 307 | $success = true; |
| 313 | 308 | $doc = $document->getDoc(); |
| 314 | 309 | $doc->cPid = $document->getPid(); |
@@ -436,8 +431,7 @@ discard block |
||
| 436 | 431 | * |
| 437 | 432 | * @return bool true on success or false on failure |
| 438 | 433 | */ |
| 439 | - protected static function processPhysical(Document $document, $page, array $physicalUnit) |
|
| 440 | - { |
|
| 434 | + protected static function processPhysical(Document $document, $page, array $physicalUnit) { |
|
| 441 | 435 | $doc = $document->getDoc(); |
| 442 | 436 | $doc->cPid = $document->getPid(); |
| 443 | 437 | if ($doc->hasFulltext && $fullText = $doc->getFullText($physicalUnit['id'])) { |
@@ -525,8 +519,7 @@ discard block |
||
| 525 | 519 | * |
| 526 | 520 | * @return bool true on success or false on failure |
| 527 | 521 | */ |
| 528 | - protected static function solrConnect($core, $pid = 0) |
|
| 529 | - { |
|
| 522 | + protected static function solrConnect($core, $pid = 0) { |
|
| 530 | 523 | // Get Solr instance. |
| 531 | 524 | if (!self::$solr) { |
| 532 | 525 | // Connect to Solr server. |
@@ -549,8 +542,7 @@ discard block |
||
| 549 | 542 | * |
| 550 | 543 | * @access private |
| 551 | 544 | */ |
| 552 | - private function __construct() |
|
| 553 | - { |
|
| 545 | + private function __construct() { |
|
| 554 | 546 | // This is a static class, thus no instances should be created. |
| 555 | 547 | } |
| 556 | 548 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $parent->setDoc($doc); |
| 116 | 116 | $success = self::add($parent); |
| 117 | 117 | } else { |
| 118 | - Helper::log('Could not load parent document with UID ' . $document->getDoc()->parentId, LOG_SEVERITY_ERROR); |
|
| 118 | + Helper::log('Could not load parent document with UID '.$document->getDoc()->parentId, LOG_SEVERITY_ERROR); |
|
| 119 | 119 | return false; |
| 120 | 120 | } |
| 121 | 121 | } |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | self::$processedDocs[] = $document->getUid(); |
| 126 | 126 | // Delete old Solr documents. |
| 127 | 127 | $updateQuery = self::$solr->service->createUpdate(); |
| 128 | - $updateQuery->addDeleteQuery('uid:' . $document->getUid()); |
|
| 128 | + $updateQuery->addDeleteQuery('uid:'.$document->getUid()); |
|
| 129 | 129 | self::$solr->service->update($updateQuery); |
| 130 | 130 | |
| 131 | 131 | // Index every logical unit as separate Solr document. |
@@ -174,14 +174,14 @@ discard block |
||
| 174 | 174 | } catch (\Exception $e) { |
| 175 | 175 | if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) { |
| 176 | 176 | Helper::addMessage( |
| 177 | - Helper::getLanguageService()->getLL('flash.solrException') . ' ' . htmlspecialchars($e->getMessage()), |
|
| 177 | + Helper::getLanguageService()->getLL('flash.solrException').' '.htmlspecialchars($e->getMessage()), |
|
| 178 | 178 | Helper::getLanguageService()->getLL('flash.error'), |
| 179 | 179 | FlashMessage::ERROR, |
| 180 | 180 | true, |
| 181 | 181 | 'core.template.flashMessages' |
| 182 | 182 | ); |
| 183 | 183 | } |
| 184 | - Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
|
| 184 | + Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR); |
|
| 185 | 185 | return false; |
| 186 | 186 | } |
| 187 | 187 | } else { |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | // Sanitize input. |
| 215 | 215 | $pid = max(intval($pid), 0); |
| 216 | 216 | if (!$pid) { |
| 217 | - Helper::log('Invalid PID ' . $pid . ' for metadata configuration', LOG_SEVERITY_ERROR); |
|
| 217 | + Helper::log('Invalid PID '.$pid.' for metadata configuration', LOG_SEVERITY_ERROR); |
|
| 218 | 218 | return ''; |
| 219 | 219 | } |
| 220 | 220 | // Load metadata configuration. |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | $suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u'); |
| 224 | 224 | $suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u'); |
| 225 | 225 | $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u'); |
| 226 | - $index_name .= '_' . $suffix; |
|
| 226 | + $index_name .= '_'.$suffix; |
|
| 227 | 227 | return $index_name; |
| 228 | 228 | } |
| 229 | 229 | |
@@ -356,11 +356,11 @@ discard block |
||
| 356 | 356 | $solrDoc->setField(self::getIndexFieldName($index_name, $document->getPid()), $data, self::$fields['fieldboost'][$index_name]); |
| 357 | 357 | if (in_array($index_name, self::$fields['sortables'])) { |
| 358 | 358 | // Add sortable fields to index. |
| 359 | - $solrDoc->setField($index_name . '_sorting', $metadata[$index_name . '_sorting'][0]); |
|
| 359 | + $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]); |
|
| 360 | 360 | } |
| 361 | 361 | if (in_array($index_name, self::$fields['facets'])) { |
| 362 | 362 | // Add facets to index. |
| 363 | - $solrDoc->setField($index_name . '_faceting', $data); |
|
| 363 | + $solrDoc->setField($index_name.'_faceting', $data); |
|
| 364 | 364 | } |
| 365 | 365 | if (in_array($index_name, self::$fields['autocomplete'])) { |
| 366 | 366 | $autocomplete = array_merge($autocomplete, $data); |
@@ -385,14 +385,14 @@ discard block |
||
| 385 | 385 | } catch (\Exception $e) { |
| 386 | 386 | if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) { |
| 387 | 387 | Helper::addMessage( |
| 388 | - Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()), |
|
| 388 | + Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($e->getMessage()), |
|
| 389 | 389 | Helper::getLanguageService()->getLL('flash.error'), |
| 390 | 390 | FlashMessage::ERROR, |
| 391 | 391 | true, |
| 392 | 392 | 'core.template.flashMessages' |
| 393 | 393 | ); |
| 394 | 394 | } |
| 395 | - Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
|
| 395 | + Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR); |
|
| 396 | 396 | return false; |
| 397 | 397 | } |
| 398 | 398 | } |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | $data = self::removeAppendsFromAuthor($data); |
| 459 | 459 | } |
| 460 | 460 | // Add facets to index. |
| 461 | - $solrDoc->setField($index_name . '_faceting', $data); |
|
| 461 | + $solrDoc->setField($index_name.'_faceting', $data); |
|
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | } |
@@ -476,14 +476,14 @@ discard block |
||
| 476 | 476 | } catch (\Exception $e) { |
| 477 | 477 | if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) { |
| 478 | 478 | Helper::addMessage( |
| 479 | - Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()), |
|
| 479 | + Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($e->getMessage()), |
|
| 480 | 480 | Helper::getLanguageService()->getLL('flash.error'), |
| 481 | 481 | FlashMessage::ERROR, |
| 482 | 482 | true, |
| 483 | 483 | 'core.template.flashMessages' |
| 484 | 484 | ); |
| 485 | 485 | } |
| 486 | - Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
|
| 486 | + Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR); |
|
| 487 | 487 | return false; |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | private static function getSolrDocument($updateQuery, $document, $unit, $fullText = '') { |
| 535 | 535 | $solrDoc = $updateQuery->createDocument(); |
| 536 | 536 | // Create unique identifier from document's UID and unit's XML ID. |
| 537 | - $solrDoc->setField('id', $document->getUid() . $unit['id']); |
|
| 537 | + $solrDoc->setField('id', $document->getUid().$unit['id']); |
|
| 538 | 538 | $solrDoc->setField('uid', $document->getUid()); |
| 539 | 539 | $solrDoc->setField('pid', $document->getPid()); |
| 540 | 540 | $solrDoc->setField('partof', $document->getPartof()); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @var bool |
| 67 | 67 | * @access protected |
| 68 | 68 | */ |
| 69 | - protected static $fieldsLoaded = false; |
|
| 69 | + protected static $fieldsLoaded = FALSE; |
|
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * List of already processed documents |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | public static function add(Document $document) |
| 97 | 97 | { |
| 98 | 98 | if (in_array($document->getUid(), self::$processedDocs)) { |
| 99 | - return true; |
|
| 99 | + return TRUE; |
|
| 100 | 100 | } elseif (self::solrConnect($document->getSolrcore(), $document->getPid())) { |
| 101 | - $success = true; |
|
| 101 | + $success = TRUE; |
|
| 102 | 102 | Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_be.xlf'); |
| 103 | 103 | // Handle multi-volume documents. |
| 104 | 104 | if ($parentId = $document->getPartof()) { |
@@ -110,13 +110,13 @@ discard block |
||
| 110 | 110 | $parent = $documentRepository->findByUid($parentId); |
| 111 | 111 | if ($parent) { |
| 112 | 112 | // get XML document of parent |
| 113 | - $doc = Doc::getInstance($parent->getLocation(), ['storagePid' => $parent->getPid()], true); |
|
| 114 | - if ($doc !== null) { |
|
| 113 | + $doc = Doc::getInstance($parent->getLocation(), ['storagePid' => $parent->getPid()], TRUE); |
|
| 114 | + if ($doc !== NULL) { |
|
| 115 | 115 | $parent->setDoc($doc); |
| 116 | 116 | $success = self::add($parent); |
| 117 | 117 | } else { |
| 118 | 118 | Helper::log('Could not load parent document with UID ' . $document->getDoc()->parentId, LOG_SEVERITY_ERROR); |
| 119 | - return false; |
|
| 119 | + return FALSE; |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | sprintf(Helper::getLanguageService()->getLL('flash.documentIndexed'), $document->getTitle(), $document->getUid()), |
| 158 | 158 | Helper::getLanguageService()->getLL('flash.done'), |
| 159 | 159 | FlashMessage::OK, |
| 160 | - true, |
|
| 160 | + TRUE, |
|
| 161 | 161 | 'core.template.flashMessages' |
| 162 | 162 | ); |
| 163 | 163 | } else { |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | sprintf(Helper::getLanguageService()->getLL('flash.documentNotIndexed'), $document->getTitle(), $document->getUid()), |
| 166 | 166 | Helper::getLanguageService()->getLL('flash.error'), |
| 167 | 167 | FlashMessage::ERROR, |
| 168 | - true, |
|
| 168 | + TRUE, |
|
| 169 | 169 | 'core.template.flashMessages' |
| 170 | 170 | ); |
| 171 | 171 | } |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | Helper::getLanguageService()->getLL('flash.solrException') . ' ' . htmlspecialchars($e->getMessage()), |
| 178 | 178 | Helper::getLanguageService()->getLL('flash.error'), |
| 179 | 179 | FlashMessage::ERROR, |
| 180 | - true, |
|
| 180 | + TRUE, |
|
| 181 | 181 | 'core.template.flashMessages' |
| 182 | 182 | ); |
| 183 | 183 | } |
| 184 | 184 | Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
| 185 | - return false; |
|
| 185 | + return FALSE; |
|
| 186 | 186 | } |
| 187 | 187 | } else { |
| 188 | 188 | if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) { |
@@ -190,12 +190,12 @@ discard block |
||
| 190 | 190 | Helper::getLanguageService()->getLL('flash.solrNoConnection'), |
| 191 | 191 | Helper::getLanguageService()->getLL('flash.warning'), |
| 192 | 192 | FlashMessage::WARNING, |
| 193 | - true, |
|
| 193 | + TRUE, |
|
| 194 | 194 | 'core.template.flashMessages' |
| 195 | 195 | ); |
| 196 | 196 | } |
| 197 | 197 | Helper::log('Could not connect to Apache Solr server', LOG_SEVERITY_ERROR); |
| 198 | - return false; |
|
| 198 | + return FALSE; |
|
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | |
@@ -290,10 +290,10 @@ discard block |
||
| 290 | 290 | if ($indexing['index_boost'] > 0.0) { |
| 291 | 291 | self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['index_boost']); |
| 292 | 292 | } else { |
| 293 | - self::$fields['fieldboost'][$indexing['index_name']] = false; |
|
| 293 | + self::$fields['fieldboost'][$indexing['index_name']] = FALSE; |
|
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | - self::$fieldsLoaded = true; |
|
| 296 | + self::$fieldsLoaded = TRUE; |
|
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | protected static function processLogical(Document $document, array $logicalUnit) |
| 311 | 311 | { |
| 312 | - $success = true; |
|
| 312 | + $success = TRUE; |
|
| 313 | 313 | $doc = $document->getDoc(); |
| 314 | 314 | $doc->cPid = $document->getPid(); |
| 315 | 315 | // Get metadata for logical unit. |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | $solrDoc->setField('thumbnail', $doc->getFileLocation($logicalUnit['thumbnailId'])); |
| 334 | 334 | } |
| 335 | 335 | // There can be only one toplevel unit per UID, independently of backend configuration |
| 336 | - $solrDoc->setField('toplevel', $logicalUnit['id'] == $doc->toplevelId ? true : false); |
|
| 336 | + $solrDoc->setField('toplevel', $logicalUnit['id'] == $doc->toplevelId ? TRUE : FALSE); |
|
| 337 | 337 | $solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']); |
| 338 | 338 | $solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']); |
| 339 | 339 | $solrDoc->setField('record_id', $metadata['record_id'][0]); |
@@ -388,12 +388,12 @@ discard block |
||
| 388 | 388 | Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()), |
| 389 | 389 | Helper::getLanguageService()->getLL('flash.error'), |
| 390 | 390 | FlashMessage::ERROR, |
| 391 | - true, |
|
| 391 | + TRUE, |
|
| 392 | 392 | 'core.template.flashMessages' |
| 393 | 393 | ); |
| 394 | 394 | } |
| 395 | 395 | Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
| 396 | - return false; |
|
| 396 | + return FALSE; |
|
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | 399 | // Check for child elements... |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | break; |
| 440 | 440 | } |
| 441 | 441 | } |
| 442 | - $solrDoc->setField('toplevel', false); |
|
| 442 | + $solrDoc->setField('toplevel', FALSE); |
|
| 443 | 443 | $solrDoc->setField('type', $physicalUnit['type'], self::$fields['fieldboost']['type']); |
| 444 | 444 | $solrDoc->setField('collection', $doc->metadataArray[$doc->toplevelId]['collection']); |
| 445 | 445 | |
@@ -479,15 +479,15 @@ discard block |
||
| 479 | 479 | Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()), |
| 480 | 480 | Helper::getLanguageService()->getLL('flash.error'), |
| 481 | 481 | FlashMessage::ERROR, |
| 482 | - true, |
|
| 482 | + TRUE, |
|
| 483 | 483 | 'core.template.flashMessages' |
| 484 | 484 | ); |
| 485 | 485 | } |
| 486 | 486 | Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
| 487 | - return false; |
|
| 487 | + return FALSE; |
|
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | - return true; |
|
| 490 | + return TRUE; |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | /** |
@@ -513,10 +513,10 @@ discard block |
||
| 513 | 513 | self::loadIndexConf($pid); |
| 514 | 514 | } |
| 515 | 515 | } else { |
| 516 | - return false; |
|
| 516 | + return FALSE; |
|
| 517 | 517 | } |
| 518 | 518 | } |
| 519 | - return true; |
|
| 519 | + return TRUE; |
|
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | /** |
@@ -569,14 +569,14 @@ discard block |
||
| 569 | 569 | if ($fileContent !== false) { |
| 570 | 570 | $textFormat = $this->getTextFormat($fileContent); |
| 571 | 571 | } else { |
| 572 | - $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"'); |
|
| 572 | + $this->logger->warning('Couldn\'t load full text file for structure node @ID "'.$id.'"'); |
|
| 573 | 573 | return $fullText; |
| 574 | 574 | } |
| 575 | 575 | break; |
| 576 | 576 | } |
| 577 | 577 | } |
| 578 | 578 | } else { |
| 579 | - $this->logger->warning('Invalid structure node @ID "' . $id . '"'); |
|
| 579 | + $this->logger->warning('Invalid structure node @ID "'.$id.'"'); |
|
| 580 | 580 | return $fullText; |
| 581 | 581 | } |
| 582 | 582 | // Is this text format supported? |
@@ -595,12 +595,12 @@ discard block |
||
| 595 | 595 | $textMiniOcr = $obj->getTextAsMiniOcr($ocrTextXml); |
| 596 | 596 | $this->rawTextArray[$id] = $textMiniOcr; |
| 597 | 597 | } else { |
| 598 | - $this->logger->warning('Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"'); |
|
| 598 | + $this->logger->warning('Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"'); |
|
| 599 | 599 | } |
| 600 | 600 | } |
| 601 | 601 | $fullText = $textMiniOcr; |
| 602 | 602 | } else { |
| 603 | - $this->logger->warning('Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"'); |
|
| 603 | + $this->logger->warning('Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"'); |
|
| 604 | 604 | } |
| 605 | 605 | return $fullText; |
| 606 | 606 | } |
@@ -674,10 +674,10 @@ discard block |
||
| 674 | 674 | $title = self::getTitle($partof, true); |
| 675 | 675 | } |
| 676 | 676 | } else { |
| 677 | - Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING); |
|
| 677 | + Helper::log('No document with UID '.$uid.' found or document not accessible', LOG_SEVERITY_WARNING); |
|
| 678 | 678 | } |
| 679 | 679 | } else { |
| 680 | - Helper::log('Invalid UID ' . $uid . ' for document', LOG_SEVERITY_ERROR); |
|
| 680 | + Helper::log('Invalid UID '.$uid.' for document', LOG_SEVERITY_ERROR); |
|
| 681 | 681 | } |
| 682 | 682 | return $title; |
| 683 | 683 | } |
@@ -808,7 +808,7 @@ discard block |
||
| 808 | 808 | // the actual loading is format specific |
| 809 | 809 | return $this->loadLocation($location); |
| 810 | 810 | } else { |
| 811 | - $this->logger->error('Invalid file location "' . $location . '" for document loading'); |
|
| 811 | + $this->logger->error('Invalid file location "'.$location.'" for document loading'); |
|
| 812 | 812 | } |
| 813 | 813 | return false; |
| 814 | 814 | } |
@@ -949,7 +949,7 @@ discard block |
||
| 949 | 949 | // Set metadata definitions' PID. |
| 950 | 950 | $cPid = ($this->cPid ? $this->cPid : $this->pid); |
| 951 | 951 | if (!$cPid) { |
| 952 | - $this->logger->error('Invalid PID ' . $cPid . ' for metadata definitions'); |
|
| 952 | + $this->logger->error('Invalid PID '.$cPid.' for metadata definitions'); |
|
| 953 | 953 | return []; |
| 954 | 954 | } |
| 955 | 955 | if ( |
@@ -1184,12 +1184,12 @@ discard block |
||
| 1184 | 1184 | */ |
| 1185 | 1185 | public function __get($var) |
| 1186 | 1186 | { |
| 1187 | - $method = '_get' . ucfirst($var); |
|
| 1187 | + $method = '_get'.ucfirst($var); |
|
| 1188 | 1188 | if ( |
| 1189 | 1189 | !property_exists($this, $var) |
| 1190 | 1190 | || !method_exists($this, $method) |
| 1191 | 1191 | ) { |
| 1192 | - $this->logger->warning('There is no getter function for property "' . $var . '"'); |
|
| 1192 | + $this->logger->warning('There is no getter function for property "'.$var.'"'); |
|
| 1193 | 1193 | return; |
| 1194 | 1194 | } else { |
| 1195 | 1195 | return $this->$method(); |
@@ -1222,12 +1222,12 @@ discard block |
||
| 1222 | 1222 | */ |
| 1223 | 1223 | public function __set($var, $value) |
| 1224 | 1224 | { |
| 1225 | - $method = '_set' . ucfirst($var); |
|
| 1225 | + $method = '_set'.ucfirst($var); |
|
| 1226 | 1226 | if ( |
| 1227 | 1227 | !property_exists($this, $var) |
| 1228 | 1228 | || !method_exists($this, $method) |
| 1229 | 1229 | ) { |
| 1230 | - $this->logger->warning('There is no setter function for property "' . $var . '"'); |
|
| 1230 | + $this->logger->warning('There is no setter function for property "'.$var.'"'); |
|
| 1231 | 1231 | } else { |
| 1232 | 1232 | $this->$method($value); |
| 1233 | 1233 | } |
@@ -49,8 +49,7 @@ discard block |
||
| 49 | 49 | * @property-read string $toplevelId This holds the toplevel structure's "@ID" (METS) or the manifest's "@id" (IIIF) |
| 50 | 50 | * @abstract |
| 51 | 51 | */ |
| 52 | -abstract class Doc |
|
| 53 | -{ |
|
| 52 | +abstract class Doc { |
|
| 54 | 53 | /** |
| 55 | 54 | * This holds the logger |
| 56 | 55 | * |
@@ -326,8 +325,7 @@ discard block |
||
| 326 | 325 | * |
| 327 | 326 | * @return void |
| 328 | 327 | */ |
| 329 | - public static function clearRegistry() |
|
| 330 | - { |
|
| 328 | + public static function clearRegistry() { |
|
| 331 | 329 | // Reset registry array. |
| 332 | 330 | self::$registry = []; |
| 333 | 331 | } |
@@ -505,8 +503,7 @@ discard block |
||
| 505 | 503 | * |
| 506 | 504 | * @return int The physical page number |
| 507 | 505 | */ |
| 508 | - public function getPhysicalPage($logicalPage) |
|
| 509 | - { |
|
| 506 | + public function getPhysicalPage($logicalPage) { |
|
| 510 | 507 | if ( |
| 511 | 508 | !empty($this->lastSearchedPhysicalPage['logicalPage']) |
| 512 | 509 | && $this->lastSearchedPhysicalPage['logicalPage'] == $logicalPage |
@@ -551,8 +548,7 @@ discard block |
||
| 551 | 548 | * |
| 552 | 549 | * @return string The OCR full text |
| 553 | 550 | */ |
| 554 | - protected function getFullTextFromXml($id) |
|
| 555 | - { |
|
| 551 | + protected function getFullTextFromXml($id) { |
|
| 556 | 552 | $fullText = ''; |
| 557 | 553 | // Load available text formats, ... |
| 558 | 554 | $this->loadFormats(); |
@@ -614,8 +610,7 @@ discard block |
||
| 614 | 610 | * |
| 615 | 611 | * @return string The format of the OCR full text |
| 616 | 612 | */ |
| 617 | - private function getTextFormat($fileContent) |
|
| 618 | - { |
|
| 613 | + private function getTextFormat($fileContent) { |
|
| 619 | 614 | $xml = Helper::getXmlFileAsString($fileContent); |
| 620 | 615 | |
| 621 | 616 | if ($xml !== false) { |
@@ -638,8 +633,7 @@ discard block |
||
| 638 | 633 | * |
| 639 | 634 | * @return string The title of the document itself or a parent document |
| 640 | 635 | */ |
| 641 | - public static function getTitle($uid, $recursive = false) |
|
| 642 | - { |
|
| 636 | + public static function getTitle($uid, $recursive = false) { |
|
| 643 | 637 | $title = ''; |
| 644 | 638 | // Sanitize input. |
| 645 | 639 | $uid = max(intval($uid), 0); |
@@ -691,8 +685,7 @@ discard block |
||
| 691 | 685 | * |
| 692 | 686 | * @return array The logical structure node's / resource's parsed metadata array |
| 693 | 687 | */ |
| 694 | - public function getTitledata($cPid = 0) |
|
| 695 | - { |
|
| 688 | + public function getTitledata($cPid = 0) { |
|
| 696 | 689 | $titledata = $this->getMetadata($this->_getToplevelId(), $cPid); |
| 697 | 690 | // Add information from METS structural map to titledata array. |
| 698 | 691 | if ($this instanceof MetsDocument) { |
@@ -725,8 +718,7 @@ discard block |
||
| 725 | 718 | * @return int|bool: false if structure with $logId is not a child of this substructure, |
| 726 | 719 | * or the actual depth. |
| 727 | 720 | */ |
| 728 | - protected function getTreeDepth($structure, $depth, $logId) |
|
| 729 | - { |
|
| 721 | + protected function getTreeDepth($structure, $depth, $logId) { |
|
| 730 | 722 | foreach ($structure as $element) { |
| 731 | 723 | if ($element['id'] == $logId) { |
| 732 | 724 | return $depth; |
@@ -748,8 +740,7 @@ discard block |
||
| 748 | 740 | * @param string $logId: The id of the logical structure element whose depth is requested |
| 749 | 741 | * @return int|bool tree depth as integer or false if no element with $logId exists within the TOC. |
| 750 | 742 | */ |
| 751 | - public function getStructureDepth($logId) |
|
| 752 | - { |
|
| 743 | + public function getStructureDepth($logId) { |
|
| 753 | 744 | return $this->getTreeDepth($this->_getTableOfContents(), 1, $logId); |
| 754 | 745 | } |
| 755 | 746 | |
@@ -801,8 +792,7 @@ discard block |
||
| 801 | 792 | * |
| 802 | 793 | * @return bool true on success or false on failure |
| 803 | 794 | */ |
| 804 | - protected function load($location) |
|
| 805 | - { |
|
| 795 | + protected function load($location) { |
|
| 806 | 796 | // Load XML / JSON-LD file. |
| 807 | 797 | if (GeneralUtility::isValidUrl($location)) { |
| 808 | 798 | // the actual loading is format specific |
@@ -829,8 +819,7 @@ discard block |
||
| 829 | 819 | * |
| 830 | 820 | * @return void |
| 831 | 821 | */ |
| 832 | - protected function loadFormats() |
|
| 833 | - { |
|
| 822 | + protected function loadFormats() { |
|
| 834 | 823 | if (!$this->formatsLoaded) { |
| 835 | 824 | $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) |
| 836 | 825 | ->getQueryBuilderForTable('tx_dlf_formats'); |
@@ -870,8 +859,7 @@ discard block |
||
| 870 | 859 | * |
| 871 | 860 | * @return void |
| 872 | 861 | */ |
| 873 | - public function registerNamespaces(&$obj) |
|
| 874 | - { |
|
| 862 | + public function registerNamespaces(&$obj) { |
|
| 875 | 863 | // TODO Check usage. XML specific method does not seem to be used anywhere outside this class within the project, but it is public and may be used by extensions. |
| 876 | 864 | $this->loadFormats(); |
| 877 | 865 | // Do we have a \SimpleXMLElement or \DOMXPath object? |
@@ -896,8 +884,7 @@ discard block |
||
| 896 | 884 | * |
| 897 | 885 | * @return int The PID of the metadata definitions |
| 898 | 886 | */ |
| 899 | - protected function _getCPid() |
|
| 900 | - { |
|
| 887 | + protected function _getCPid() { |
|
| 901 | 888 | return $this->cPid; |
| 902 | 889 | } |
| 903 | 890 | |
@@ -908,8 +895,7 @@ discard block |
||
| 908 | 895 | * |
| 909 | 896 | * @return bool Are there any fulltext files available? |
| 910 | 897 | */ |
| 911 | - protected function _getHasFulltext() |
|
| 912 | - { |
|
| 898 | + protected function _getHasFulltext() { |
|
| 913 | 899 | $this->ensureHasFulltextIsSet(); |
| 914 | 900 | return $this->hasFulltext; |
| 915 | 901 | } |
@@ -921,8 +907,7 @@ discard block |
||
| 921 | 907 | * |
| 922 | 908 | * @return string The location of the document |
| 923 | 909 | */ |
| 924 | - protected function _getLocation() |
|
| 925 | - { |
|
| 910 | + protected function _getLocation() { |
|
| 926 | 911 | return $this->location; |
| 927 | 912 | } |
| 928 | 913 | |
@@ -944,8 +929,7 @@ discard block |
||
| 944 | 929 | * |
| 945 | 930 | * @return array Array of metadata with their corresponding logical structure node ID as key |
| 946 | 931 | */ |
| 947 | - protected function _getMetadataArray() |
|
| 948 | - { |
|
| 932 | + protected function _getMetadataArray() { |
|
| 949 | 933 | // Set metadata definitions' PID. |
| 950 | 934 | $cPid = ($this->cPid ? $this->cPid : $this->pid); |
| 951 | 935 | if (!$cPid) { |
@@ -970,8 +954,7 @@ discard block |
||
| 970 | 954 | * |
| 971 | 955 | * @return int The total number of pages and/or tracks |
| 972 | 956 | */ |
| 973 | - protected function _getNumPages() |
|
| 974 | - { |
|
| 957 | + protected function _getNumPages() { |
|
| 975 | 958 | $this->_getPhysicalStructure(); |
| 976 | 959 | return $this->numPages; |
| 977 | 960 | } |
@@ -983,8 +966,7 @@ discard block |
||
| 983 | 966 | * |
| 984 | 967 | * @return int The UID of the parent document or zero if not applicable |
| 985 | 968 | */ |
| 986 | - protected function _getParentId() |
|
| 987 | - { |
|
| 969 | + protected function _getParentId() { |
|
| 988 | 970 | return $this->parentId; |
| 989 | 971 | } |
| 990 | 972 | |
@@ -1007,8 +989,7 @@ discard block |
||
| 1007 | 989 | * |
| 1008 | 990 | * @return array Array of elements' type, label and file representations ordered by "@ID" attribute / Canvas order |
| 1009 | 991 | */ |
| 1010 | - protected function _getPhysicalStructureInfo() |
|
| 1011 | - { |
|
| 992 | + protected function _getPhysicalStructureInfo() { |
|
| 1012 | 993 | // Is there no physical structure array yet? |
| 1013 | 994 | if (!$this->physicalStructureLoaded) { |
| 1014 | 995 | // Build physical structure array. |
@@ -1024,8 +1005,7 @@ discard block |
||
| 1024 | 1005 | * |
| 1025 | 1006 | * @return int The PID of the document or zero if not in database |
| 1026 | 1007 | */ |
| 1027 | - protected function _getPid() |
|
| 1028 | - { |
|
| 1008 | + protected function _getPid() { |
|
| 1029 | 1009 | return $this->pid; |
| 1030 | 1010 | } |
| 1031 | 1011 | |
@@ -1036,8 +1016,7 @@ discard block |
||
| 1036 | 1016 | * |
| 1037 | 1017 | * @return bool Is the document instantiated successfully? |
| 1038 | 1018 | */ |
| 1039 | - protected function _getReady() |
|
| 1040 | - { |
|
| 1019 | + protected function _getReady() { |
|
| 1041 | 1020 | return $this->ready; |
| 1042 | 1021 | } |
| 1043 | 1022 | |
@@ -1048,8 +1027,7 @@ discard block |
||
| 1048 | 1027 | * |
| 1049 | 1028 | * @return mixed The METS file's / IIIF manifest's record identifier |
| 1050 | 1029 | */ |
| 1051 | - protected function _getRecordId() |
|
| 1052 | - { |
|
| 1030 | + protected function _getRecordId() { |
|
| 1053 | 1031 | return $this->recordId; |
| 1054 | 1032 | } |
| 1055 | 1033 | |
@@ -1060,8 +1038,7 @@ discard block |
||
| 1060 | 1038 | * |
| 1061 | 1039 | * @return int The UID of the root document or zero if not applicable |
| 1062 | 1040 | */ |
| 1063 | - protected function _getRootId() |
|
| 1064 | - { |
|
| 1041 | + protected function _getRootId() { |
|
| 1065 | 1042 | if (!$this->rootIdLoaded) { |
| 1066 | 1043 | if ($this->parentId) { |
| 1067 | 1044 | $parent = self::getInstance($this->parentId, ['storagePid' => $this->pid]); |
@@ -1091,8 +1068,7 @@ discard block |
||
| 1091 | 1068 | * |
| 1092 | 1069 | * @return array Array of structure nodes' id, label, type and physical page indexes/mptr / Canvas link with original hierarchy preserved |
| 1093 | 1070 | */ |
| 1094 | - protected function _getTableOfContents() |
|
| 1095 | - { |
|
| 1071 | + protected function _getTableOfContents() { |
|
| 1096 | 1072 | // Is there no logical structure array yet? |
| 1097 | 1073 | if (!$this->tableOfContentsLoaded) { |
| 1098 | 1074 | // Get all logical structures. |
@@ -1133,8 +1109,7 @@ discard block |
||
| 1133 | 1109 | * |
| 1134 | 1110 | * @return mixed The UID or the URL of the document |
| 1135 | 1111 | */ |
| 1136 | - protected function _getUid() |
|
| 1137 | - { |
|
| 1112 | + protected function _getUid() { |
|
| 1138 | 1113 | return $this->uid; |
| 1139 | 1114 | } |
| 1140 | 1115 | |
@@ -1147,8 +1122,7 @@ discard block |
||
| 1147 | 1122 | * |
| 1148 | 1123 | * @return void |
| 1149 | 1124 | */ |
| 1150 | - protected function _setCPid($value) |
|
| 1151 | - { |
|
| 1125 | + protected function _setCPid($value) { |
|
| 1152 | 1126 | $this->cPid = max(intval($value), 0); |
| 1153 | 1127 | } |
| 1154 | 1128 | |
@@ -1165,8 +1139,7 @@ discard block |
||
| 1165 | 1139 | * |
| 1166 | 1140 | * @return void |
| 1167 | 1141 | */ |
| 1168 | - protected function __construct($location, $pid, $preloadedDocument) |
|
| 1169 | - { |
|
| 1142 | + protected function __construct($location, $pid, $preloadedDocument) { |
|
| 1170 | 1143 | $this->setPreloadedDocument($preloadedDocument); |
| 1171 | 1144 | $this->init($location); |
| 1172 | 1145 | $this->establishRecordId($pid); |
@@ -1182,8 +1155,7 @@ discard block |
||
| 1182 | 1155 | * |
| 1183 | 1156 | * @return mixed Value of $this->$var |
| 1184 | 1157 | */ |
| 1185 | - public function __get($var) |
|
| 1186 | - { |
|
| 1158 | + public function __get($var) { |
|
| 1187 | 1159 | $method = '_get' . ucfirst($var); |
| 1188 | 1160 | if ( |
| 1189 | 1161 | !property_exists($this, $var) |
@@ -1205,8 +1177,7 @@ discard block |
||
| 1205 | 1177 | * |
| 1206 | 1178 | * @return bool true if variable is set and not empty, false otherwise |
| 1207 | 1179 | */ |
| 1208 | - public function __isset($var) |
|
| 1209 | - { |
|
| 1180 | + public function __isset($var) { |
|
| 1210 | 1181 | return !empty($this->__get($var)); |
| 1211 | 1182 | } |
| 1212 | 1183 | |
@@ -1220,8 +1191,7 @@ discard block |
||
| 1220 | 1191 | * |
| 1221 | 1192 | * @return void |
| 1222 | 1193 | */ |
| 1223 | - public function __set($var, $value) |
|
| 1224 | - { |
|
| 1194 | + public function __set($var, $value) { |
|
| 1225 | 1195 | $method = '_set' . ucfirst($var); |
| 1226 | 1196 | if ( |
| 1227 | 1197 | !property_exists($this, $var) |
@@ -1239,8 +1209,7 @@ discard block |
||
| 1239 | 1209 | * @param string $location |
| 1240 | 1210 | * @return Doc|false |
| 1241 | 1211 | */ |
| 1242 | - private static function getDocCache(string $location) |
|
| 1243 | - { |
|
| 1212 | + private static function getDocCache(string $location) { |
|
| 1244 | 1213 | $cacheIdentifier = md5($location); |
| 1245 | 1214 | $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_doc'); |
| 1246 | 1215 | $cacheHit = $cache->get($cacheIdentifier); |
@@ -1255,8 +1224,7 @@ discard block |
||
| 1255 | 1224 | * @param Doc $doc |
| 1256 | 1225 | * @return void |
| 1257 | 1226 | */ |
| 1258 | - private static function setDocCache(string $location, Doc $doc) |
|
| 1259 | - { |
|
| 1227 | + private static function setDocCache(string $location, Doc $doc) { |
|
| 1260 | 1228 | $cacheIdentifier = md5($location); |
| 1261 | 1229 | $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_doc'); |
| 1262 | 1230 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @var bool |
| 105 | 105 | * @access protected |
| 106 | 106 | */ |
| 107 | - protected $formatsLoaded = false; |
|
| 107 | + protected $formatsLoaded = FALSE; |
|
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | 110 | * Are there any fulltext files available? This also includes IIIF text annotations |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * @var bool |
| 115 | 115 | * @access protected |
| 116 | 116 | */ |
| 117 | - protected $hasFulltext = false; |
|
| 117 | + protected $hasFulltext = FALSE; |
|
| 118 | 118 | |
| 119 | 119 | /** |
| 120 | 120 | * Last searched logical and physical page |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | * @var array |
| 123 | 123 | * @access protected |
| 124 | 124 | */ |
| 125 | - protected $lastSearchedPhysicalPage = ['logicalPage' => null, 'physicalPage' => null]; |
|
| 125 | + protected $lastSearchedPhysicalPage = ['logicalPage' => NULL, 'physicalPage' => NULL]; |
|
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | 128 | * This holds the logical units |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * @var bool |
| 149 | 149 | * @access protected |
| 150 | 150 | */ |
| 151 | - protected $metadataArrayLoaded = false; |
|
| 151 | + protected $metadataArrayLoaded = FALSE; |
|
| 152 | 152 | |
| 153 | 153 | /** |
| 154 | 154 | * The holds the total number of pages |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | * @var bool |
| 190 | 190 | * @access protected |
| 191 | 191 | */ |
| 192 | - protected $physicalStructureLoaded = false; |
|
| 192 | + protected $physicalStructureLoaded = FALSE; |
|
| 193 | 193 | |
| 194 | 194 | /** |
| 195 | 195 | * This holds the PID of the document or zero if not in database |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | * @var bool |
| 215 | 215 | * @access protected |
| 216 | 216 | */ |
| 217 | - protected $ready = false; |
|
| 217 | + protected $ready = FALSE; |
|
| 218 | 218 | |
| 219 | 219 | /** |
| 220 | 220 | * The METS file's / IIIF manifest's record identifier |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * @var bool |
| 249 | 249 | * @access protected |
| 250 | 250 | */ |
| 251 | - protected $rootIdLoaded = false; |
|
| 251 | + protected $rootIdLoaded = FALSE; |
|
| 252 | 252 | |
| 253 | 253 | /** |
| 254 | 254 | * This holds the smLinks between logical and physical structMap |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | * @var bool |
| 266 | 266 | * @access protected |
| 267 | 267 | */ |
| 268 | - protected $smLinksLoaded = false; |
|
| 268 | + protected $smLinksLoaded = FALSE; |
|
| 269 | 269 | |
| 270 | 270 | /** |
| 271 | 271 | * This holds the logical structure |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * @var bool |
| 283 | 283 | * @access protected |
| 284 | 284 | */ |
| 285 | - protected $tableOfContentsLoaded = false; |
|
| 285 | + protected $tableOfContentsLoaded = FALSE; |
|
| 286 | 286 | |
| 287 | 287 | /** |
| 288 | 288 | * This holds the document's thumbnail location |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | * @var bool |
| 300 | 300 | * @access protected |
| 301 | 301 | */ |
| 302 | - protected $thumbnailLoaded = false; |
|
| 302 | + protected $thumbnailLoaded = FALSE; |
|
| 303 | 303 | |
| 304 | 304 | /** |
| 305 | 305 | * This holds the toplevel structure's "@ID" (METS) or the manifest's "@id" (IIIF) |
@@ -408,17 +408,17 @@ discard block |
||
| 408 | 408 | * |
| 409 | 409 | * @return \Kitodo\Dlf\Common\Doc|null Instance of this class, either MetsDocument or IiifManifest |
| 410 | 410 | */ |
| 411 | - public static function &getInstance($location, $settings = [], $forceReload = false) |
|
| 411 | + public static function &getInstance($location, $settings = [], $forceReload = FALSE) |
|
| 412 | 412 | { |
| 413 | 413 | // Create new instance depending on format (METS or IIIF) ... |
| 414 | - $documentFormat = null; |
|
| 415 | - $xml = null; |
|
| 416 | - $iiif = null; |
|
| 414 | + $documentFormat = NULL; |
|
| 415 | + $xml = NULL; |
|
| 416 | + $iiif = NULL; |
|
| 417 | 417 | |
| 418 | 418 | if ($instance = self::getDocCache($location)) { |
| 419 | 419 | return $instance; |
| 420 | 420 | } else { |
| 421 | - $instance = null; |
|
| 421 | + $instance = NULL; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | // Try to load a file from the url |
@@ -427,17 +427,17 @@ discard block |
||
| 427 | 427 | $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey); |
| 428 | 428 | |
| 429 | 429 | $content = Helper::getUrl($location); |
| 430 | - if ($content !== false) { |
|
| 430 | + if ($content !== FALSE) { |
|
| 431 | 431 | $xml = Helper::getXmlFileAsString($content); |
| 432 | - if ($xml !== false) { |
|
| 432 | + if ($xml !== FALSE) { |
|
| 433 | 433 | /* @var $xml \SimpleXMLElement */ |
| 434 | 434 | $xml->registerXPathNamespace('mets', 'http://www.loc.gov/METS/'); |
| 435 | 435 | $xpathResult = $xml->xpath('//mets:mets'); |
| 436 | - $documentFormat = !empty($xpathResult) ? 'METS' : null; |
|
| 436 | + $documentFormat = !empty($xpathResult) ? 'METS' : NULL; |
|
| 437 | 437 | } else { |
| 438 | 438 | // Try to load file as IIIF resource instead. |
| 439 | - $contentAsJsonArray = json_decode($content, true); |
|
| 440 | - if ($contentAsJsonArray !== null) { |
|
| 439 | + $contentAsJsonArray = json_decode($content, TRUE); |
|
| 440 | + if ($contentAsJsonArray !== NULL) { |
|
| 441 | 441 | IiifHelper::setUrlReader(IiifUrlReader::getInstance()); |
| 442 | 442 | IiifHelper::setMaxThumbnailHeight($extConf['iiifThumbnailHeight']); |
| 443 | 443 | IiifHelper::setMaxThumbnailWidth($extConf['iiifThumbnailWidth']); |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | * |
| 479 | 479 | * @return array Array of the element's id, label, type and physical page indexes/mptr link |
| 480 | 480 | */ |
| 481 | - public abstract function getLogicalStructure($id, $recursive = false); |
|
| 481 | + public abstract function getLogicalStructure($id, $recursive = FALSE); |
|
| 482 | 482 | |
| 483 | 483 | /** |
| 484 | 484 | * This extracts all the metadata for a logical structure node |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | } else { |
| 516 | 516 | $physicalPage = 0; |
| 517 | 517 | foreach ($this->physicalStructureInfo as $page) { |
| 518 | - if (strpos($page['orderlabel'], $logicalPage) !== false) { |
|
| 518 | + if (strpos($page['orderlabel'], $logicalPage) !== FALSE) { |
|
| 519 | 519 | $this->lastSearchedPhysicalPage['logicalPage'] = $logicalPage; |
| 520 | 520 | $this->lastSearchedPhysicalPage['physicalPage'] = $physicalPage; |
| 521 | 521 | return $physicalPage; |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | if (!empty($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext])) { |
| 567 | 567 | // Get full text file. |
| 568 | 568 | $fileContent = GeneralUtility::getUrl($this->getFileLocation($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext])); |
| 569 | - if ($fileContent !== false) { |
|
| 569 | + if ($fileContent !== FALSE) { |
|
| 570 | 570 | $textFormat = $this->getTextFormat($fileContent); |
| 571 | 571 | } else { |
| 572 | 572 | $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"'); |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | { |
| 619 | 619 | $xml = Helper::getXmlFileAsString($fileContent); |
| 620 | 620 | |
| 621 | - if ($xml !== false) { |
|
| 621 | + if ($xml !== FALSE) { |
|
| 622 | 622 | // Get the root element's name as text format. |
| 623 | 623 | return strtoupper($xml->getName()); |
| 624 | 624 | } else { |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | * |
| 639 | 639 | * @return string The title of the document itself or a parent document |
| 640 | 640 | */ |
| 641 | - public static function getTitle($uid, $recursive = false) |
|
| 641 | + public static function getTitle($uid, $recursive = FALSE) |
|
| 642 | 642 | { |
| 643 | 643 | $title = ''; |
| 644 | 644 | // Sanitize input. |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | && intval($partof) |
| 672 | 672 | && $partof != $uid |
| 673 | 673 | ) { |
| 674 | - $title = self::getTitle($partof, true); |
|
| 674 | + $title = self::getTitle($partof, TRUE); |
|
| 675 | 675 | } |
| 676 | 676 | } else { |
| 677 | 677 | Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING); |
@@ -732,12 +732,12 @@ discard block |
||
| 732 | 732 | return $depth; |
| 733 | 733 | } elseif (array_key_exists('children', $element)) { |
| 734 | 734 | $foundInChildren = $this->getTreeDepth($element['children'], $depth + 1, $logId); |
| 735 | - if ($foundInChildren !== false) { |
|
| 735 | + if ($foundInChildren !== FALSE) { |
|
| 736 | 736 | return $foundInChildren; |
| 737 | 737 | } |
| 738 | 738 | } |
| 739 | 739 | } |
| 740 | - return false; |
|
| 740 | + return FALSE; |
|
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | /** |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | } else { |
| 811 | 811 | $this->logger->error('Invalid file location "' . $location . '" for document loading'); |
| 812 | 812 | } |
| 813 | - return false; |
|
| 813 | + return FALSE; |
|
| 814 | 814 | } |
| 815 | 815 | |
| 816 | 816 | /** |
@@ -857,7 +857,7 @@ discard block |
||
| 857 | 857 | 'class' => $resArray['class'] |
| 858 | 858 | ]; |
| 859 | 859 | } |
| 860 | - $this->formatsLoaded = true; |
|
| 860 | + $this->formatsLoaded = TRUE; |
|
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | 863 | |
@@ -958,7 +958,7 @@ discard block |
||
| 958 | 958 | ) { |
| 959 | 959 | $this->prepareMetadataArray($cPid); |
| 960 | 960 | $this->metadataArray[0] = $cPid; |
| 961 | - $this->metadataArrayLoaded = true; |
|
| 961 | + $this->metadataArrayLoaded = TRUE; |
|
| 962 | 962 | } |
| 963 | 963 | return $this->metadataArray; |
| 964 | 964 | } |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | $parent = self::getInstance($this->parentId, ['storagePid' => $this->pid]); |
| 1068 | 1068 | $this->rootId = $parent->rootId; |
| 1069 | 1069 | } |
| 1070 | - $this->rootIdLoaded = true; |
|
| 1070 | + $this->rootIdLoaded = TRUE; |
|
| 1071 | 1071 | } |
| 1072 | 1072 | return $this->rootId; |
| 1073 | 1073 | } |
@@ -1096,8 +1096,8 @@ discard block |
||
| 1096 | 1096 | // Is there no logical structure array yet? |
| 1097 | 1097 | if (!$this->tableOfContentsLoaded) { |
| 1098 | 1098 | // Get all logical structures. |
| 1099 | - $this->getLogicalStructure('', true); |
|
| 1100 | - $this->tableOfContentsLoaded = true; |
|
| 1099 | + $this->getLogicalStructure('', TRUE); |
|
| 1100 | + $this->tableOfContentsLoaded = TRUE; |
|
| 1101 | 1101 | } |
| 1102 | 1102 | return $this->tableOfContents; |
| 1103 | 1103 | } |
@@ -1113,7 +1113,7 @@ discard block |
||
| 1113 | 1113 | * |
| 1114 | 1114 | * @return string The document's thumbnail location |
| 1115 | 1115 | */ |
| 1116 | - protected abstract function _getThumbnail($forceReload = false); |
|
| 1116 | + protected abstract function _getThumbnail($forceReload = FALSE); |
|
| 1117 | 1117 | |
| 1118 | 1118 | /** |
| 1119 | 1119 | * This returns the ID of the toplevel logical structure node |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | |
| 275 | 275 | if ($doc !== null) { |
| 276 | 276 | // Get the closest ancestor of the current document which has a MPTR child. |
| 277 | - $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $doc->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr'); |
|
| 277 | + $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$doc->toplevelId.'"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr'); |
|
| 278 | 278 | if (!empty($parentMptr)) { |
| 279 | 279 | $parentLocation = (string) $parentMptr[0]->attributes('http://www.w3.org/1999/xlink')->href; |
| 280 | 280 | |
@@ -38,8 +38,7 @@ discard block |
||
| 38 | 38 | * @subpackage dlf |
| 39 | 39 | * @access public |
| 40 | 40 | */ |
| 41 | -class BaseCommand extends Command |
|
| 42 | -{ |
|
| 41 | +class BaseCommand extends Command { |
|
| 43 | 42 | /** |
| 44 | 43 | * @var CollectionRepository |
| 45 | 44 | */ |
@@ -79,8 +78,7 @@ discard block |
||
| 79 | 78 | * |
| 80 | 79 | * @return bool |
| 81 | 80 | */ |
| 82 | - protected function initializeRepositories($storagePid) |
|
| 83 | - { |
|
| 81 | + protected function initializeRepositories($storagePid) { |
|
| 84 | 82 | if (MathUtility::canBeInterpretedAsInteger($storagePid)) { |
| 85 | 83 | $configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class); |
| 86 | 84 | $frameworkConfiguration = $configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK); |
@@ -159,8 +157,7 @@ discard block |
||
| 159 | 157 | * |
| 160 | 158 | * @return bool true on success |
| 161 | 159 | */ |
| 162 | - protected function saveToDatabase(Document $document) |
|
| 163 | - { |
|
| 160 | + protected function saveToDatabase(Document $document) { |
|
| 164 | 161 | $success = false; |
| 165 | 162 | |
| 166 | 163 | $doc = $document->getDoc(); |
@@ -268,8 +265,7 @@ discard block |
||
| 268 | 265 | * |
| 269 | 266 | * @return int The parent document's id. |
| 270 | 267 | */ |
| 271 | - protected function getParentDocumentUidForSaving(Document $document) |
|
| 272 | - { |
|
| 268 | + protected function getParentDocumentUidForSaving(Document $document) { |
|
| 273 | 269 | $doc = $document->getDoc(); |
| 274 | 270 | |
| 275 | 271 | if ($doc !== null) { |
@@ -107,11 +107,11 @@ discard block |
||
| 107 | 107 | // Get extension configuration. |
| 108 | 108 | $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf'); |
| 109 | 109 | } else { |
| 110 | - return false; |
|
| 110 | + return FALSE; |
|
| 111 | 111 | } |
| 112 | 112 | $this->storagePid = MathUtility::forceIntegerInRange((int) $storagePid, 0); |
| 113 | 113 | |
| 114 | - return true; |
|
| 114 | + return TRUE; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -172,10 +172,10 @@ discard block |
||
| 172 | 172 | */ |
| 173 | 173 | protected function saveToDatabase(Document $document) |
| 174 | 174 | { |
| 175 | - $success = false; |
|
| 175 | + $success = FALSE; |
|
| 176 | 176 | |
| 177 | 177 | $doc = $document->getDoc(); |
| 178 | - if ($doc === null) { |
|
| 178 | + if ($doc === NULL) { |
|
| 179 | 179 | return $success; |
| 180 | 180 | } |
| 181 | 181 | $doc->cPid = $this->storagePid; |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | $document->setPartof($this->getParentDocumentUidForSaving($document)); |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - if ($document->getUid() === null) { |
|
| 270 | + if ($document->getUid() === NULL) { |
|
| 271 | 271 | // new document |
| 272 | 272 | $this->documentRepository->add($document); |
| 273 | 273 | } else { |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class); |
| 279 | 279 | $persistenceManager->persistAll(); |
| 280 | 280 | |
| 281 | - $success = true; |
|
| 281 | + $success = TRUE; |
|
| 282 | 282 | |
| 283 | 283 | return $success; |
| 284 | 284 | } |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | { |
| 296 | 296 | $doc = $document->getDoc(); |
| 297 | 297 | |
| 298 | - if ($doc !== null) { |
|
| 298 | + if ($doc !== NULL) { |
|
| 299 | 299 | // Get the closest ancestor of the current document which has a MPTR child. |
| 300 | 300 | $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $doc->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr'); |
| 301 | 301 | if (!empty($parentMptr)) { |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | if ($parentDoc->recordId) { |
| 308 | 308 | $parentDocument = $this->documentRepository->findOneByRecordId($parentDoc->recordId); |
| 309 | 309 | |
| 310 | - if ($parentDocument === null) { |
|
| 310 | + if ($parentDocument === NULL) { |
|
| 311 | 311 | // create new Document object |
| 312 | 312 | $parentDocument = GeneralUtility::makeInstance(Document::class); |
| 313 | 313 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | |
| 320 | 320 | $success = $this->saveToDatabase($parentDocument); |
| 321 | 321 | |
| 322 | - if ($success === true) { |
|
| 322 | + if ($success === TRUE) { |
|
| 323 | 323 | // add to index |
| 324 | 324 | Indexer::add($parentDocument); |
| 325 | 325 | return $parentDocument->getUid(); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $this->initializeRepositories($input->getOption('pid')); |
| 97 | 97 | |
| 98 | 98 | if ($this->storagePid == 0) { |
| 99 | - $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.'); |
|
| 99 | + $io->error('ERROR: No valid PID ('.$this->storagePid.') given.'); |
|
| 100 | 100 | exit(1); |
| 101 | 101 | } |
| 102 | 102 | |
@@ -111,13 +111,13 @@ discard block |
||
| 111 | 111 | if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) { |
| 112 | 112 | $output_solrCores = []; |
| 113 | 113 | foreach ($allSolrCores as $index_name => $uid) { |
| 114 | - $output_solrCores[] = $uid . ' : ' . $index_name; |
|
| 114 | + $output_solrCores[] = $uid.' : '.$index_name; |
|
| 115 | 115 | } |
| 116 | 116 | if (empty($output_solrCores)) { |
| 117 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n"); |
|
| 117 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n"); |
|
| 118 | 118 | exit(1); |
| 119 | 119 | } else { |
| 120 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n"); |
|
| 120 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n"); |
|
| 121 | 121 | exit(1); |
| 122 | 122 | } |
| 123 | 123 | } |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $document = $this->documentRepository->findByUid($input->getOption('doc')); |
| 158 | 158 | |
| 159 | 159 | if ($document === null) { |
| 160 | - $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .'); |
|
| 160 | + $io->error('ERROR: Document with UID "'.$input->getOption('doc').'" could not be found on PID '.$this->storagePid.' .'); |
|
| 161 | 161 | exit(1); |
| 162 | 162 | } else { |
| 163 | 163 | $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true); |
@@ -182,17 +182,17 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | if ($doc === null) { |
| 185 | - $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.'); |
|
| 185 | + $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.'); |
|
| 186 | 186 | exit(1); |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | $document->setSolrcore($solrCoreUid); |
| 190 | 190 | |
| 191 | 191 | if ($dryRun) { |
| 192 | - $io->section('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 192 | + $io->section('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 193 | 193 | } else { |
| 194 | 194 | if ($io->isVerbose()) { |
| 195 | - $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 195 | + $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 196 | 196 | } |
| 197 | 197 | $document->setDoc($doc); |
| 198 | 198 | // save to database |
@@ -33,16 +33,14 @@ discard block |
||
| 33 | 33 | * @subpackage dlf |
| 34 | 34 | * @access public |
| 35 | 35 | */ |
| 36 | -class IndexCommand extends BaseCommand |
|
| 37 | -{ |
|
| 36 | +class IndexCommand extends BaseCommand { |
|
| 38 | 37 | |
| 39 | 38 | /** |
| 40 | 39 | * Configure the command by defining the name, options and arguments |
| 41 | 40 | * |
| 42 | 41 | * @return void |
| 43 | 42 | */ |
| 44 | - public function configure() |
|
| 45 | - { |
|
| 43 | + public function configure() { |
|
| 46 | 44 | $this |
| 47 | 45 | ->setDescription('Index single document into database and Solr.') |
| 48 | 46 | ->setHelp('') |
@@ -86,8 +84,7 @@ discard block |
||
| 86 | 84 | * |
| 87 | 85 | * @return int |
| 88 | 86 | */ |
| 89 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
| 90 | - { |
|
| 87 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 91 | 88 | $dryRun = $input->getOption('dry-run') != false ? true : false; |
| 92 | 89 | |
| 93 | 90 | $io = new SymfonyStyle($input, $output); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | ->setHelp('') |
| 49 | 49 | ->addOption( |
| 50 | 50 | 'dry-run', |
| 51 | - null, |
|
| 51 | + NULL, |
|
| 52 | 52 | InputOption::VALUE_NONE, |
| 53 | 53 | 'If this option is set, the files will not actually be processed but the location URI is shown.' |
| 54 | 54 | ) |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | protected function execute(InputInterface $input, OutputInterface $output) |
| 90 | 90 | { |
| 91 | - $dryRun = $input->getOption('dry-run') != false ? true : false; |
|
| 91 | + $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE; |
|
| 92 | 92 | |
| 93 | 93 | $io = new SymfonyStyle($input, $output); |
| 94 | 94 | $io->title($this->getDescription()); |
@@ -145,32 +145,32 @@ discard block |
||
| 145 | 145 | $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner')); |
| 146 | 146 | } |
| 147 | 147 | } else { |
| 148 | - $this->owner = null; |
|
| 148 | + $this->owner = NULL; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - $document = null; |
|
| 152 | - $doc = null; |
|
| 151 | + $document = NULL; |
|
| 152 | + $doc = NULL; |
|
| 153 | 153 | |
| 154 | 154 | // Try to find existing document in database |
| 155 | 155 | if (MathUtility::canBeInterpretedAsInteger($input->getOption('doc'))) { |
| 156 | 156 | |
| 157 | 157 | $document = $this->documentRepository->findByUid($input->getOption('doc')); |
| 158 | 158 | |
| 159 | - if ($document === null) { |
|
| 159 | + if ($document === NULL) { |
|
| 160 | 160 | $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .'); |
| 161 | 161 | exit(1); |
| 162 | 162 | } else { |
| 163 | - $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true); |
|
| 163 | + $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | } else if (GeneralUtility::isValidUrl($input->getOption('doc'))) { |
| 167 | - $doc = Doc::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true); |
|
| 167 | + $doc = Doc::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], TRUE); |
|
| 168 | 168 | |
| 169 | 169 | if ($doc->recordId) { |
| 170 | 170 | $document = $this->documentRepository->findOneByRecordId($doc->recordId); |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - if ($document === null) { |
|
| 173 | + if ($document === NULL) { |
|
| 174 | 174 | // create new Document object |
| 175 | 175 | $document = GeneralUtility::makeInstance(Document::class); |
| 176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - if ($doc === null) { |
|
| 184 | + if ($doc === NULL) { |
|
| 185 | 185 | $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.'); |
| 186 | 186 | exit(1); |
| 187 | 187 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $this->initializeRepositories($input->getOption('pid')); |
| 101 | 101 | |
| 102 | 102 | if ($this->storagePid == 0) { |
| 103 | - $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.'); |
|
| 103 | + $io->error('ERROR: No valid PID ('.$this->storagePid.') given.'); |
|
| 104 | 104 | exit(1); |
| 105 | 105 | } |
| 106 | 106 | |
@@ -115,13 +115,13 @@ discard block |
||
| 115 | 115 | if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) { |
| 116 | 116 | $output_solrCores = []; |
| 117 | 117 | foreach ($allSolrCores as $index_name => $uid) { |
| 118 | - $output_solrCores[] = $uid . ' : ' . $index_name; |
|
| 118 | + $output_solrCores[] = $uid.' : '.$index_name; |
|
| 119 | 119 | } |
| 120 | 120 | if (empty($output_solrCores)) { |
| 121 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n"); |
|
| 121 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n"); |
|
| 122 | 122 | exit(1); |
| 123 | 123 | } else { |
| 124 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n"); |
|
| 124 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n"); |
|
| 125 | 125 | exit(1); |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -163,15 +163,15 @@ discard block |
||
| 163 | 163 | $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true); |
| 164 | 164 | |
| 165 | 165 | if ($doc === null) { |
| 166 | - $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.'); |
|
| 166 | + $io->warning('WARNING: Document "'.$document->getLocation().'" could not be loaded. Skip to next document.'); |
|
| 167 | 167 | continue; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | if ($dryRun) { |
| 171 | - $io->writeln('DRY RUN: Would index ' . ($id + 1) . '/' . count($documents) . ' with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 171 | + $io->writeln('DRY RUN: Would index '.($id + 1).'/'.count($documents).' with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 172 | 172 | } else { |
| 173 | 173 | if ($io->isVerbose()) { |
| 174 | - $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . ($id + 1) . '/' . count($documents) . ' with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 174 | + $io->writeln(date('Y-m-d H:i:s').' Indexing '.($id + 1).'/'.count($documents).' with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 175 | 175 | } |
| 176 | 176 | $document->setDoc($doc); |
| 177 | 177 | // save to database |
@@ -32,15 +32,13 @@ discard block |
||
| 32 | 32 | * @subpackage dlf |
| 33 | 33 | * @access public |
| 34 | 34 | */ |
| 35 | -class ReindexCommand extends BaseCommand |
|
| 36 | -{ |
|
| 35 | +class ReindexCommand extends BaseCommand { |
|
| 37 | 36 | /** |
| 38 | 37 | * Configure the command by defining the name, options and arguments |
| 39 | 38 | * |
| 40 | 39 | * @return void |
| 41 | 40 | */ |
| 42 | - public function configure() |
|
| 43 | - { |
|
| 41 | + public function configure() { |
|
| 44 | 42 | $this |
| 45 | 43 | ->setDescription('Reindex a collection into database and Solr.') |
| 46 | 44 | ->setHelp('') |
@@ -90,8 +88,7 @@ discard block |
||
| 90 | 88 | * |
| 91 | 89 | * @return int |
| 92 | 90 | */ |
| 93 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
| 94 | - { |
|
| 91 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 95 | 92 | $dryRun = $input->getOption('dry-run') != false ? true : false; |
| 96 | 93 | |
| 97 | 94 | $io = new SymfonyStyle($input, $output); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | ->setHelp('') |
| 47 | 47 | ->addOption( |
| 48 | 48 | 'dry-run', |
| 49 | - null, |
|
| 49 | + NULL, |
|
| 50 | 50 | InputOption::VALUE_NONE, |
| 51 | 51 | 'If this option is set, the files will not actually be processed but the location URI is shown.' |
| 52 | 52 | ) |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | protected function execute(InputInterface $input, OutputInterface $output) |
| 94 | 94 | { |
| 95 | - $dryRun = $input->getOption('dry-run') != false ? true : false; |
|
| 95 | + $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE; |
|
| 96 | 96 | |
| 97 | 97 | $io = new SymfonyStyle($input, $output); |
| 98 | 98 | $io->title($this->getDescription()); |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner')); |
| 138 | 138 | } |
| 139 | 139 | } else { |
| 140 | - $this->owner = null; |
|
| 140 | + $this->owner = NULL; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | if (!empty($input->getOption('all'))) { |
@@ -148,21 +148,21 @@ discard block |
||
| 148 | 148 | && !is_array($input->getOption('coll')) |
| 149 | 149 | ) { |
| 150 | 150 | // "coll" may be a single integer or a comma-separated list of integers. |
| 151 | - if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), true)))) { |
|
| 151 | + if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE)))) { |
|
| 152 | 152 | $io->error('ERROR: Parameter --coll|-c is not a valid comma-separated list of collection UIDs.'); |
| 153 | 153 | exit(1); |
| 154 | 154 | } |
| 155 | 155 | // Get all documents of given collections. |
| 156 | - $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $input->getOption('coll'), true), 0); |
|
| 156 | + $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE), 0); |
|
| 157 | 157 | } else { |
| 158 | 158 | $io->error('ERROR: One of parameters --all|-a or --coll|-c must be given.'); |
| 159 | 159 | exit(1); |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | foreach ($documents as $id => $document) { |
| 163 | - $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true); |
|
| 163 | + $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE); |
|
| 164 | 164 | |
| 165 | - if ($doc === null) { |
|
| 165 | + if ($doc === NULL) { |
|
| 166 | 166 | $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.'); |
| 167 | 167 | continue; |
| 168 | 168 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $this->initializeRepositories($input->getOption('pid')); |
| 111 | 111 | |
| 112 | 112 | if ($this->storagePid == 0) { |
| 113 | - $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.'); |
|
| 113 | + $io->error('ERROR: No valid PID ('.$this->storagePid.') given.'); |
|
| 114 | 114 | exit(1); |
| 115 | 115 | } |
| 116 | 116 | |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) { |
| 129 | 129 | $output_solrCores = []; |
| 130 | 130 | foreach ($allSolrCores as $index_name => $uid) { |
| 131 | - $output_solrCores[] = $uid . ' : ' . $index_name; |
|
| 131 | + $output_solrCores[] = $uid.' : '.$index_name; |
|
| 132 | 132 | } |
| 133 | 133 | if (empty($output_solrCores)) { |
| 134 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n"); |
|
| 134 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n"); |
|
| 135 | 135 | exit(1); |
| 136 | 136 | } else { |
| 137 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n"); |
|
| 137 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n"); |
|
| 138 | 138 | exit(1); |
| 139 | 139 | } |
| 140 | 140 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | exit(1); |
| 155 | 155 | } |
| 156 | 156 | if (!GeneralUtility::isValidUrl($baseUrl)) { |
| 157 | - $io->error('ERROR: No valid OAI Base URL set for library with given UID ("' . $input->getOption('lib') . '").'); |
|
| 157 | + $io->error('ERROR: No valid OAI Base URL set for library with given UID ("'.$input->getOption('lib').'").'); |
|
| 158 | 158 | exit(1); |
| 159 | 159 | } else { |
| 160 | 160 | try { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | 197 | if (empty($set)) { |
| 198 | - $io->error('ERROR: OAI interface does not provide a set with given setSpec ("' . $input->getOption('set') . '").'); |
|
| 198 | + $io->error('ERROR: OAI interface does not provide a set with given setSpec ("'.$input->getOption('set').'").'); |
|
| 199 | 199 | exit(1); |
| 200 | 200 | } |
| 201 | 201 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // Process all identifiers. |
| 211 | - $baseLocation = $baseUrl . (parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?'); |
|
| 211 | + $baseLocation = $baseUrl.(parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?'); |
|
| 212 | 212 | foreach ($identifiers as $identifier) { |
| 213 | 213 | // Build OAI GetRecord URL... |
| 214 | 214 | $params = [ |
@@ -216,13 +216,13 @@ discard block |
||
| 216 | 216 | 'metadataPrefix' => 'mets', |
| 217 | 217 | 'identifier' => (string) $identifier->identifier |
| 218 | 218 | ]; |
| 219 | - $docLocation = $baseLocation . http_build_query($params); |
|
| 219 | + $docLocation = $baseLocation.http_build_query($params); |
|
| 220 | 220 | // ...index the document... |
| 221 | 221 | $document = null; |
| 222 | 222 | $doc = Doc::getInstance($docLocation, ['storagePid' => $this->storagePid], true); |
| 223 | 223 | |
| 224 | 224 | if ($doc === null) { |
| 225 | - $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.'); |
|
| 225 | + $io->warning('WARNING: Document "'.$docLocation.'" could not be loaded. Skip to next document.'); |
|
| 226 | 226 | continue; |
| 227 | 227 | } |
| 228 | 228 | |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | $document->setSolrcore($solrCoreUid); |
| 240 | 240 | |
| 241 | 241 | if ($dryRun) { |
| 242 | - $io->writeln('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 242 | + $io->writeln('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 243 | 243 | } else { |
| 244 | 244 | if ($io->isVerbose()) { |
| 245 | - $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 245 | + $io->writeln(date('Y-m-d H:i:s').' Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 246 | 246 | } |
| 247 | 247 | $document->setDoc($doc); |
| 248 | 248 | // save to database |
@@ -267,6 +267,6 @@ discard block |
||
| 267 | 267 | */ |
| 268 | 268 | protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io) |
| 269 | 269 | { |
| 270 | - $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n " . $exception->getMessage()); |
|
| 270 | + $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:'."\n ".$exception->getMessage()); |
|
| 271 | 271 | } |
| 272 | 272 | } |
@@ -36,15 +36,13 @@ discard block |
||
| 36 | 36 | * @subpackage dlf |
| 37 | 37 | * @access public |
| 38 | 38 | */ |
| 39 | -class HarvestCommand extends BaseCommand |
|
| 40 | -{ |
|
| 39 | +class HarvestCommand extends BaseCommand { |
|
| 41 | 40 | /** |
| 42 | 41 | * Configure the command by defining the name, options and arguments |
| 43 | 42 | * |
| 44 | 43 | * @return void |
| 45 | 44 | */ |
| 46 | - public function configure() |
|
| 47 | - { |
|
| 45 | + public function configure() { |
|
| 48 | 46 | $this |
| 49 | 47 | ->setDescription('Harvest OAI-PMH contents into database and Solr.') |
| 50 | 48 | ->setHelp('') |
@@ -100,8 +98,7 @@ discard block |
||
| 100 | 98 | * |
| 101 | 99 | * @return int |
| 102 | 100 | */ |
| 103 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
| 104 | - { |
|
| 101 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 105 | 102 | $dryRun = $input->getOption('dry-run') != false ? true : false; |
| 106 | 103 | |
| 107 | 104 | $io = new SymfonyStyle($input, $output); |
@@ -265,8 +262,7 @@ discard block |
||
| 265 | 262 | * |
| 266 | 263 | * @return void |
| 267 | 264 | */ |
| 268 | - protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io) |
|
| 269 | - { |
|
| 265 | + protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io) { |
|
| 270 | 266 | $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n " . $exception->getMessage()); |
| 271 | 267 | } |
| 272 | 268 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | ->setHelp('') |
| 51 | 51 | ->addOption( |
| 52 | 52 | 'dry-run', |
| 53 | - null, |
|
| 53 | + NULL, |
|
| 54 | 54 | InputOption::VALUE_NONE, |
| 55 | 55 | 'If this option is set, the files will not actually be processed but the location URIs are shown.' |
| 56 | 56 | ) |
@@ -74,19 +74,19 @@ discard block |
||
| 74 | 74 | ) |
| 75 | 75 | ->addOption( |
| 76 | 76 | 'from', |
| 77 | - null, |
|
| 77 | + NULL, |
|
| 78 | 78 | InputOption::VALUE_OPTIONAL, |
| 79 | 79 | 'Datestamp (YYYY-MM-DD) to begin harvesting from.' |
| 80 | 80 | ) |
| 81 | 81 | ->addOption( |
| 82 | 82 | 'until', |
| 83 | - null, |
|
| 83 | + NULL, |
|
| 84 | 84 | InputOption::VALUE_OPTIONAL, |
| 85 | 85 | 'Datestamp (YYYY-MM-DD) to end harvesting on.' |
| 86 | 86 | ) |
| 87 | 87 | ->addOption( |
| 88 | 88 | 'set', |
| 89 | - null, |
|
| 89 | + NULL, |
|
| 90 | 90 | InputOption::VALUE_OPTIONAL, |
| 91 | 91 | 'Name of the set to limit harvesting to.' |
| 92 | 92 | ); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | protected function execute(InputInterface $input, OutputInterface $output) |
| 104 | 104 | { |
| 105 | - $dryRun = $input->getOption('dry-run') != false ? true : false; |
|
| 105 | + $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE; |
|
| 106 | 106 | |
| 107 | 107 | $io = new SymfonyStyle($input, $output); |
| 108 | 108 | $io->title($this->getDescription()); |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | ) { |
| 171 | 171 | $from = new \DateTime($input->getOption('from')); |
| 172 | 172 | } else { |
| 173 | - $from = null; |
|
| 173 | + $from = NULL; |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | if ( |
@@ -179,10 +179,10 @@ discard block |
||
| 179 | 179 | ) { |
| 180 | 180 | $until = new \DateTime($input->getOption('until')); |
| 181 | 181 | } else { |
| 182 | - $until = null; |
|
| 182 | + $until = NULL; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - $set = null; |
|
| 185 | + $set = NULL; |
|
| 186 | 186 | if ( |
| 187 | 187 | !is_array($input->getOption('set')) |
| 188 | 188 | && !empty($input->getOption('set')) |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | ]; |
| 219 | 219 | $docLocation = $baseLocation . http_build_query($params); |
| 220 | 220 | // ...index the document... |
| 221 | - $document = null; |
|
| 222 | - $doc = Doc::getInstance($docLocation, ['storagePid' => $this->storagePid], true); |
|
| 221 | + $document = NULL; |
|
| 222 | + $doc = Doc::getInstance($docLocation, ['storagePid' => $this->storagePid], TRUE); |
|
| 223 | 223 | |
| 224 | - if ($doc === null) { |
|
| 224 | + if ($doc === NULL) { |
|
| 225 | 225 | $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.'); |
| 226 | 226 | continue; |
| 227 | 227 | } |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $document = $this->documentRepository->findOneByRecordId($doc->recordId); |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - if ($document === null) { |
|
| 233 | + if ($document === NULL) { |
|
| 234 | 234 | // create new Document object |
| 235 | 235 | $document = GeneralUtility::makeInstance(Document::class); |
| 236 | 236 | } |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function getDescription(): string |
| 56 | 56 | { |
| 57 | - return 'This wizard migrates existing front end plugins of the extension Kitodo.Presentation (dlf) to' . |
|
| 58 | - ' make use of the Extbase naming scheme. Therefore it updates the field values' . |
|
| 57 | + return 'This wizard migrates existing front end plugins of the extension Kitodo.Presentation (dlf) to'. |
|
| 58 | + ' make use of the Extbase naming scheme. Therefore it updates the field values'. |
|
| 59 | 59 | ' "pi_flexform" within the tt_content table'; |
| 60 | 60 | } |
| 61 | 61 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | foreach ($fields as $field) { |
| 171 | 171 | // change the index attribute if it doesn't start with 'settings.' yet |
| 172 | 172 | if (strpos($field['index'], 'settings.') === false) { |
| 173 | - $field['index'] = 'settings.' . $field['index']; |
|
| 173 | + $field['index'] = 'settings.'.$field['index']; |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | |
@@ -23,8 +23,7 @@ |
||
| 23 | 23 | * Class MigrateSettings |
| 24 | 24 | * @internal |
| 25 | 25 | */ |
| 26 | -class MigrateSettings implements UpgradeWizardInterface |
|
| 27 | -{ |
|
| 26 | +class MigrateSettings implements UpgradeWizardInterface { |
|
| 28 | 27 | |
| 29 | 28 | /** |
| 30 | 29 | * Return the identifier for this wizard |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | // exit if at least one update statement is not successful |
| 99 | 99 | if (!((bool) $updateResult)) { |
| 100 | - return false; |
|
| 100 | + return FALSE; |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - return true; |
|
| 104 | + return TRUE; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function updateNecessary(): bool |
| 115 | 115 | { |
| 116 | - $oldSettingsFound = false; |
|
| 116 | + $oldSettingsFound = FALSE; |
|
| 117 | 117 | |
| 118 | 118 | $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tt_content'); |
| 119 | 119 | |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | // Update the found record sets |
| 132 | 132 | while ($record = $statement->fetch()) { |
| 133 | 133 | $oldSettingsFound = $this->checkForOldSettings($record['pi_flexform']); |
| 134 | - if ($oldSettingsFound === true) { |
|
| 134 | + if ($oldSettingsFound === TRUE) { |
|
| 135 | 135 | // We found at least one field to be updated --> break here |
| 136 | 136 | break; |
| 137 | 137 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | foreach ($fields as $field) { |
| 171 | 171 | // change the index attribute if it doesn't start with 'settings.' yet |
| 172 | - if (strpos($field['index'], 'settings.') === false) { |
|
| 172 | + if (strpos($field['index'], 'settings.') === FALSE) { |
|
| 173 | 173 | $field['index'] = 'settings.' . $field['index']; |
| 174 | 174 | } |
| 175 | 175 | } |
@@ -172,9 +172,9 @@ discard block |
||
| 172 | 172 | $queryBuilder->createNamedParameter('', \PDO::PARAM_STR) |
| 173 | 173 | ), |
| 174 | 174 | $queryBuilder->expr()->comparison( |
| 175 | - 'CAST(CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS DECIMAL) AS CHAR)', |
|
| 175 | + 'CAST(CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS DECIMAL) AS CHAR)', |
|
| 176 | 176 | ExpressionBuilder::NEQ, |
| 177 | - 'CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS CHAR)' |
|
| 177 | + 'CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS CHAR)' |
|
| 178 | 178 | ) |
| 179 | 179 | ) |
| 180 | 180 | ->orderBy('uid') |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | } catch (DBALException $e) { |
| 189 | 189 | throw new \RuntimeException( |
| 190 | - 'Database query failed. Error was: ' . $e->getPrevious()->getMessage(), |
|
| 190 | + 'Database query failed. Error was: '.$e->getPrevious()->getMessage(), |
|
| 191 | 191 | 1511950673 |
| 192 | 192 | ); |
| 193 | 193 | } |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); |
| 247 | 247 | |
| 248 | 248 | $fileUid = null; |
| 249 | - $sourcePath = Environment::getPublicPath() . '/' . $fieldItem; |
|
| 249 | + $sourcePath = Environment::getPublicPath().'/'.$fieldItem; |
|
| 250 | 250 | |
| 251 | 251 | // maybe the file was already moved, so check if the original file still exists |
| 252 | 252 | if (file_exists($sourcePath)) { |
@@ -153,8 +153,7 @@ discard block |
||
| 153 | 153 | * @return array|int |
| 154 | 154 | * @throws \RuntimeException |
| 155 | 155 | */ |
| 156 | - protected function getRecordsFromTable($countOnly = false) |
|
| 157 | - { |
|
| 156 | + protected function getRecordsFromTable($countOnly = false) { |
|
| 158 | 157 | $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); |
| 159 | 158 | $allResults = []; |
| 160 | 159 | $numResults = 0; |
@@ -234,8 +233,7 @@ discard block |
||
| 234 | 233 | * @param array $row |
| 235 | 234 | * @throws \Exception |
| 236 | 235 | */ |
| 237 | - protected function migrateField($table, $row) |
|
| 238 | - { |
|
| 236 | + protected function migrateField($table, $row) { |
|
| 239 | 237 | $fieldItem = trim($row[$this->fieldsToMigrate[$table]]); |
| 240 | 238 | |
| 241 | 239 | if (empty($fieldItem) || is_numeric($fieldItem)) { |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | */ |
| 98 | 98 | public function updateNecessary(): bool |
| 99 | 99 | { |
| 100 | - $numRecords = $this->getRecordsFromTable(true); |
|
| 100 | + $numRecords = $this->getRecordsFromTable(TRUE); |
|
| 101 | 101 | if ($numRecords > 0) { |
| 102 | - return true; |
|
| 102 | + return TRUE; |
|
| 103 | 103 | } |
| 104 | - return false; |
|
| 104 | + return FALSE; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
@@ -131,15 +131,15 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | public function executeUpdate(): bool |
| 133 | 133 | { |
| 134 | - $result = true; |
|
| 134 | + $result = TRUE; |
|
| 135 | 135 | try { |
| 136 | - $numRecords = $this->getRecordsFromTable(true); |
|
| 136 | + $numRecords = $this->getRecordsFromTable(TRUE); |
|
| 137 | 137 | if ($numRecords > 0) { |
| 138 | 138 | $this->performUpdate(); |
| 139 | 139 | } |
| 140 | 140 | } catch (\Exception $e) { |
| 141 | 141 | // If something goes wrong, migrateField() logs an error |
| 142 | - $result = false; |
|
| 142 | + $result = FALSE; |
|
| 143 | 143 | } |
| 144 | 144 | return $result; |
| 145 | 145 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * @return array|int |
| 154 | 154 | * @throws \RuntimeException |
| 155 | 155 | */ |
| 156 | - protected function getRecordsFromTable($countOnly = false) |
|
| 156 | + protected function getRecordsFromTable($countOnly = FALSE) |
|
| 157 | 157 | { |
| 158 | 158 | $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); |
| 159 | 159 | $allResults = []; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | ->orderBy('uid') |
| 181 | 181 | ->execute() |
| 182 | 182 | ->fetchAll(); |
| 183 | - if ($countOnly === true) { |
|
| 183 | + if ($countOnly === TRUE) { |
|
| 184 | 184 | $numResults += count($result); |
| 185 | 185 | } else { |
| 186 | 186 | $allResults[$table] = $result; |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - if ($countOnly === true) { |
|
| 196 | + if ($countOnly === TRUE) { |
|
| 197 | 197 | return $numResults; |
| 198 | 198 | } else { |
| 199 | 199 | return $allResults; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | */ |
| 209 | 209 | protected function performUpdate(): bool |
| 210 | 210 | { |
| 211 | - $result = true; |
|
| 211 | + $result = TRUE; |
|
| 212 | 212 | |
| 213 | 213 | try { |
| 214 | 214 | $storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll(); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | } catch (\Exception $e) { |
| 224 | - $result = false; |
|
| 224 | + $result = FALSE; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | return $result; |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | $storageUid = (int) $this->storage->getUid(); |
| 246 | 246 | $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); |
| 247 | 247 | |
| 248 | - $fileUid = null; |
|
| 248 | + $fileUid = NULL; |
|
| 249 | 249 | $sourcePath = Environment::getPublicPath() . '/' . $fieldItem; |
| 250 | 250 | |
| 251 | 251 | // maybe the file was already moved, so check if the original file still exists |