@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $this->initializeRepositories((int) $input->getOption('pid')); |
| 112 | 112 | |
| 113 | 113 | if ($this->storagePid == 0) { |
| 114 | - $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.'); |
|
| 114 | + $io->error('ERROR: No valid PID ('.$this->storagePid.') given.'); |
|
| 115 | 115 | return BaseCommand::FAILURE; |
| 116 | 116 | } |
| 117 | 117 | |
@@ -129,13 +129,13 @@ discard block |
||
| 129 | 129 | if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) { |
| 130 | 130 | $outputSolrCores = []; |
| 131 | 131 | foreach ($allSolrCores as $indexName => $uid) { |
| 132 | - $outputSolrCores[] = $uid . ' : ' . $indexName; |
|
| 132 | + $outputSolrCores[] = $uid.' : '.$indexName; |
|
| 133 | 133 | } |
| 134 | 134 | if (empty($outputSolrCores)) { |
| 135 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n"); |
|
| 135 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n"); |
|
| 136 | 136 | return BaseCommand::FAILURE; |
| 137 | 137 | } else { |
| 138 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $outputSolrCores) . "\n"); |
|
| 138 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $outputSolrCores)."\n"); |
|
| 139 | 139 | return BaseCommand::FAILURE; |
| 140 | 140 | } |
| 141 | 141 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | return BaseCommand::FAILURE; |
| 156 | 156 | } |
| 157 | 157 | if (!GeneralUtility::isValidUrl($baseUrl)) { |
| 158 | - $io->error('ERROR: No valid OAI Base URL set for library with given UID ("' . $input->getOption('lib') . '").'); |
|
| 158 | + $io->error('ERROR: No valid OAI Base URL set for library with given UID ("'.$input->getOption('lib').'").'); |
|
| 159 | 159 | return BaseCommand::FAILURE; |
| 160 | 160 | } else { |
| 161 | 161 | try { |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | } |
| 198 | 198 | } |
| 199 | 199 | if (empty($set)) { |
| 200 | - $io->error('ERROR: OAI interface does not provide a set with given setSpec ("' . $input->getOption('set') . '").'); |
|
| 200 | + $io->error('ERROR: OAI interface does not provide a set with given setSpec ("'.$input->getOption('set').'").'); |
|
| 201 | 201 | return BaseCommand::FAILURE; |
| 202 | 202 | } |
| 203 | 203 | } |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | // Process all identifiers. |
| 218 | - $baseLocation = $baseUrl . (parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?'); |
|
| 218 | + $baseLocation = $baseUrl.(parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?'); |
|
| 219 | 219 | foreach ($identifiers as $identifier) { |
| 220 | 220 | // Build OAI GetRecord URL... |
| 221 | 221 | $params = [ |
@@ -223,13 +223,13 @@ discard block |
||
| 223 | 223 | 'metadataPrefix' => 'mets', |
| 224 | 224 | 'identifier' => (string) $identifier->identifier |
| 225 | 225 | ]; |
| 226 | - $docLocation = $baseLocation . http_build_query($params); |
|
| 226 | + $docLocation = $baseLocation.http_build_query($params); |
|
| 227 | 227 | // ...index the document... |
| 228 | 228 | $document = null; |
| 229 | 229 | $doc = AbstractDocument::getInstance($docLocation, ['storagePid' => $this->storagePid], true); |
| 230 | 230 | |
| 231 | 231 | if ($doc === null) { |
| 232 | - $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.'); |
|
| 232 | + $io->warning('WARNING: Document "'.$docLocation.'" could not be loaded. Skip to next document.'); |
|
| 233 | 233 | continue; |
| 234 | 234 | } |
| 235 | 235 | |
@@ -246,10 +246,10 @@ discard block |
||
| 246 | 246 | $document->setSolrcore($solrCoreUid); |
| 247 | 247 | |
| 248 | 248 | if ($dryRun) { |
| 249 | - $io->writeln('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 249 | + $io->writeln('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 250 | 250 | } else { |
| 251 | 251 | if ($io->isVerbose()) { |
| 252 | - $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 252 | + $io->writeln(date('Y-m-d H:i:s').' Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 253 | 253 | } |
| 254 | 254 | $document->setCurrentDocument($doc); |
| 255 | 255 | // save to database |
@@ -276,6 +276,6 @@ discard block |
||
| 276 | 276 | */ |
| 277 | 277 | protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io): void |
| 278 | 278 | { |
| 279 | - $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n " . $exception->getMessage()); |
|
| 279 | + $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:'."\n ".$exception->getMessage()); |
|
| 280 | 280 | } |
| 281 | 281 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $simplePagination = new SimplePagination($solrPaginator); |
| 169 | 169 | |
| 170 | 170 | $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator); |
| 171 | - $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]); |
|
| 171 | + $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | $this->view->assign('viewData', $this->viewData); |
@@ -220,9 +220,9 @@ discard block |
||
| 220 | 220 | foreach ($collections as $collection) { |
| 221 | 221 | $solrQuery = ''; |
| 222 | 222 | if ($collection->getIndexSearch() != '') { |
| 223 | - $solrQuery .= '(' . $collection->getIndexSearch() . ')'; |
|
| 223 | + $solrQuery .= '('.$collection->getIndexSearch().')'; |
|
| 224 | 224 | } else { |
| 225 | - $solrQuery .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")'; |
|
| 225 | + $solrQuery .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")'; |
|
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | // We only care about the UID and partOf in the results and want them sorted |
@@ -236,11 +236,11 @@ discard block |
||
| 236 | 236 | if ($collection->getIndexSearch()) { |
| 237 | 237 | $params['query'] = $solrQuery; |
| 238 | 238 | } else { |
| 239 | - $params['query'] = $solrQuery . ' AND partof:0 AND toplevel:true'; |
|
| 239 | + $params['query'] = $solrQuery.' AND partof:0 AND toplevel:true'; |
|
| 240 | 240 | } |
| 241 | 241 | $partOfNothing = $solr->searchRaw($params); |
| 242 | 242 | |
| 243 | - $params['query'] = $solrQuery . ' AND NOT partof:0 AND toplevel:true'; |
|
| 243 | + $params['query'] = $solrQuery.' AND NOT partof:0 AND toplevel:true'; |
|
| 244 | 244 | $partOfSomething = $solr->searchRaw($params); |
| 245 | 245 | |
| 246 | 246 | $collectionInfo = []; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | foreach ($this->requestData['selected'] as $docValue) { |
| 134 | 134 | if ($docValue['id']) { |
| 135 | 135 | $docData = $this->getDocumentData((int) $docValue['id'], $docValue); |
| 136 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 136 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 137 | 137 | $this->redirectToUri($pdfUrl); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | if ($allMails->count() > 0) { |
| 201 | 201 | $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf')); |
| 202 | 202 | foreach ($allMails as $mail) { |
| 203 | - $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')'; |
|
| 203 | + $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')'; |
|
| 204 | 204 | } |
| 205 | 205 | $this->view->assign('mailSelect', $mailSelect); |
| 206 | 206 | } |
@@ -288,12 +288,12 @@ discard block |
||
| 288 | 288 | |
| 289 | 289 | $docData = $this->getDocumentData((int) $id, $data); |
| 290 | 290 | |
| 291 | - $entryKey = $id . '_' . $startPage; |
|
| 291 | + $entryKey = $id.'_'.$startPage; |
|
| 292 | 292 | if (!empty($startX)) { |
| 293 | - $entryKey .= '_' . $startX; |
|
| 293 | + $entryKey .= '_'.$startX; |
|
| 294 | 294 | } |
| 295 | 295 | if (!empty($endX)) { |
| 296 | - $entryKey .= '_' . $endX; |
|
| 296 | + $entryKey .= '_'.$endX; |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | $entry = [ |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams); |
| 353 | 353 | $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams); |
| 354 | 354 | |
| 355 | - $downloadUrl = $this->settings['pdfgenerate'] . $urlParams; |
|
| 355 | + $downloadUrl = $this->settings['pdfgenerate'].$urlParams; |
|
| 356 | 356 | |
| 357 | 357 | $title = $this->document->getTitle(); |
| 358 | 358 | if (empty($title)) { |
@@ -363,15 +363,15 @@ discard block |
||
| 363 | 363 | $info = ''; |
| 364 | 364 | if ($data['startX'] != '' && $data['endX'] != '') { |
| 365 | 365 | // cutout |
| 366 | - $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' '; |
|
| 366 | + $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' '; |
|
| 367 | 367 | } |
| 368 | 368 | if ($data['startpage'] == $data['endpage']) { |
| 369 | 369 | // One page |
| 370 | - $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage']; |
|
| 370 | + $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage']; |
|
| 371 | 371 | } else { |
| 372 | - $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage']; |
|
| 372 | + $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage']; |
|
| 373 | 373 | } |
| 374 | - $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')'; |
|
| 374 | + $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')'; |
|
| 375 | 375 | if ($data['startpage'] == $data['endpage']) { |
| 376 | 376 | $pageNums = 1; |
| 377 | 377 | } else { |
@@ -444,12 +444,12 @@ discard block |
||
| 444 | 444 | if ($piVars['addToBasket'] == 'list') { |
| 445 | 445 | $documentItem['endpage'] = $this->document->getCurrentDocument()->numPages; |
| 446 | 446 | } |
| 447 | - $arrayKey = $documentItem['id'] . '_' . $page; |
|
| 447 | + $arrayKey = $documentItem['id'].'_'.$page; |
|
| 448 | 448 | if (!empty($documentItem['startX'])) { |
| 449 | - $arrayKey .= '_' . $documentItem['startX']; |
|
| 449 | + $arrayKey .= '_'.$documentItem['startX']; |
|
| 450 | 450 | } |
| 451 | 451 | if (!empty($documentItem['endX'])) { |
| 452 | - $arrayKey .= '_' . $documentItem['endX']; |
|
| 452 | + $arrayKey .= '_'.$documentItem['endX']; |
|
| 453 | 453 | } |
| 454 | 454 | // do not add more than one identical object |
| 455 | 455 | if (!in_array($arrayKey, $items)) { |
@@ -470,14 +470,14 @@ discard block |
||
| 470 | 470 | // remove parameter endpage |
| 471 | 471 | $pdfParams = str_replace(",##endpage##", '', $pdfParams); |
| 472 | 472 | } |
| 473 | - $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams; |
|
| 473 | + $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams; |
|
| 474 | 474 | if ($this->settings['pregeneration']) { |
| 475 | 475 | // send ajax request to webapp |
| 476 | 476 | $output .= ' |
| 477 | 477 | <script> |
| 478 | 478 | $(document).ready(function(){ |
| 479 | 479 | $.ajax({ |
| 480 | - url: "' . $pdfGenerateUrl . '", |
|
| 480 | + url: "' . $pdfGenerateUrl.'", |
|
| 481 | 481 | }).done(function() { |
| 482 | 482 | }); |
| 483 | 483 | }); |
@@ -515,12 +515,12 @@ discard block |
||
| 515 | 515 | } |
| 516 | 516 | foreach ($piVars['selected'] as $value) { |
| 517 | 517 | if (isset($value['id'])) { |
| 518 | - $arrayKey = $value['id'] . '_' . $value['startpage']; |
|
| 518 | + $arrayKey = $value['id'].'_'.$value['startpage']; |
|
| 519 | 519 | if (!empty($value['startX'])) { |
| 520 | - $arrayKey .= '_' . $value['startX']; |
|
| 520 | + $arrayKey .= '_'.$value['startX']; |
|
| 521 | 521 | } |
| 522 | 522 | if (!empty($value['endX'])) { |
| 523 | - $arrayKey .= '_' . $value['endX']; |
|
| 523 | + $arrayKey .= '_'.$value['endX']; |
|
| 524 | 524 | } |
| 525 | 525 | if (isset($items[$arrayKey])) { |
| 526 | 526 | unset($items[$arrayKey]); |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | |
| 554 | 554 | $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst(); |
| 555 | 555 | |
| 556 | - $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n"; |
|
| 556 | + $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n"; |
|
| 557 | 557 | $numberOfPages = 0; |
| 558 | 558 | $pdfUrl = $this->settings['pdfdownload']; |
| 559 | 559 | // prepare links |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | if ($docValue['id']) { |
| 562 | 562 | $explodeId = explode("_", $docValue['id']); |
| 563 | 563 | $docData = $this->getDocumentData((int) $explodeId[0], $docValue); |
| 564 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 564 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 565 | 565 | $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage']))); |
| 566 | 566 | if ($pages === 0) { |
| 567 | 567 | $numberOfPages = $numberOfPages + 1; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | } |
| 573 | 573 | // Remove leading/tailing pdfparamseperator |
| 574 | 574 | $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']); |
| 575 | - $mailBody = $mailText . $pdfUrl; |
|
| 575 | + $mailBody = $mailText.$pdfUrl; |
|
| 576 | 576 | // Get hook objects. |
| 577 | 577 | $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php'); |
| 578 | 578 | // Hook for getting a customized mail body. |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | $newActionLog = GeneralUtility::makeInstance(ActionLog::class); |
| 600 | 600 | $newActionLog->setFileName($pdfUrl); |
| 601 | 601 | $newActionLog->setCountPages($numberOfPages); |
| 602 | - $newActionLog->setLabel('Mail: ' . $mailObject->getMail()); |
|
| 602 | + $newActionLog->setLabel('Mail: '.$mailObject->getMail()); |
|
| 603 | 603 | |
| 604 | 604 | if ($GLOBALS["TSFE"]->loginUser) { |
| 605 | 605 | // internal user |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | foreach ($this->requestData['selected'] as $docId => $docValue) { |
| 631 | 631 | if ($docValue['id']) { |
| 632 | 632 | $docData = $this->getDocumentData((int) $docValue['id'], $docValue); |
| 633 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 633 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 634 | 634 | $numberOfPages += $docData['pageNums']; |
| 635 | 635 | } |
| 636 | 636 | } |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | if ($docValue['id']) { |
| 649 | 649 | $explodeId = explode("_", $docId); |
| 650 | 650 | $docData = $this->getDocumentData((int) $explodeId[0], $docValue); |
| 651 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 651 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 652 | 652 | $numberOfPages += $docData['pageNums']; |
| 653 | 653 | } |
| 654 | 654 | } |
@@ -665,12 +665,12 @@ discard block |
||
| 665 | 665 | // internal user |
| 666 | 666 | $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']); |
| 667 | 667 | $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']); |
| 668 | - $actionLog->setLabel('Print: ' . $printer->getLabel()); |
|
| 668 | + $actionLog->setLabel('Print: '.$printer->getLabel()); |
|
| 669 | 669 | } else { |
| 670 | 670 | // external user |
| 671 | 671 | $actionLog->setUserId(0); |
| 672 | 672 | $actionLog->setName('n/a'); |
| 673 | - $actionLog->setLabel('Print: ' . $printer->getLabel()); |
|
| 673 | + $actionLog->setLabel('Print: '.$printer->getLabel()); |
|
| 674 | 674 | } |
| 675 | 675 | // add action to protocol |
| 676 | 676 | $this->actionLogRepository->add($actionLog); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries. |
| 164 | - $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB'); |
|
| 164 | + $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB'); |
|
| 165 | 165 | } |
| 166 | 166 | return $entryArray; |
| 167 | 167 | } |
@@ -338,16 +338,16 @@ discard block |
||
| 338 | 338 | $title = ''; |
| 339 | 339 | foreach ($fields as $field) { |
| 340 | 340 | if ($field == 'type') { |
| 341 | - $title .= $this->getTranslatedType($entry['type']) . ' '; |
|
| 341 | + $title .= $this->getTranslatedType($entry['type']).' '; |
|
| 342 | 342 | } else { |
| 343 | - $title .= $entry[$field] . ' '; |
|
| 343 | + $title .= $entry[$field].' '; |
|
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | return trim($title); |
| 347 | 347 | } |
| 348 | 348 | } |
| 349 | 349 | } |
| 350 | - return $label ?: $orderLabel; |
|
| 350 | + return $label ? : $orderLabel; |
|
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | /** |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | { |
| 383 | 383 | usort( |
| 384 | 384 | $menu[0]['_SUB_MENU'], |
| 385 | - function ($firstElement, $secondElement) { |
|
| 385 | + function($firstElement, $secondElement) { |
|
| 386 | 386 | if (!empty($firstElement['orderlabel'])) { |
| 387 | 387 | return $firstElement['orderlabel'] <=> $secondElement['orderlabel']; |
| 388 | 388 | } |
@@ -148,10 +148,10 @@ discard block |
||
| 148 | 148 | ) { |
| 149 | 149 | // Get current configuration. |
| 150 | 150 | $result = $queryBuilder |
| 151 | - ->select($table . '.is_listed AS is_listed') |
|
| 151 | + ->select($table.'.is_listed AS is_listed') |
|
| 152 | 152 | ->from($table) |
| 153 | 153 | ->where( |
| 154 | - $queryBuilder->expr()->eq($table . '.uid', (int) $id), |
|
| 154 | + $queryBuilder->expr()->eq($table.'.uid', (int) $id), |
|
| 155 | 155 | Helper::whereExpression($table) |
| 156 | 156 | ) |
| 157 | 157 | ->setMaxResults(1) |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | ) { |
| 175 | 175 | // Get current configuration. |
| 176 | 176 | $result = $queryBuilder |
| 177 | - ->select($table . '.index_autocomplete AS index_autocomplete') |
|
| 177 | + ->select($table.'.index_autocomplete AS index_autocomplete') |
|
| 178 | 178 | ->from($table) |
| 179 | 179 | ->where( |
| 180 | - $queryBuilder->expr()->eq($table . '.uid', (int) $id), |
|
| 180 | + $queryBuilder->expr()->eq($table.'.uid', (int) $id), |
|
| 181 | 181 | Helper::whereExpression($table) |
| 182 | 182 | ) |
| 183 | 183 | ->setMaxResults(1) |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | if ($solr->ready) { |
| 348 | 348 | // Delete Solr document. |
| 349 | 349 | $updateQuery = $solr->service->createUpdate(); |
| 350 | - $updateQuery->addDeleteQuery('uid:' . (int) $id); |
|
| 350 | + $updateQuery->addDeleteQuery('uid:'.(int) $id); |
|
| 351 | 351 | $updateQuery->addCommit(); |
| 352 | 352 | $solr->service->update($updateQuery); |
| 353 | 353 | } |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | $document->setCurrentDocument($doc); |
| 371 | 371 | Indexer::add($document, $this->getDocumentRepository()); |
| 372 | 372 | } else { |
| 373 | - $this->logger->error('Failed to re-index document with UID ' . (string) $id); |
|
| 373 | + $this->logger->error('Failed to re-index document with UID '.(string) $id); |
|
| 374 | 374 | } |
| 375 | 375 | } |
| 376 | 376 | |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | try { |
| 422 | 422 | $response = $solr->service->coreAdmin($query); |
| 423 | 423 | if ($response->getWasSuccessful() == false) { |
| 424 | - $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr'); |
|
| 424 | + $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr'); |
|
| 425 | 425 | } |
| 426 | 426 | } catch (\Exception $e) { |
| 427 | 427 | $this->logger->warning($e->getMessage()); |
@@ -155,8 +155,8 @@ |
||
| 155 | 155 | ->select(...explode(',', $fields)) |
| 156 | 156 | ->from($table) |
| 157 | 157 | ->where( |
| 158 | - $queryBuilder->expr()->eq($table . '.pid', $this->storagePid), |
|
| 159 | - $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]), |
|
| 158 | + $queryBuilder->expr()->eq($table.'.pid', $this->storagePid), |
|
| 159 | + $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]), |
|
| 160 | 160 | $andWhere |
| 161 | 161 | ) |
| 162 | 162 | ->orderBy($sorting) |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $this->initializeRepositories((int) $input->getOption('pid')); |
| 99 | 99 | |
| 100 | 100 | if ($this->storagePid == 0) { |
| 101 | - $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.'); |
|
| 101 | + $io->error('ERROR: No valid PID ('.$this->storagePid.') given.'); |
|
| 102 | 102 | return BaseCommand::FAILURE; |
| 103 | 103 | } |
| 104 | 104 | |
@@ -113,13 +113,13 @@ discard block |
||
| 113 | 113 | if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) { |
| 114 | 114 | $outputSolrCores = []; |
| 115 | 115 | foreach ($allSolrCores as $indexName => $uid) { |
| 116 | - $outputSolrCores[] = $uid . ' : ' . $indexName; |
|
| 116 | + $outputSolrCores[] = $uid.' : '.$indexName; |
|
| 117 | 117 | } |
| 118 | 118 | if (empty($outputSolrCores)) { |
| 119 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n"); |
|
| 119 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n"); |
|
| 120 | 120 | return BaseCommand::FAILURE; |
| 121 | 121 | } else { |
| 122 | - $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $outputSolrCores) . "\n"); |
|
| 122 | + $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $outputSolrCores)."\n"); |
|
| 123 | 123 | return BaseCommand::FAILURE; |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $document = $this->documentRepository->findByUid($input->getOption('doc')); |
| 160 | 160 | |
| 161 | 161 | if ($document === null) { |
| 162 | - $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .'); |
|
| 162 | + $io->error('ERROR: Document with UID "'.$input->getOption('doc').'" could not be found on PID '.$this->storagePid.' .'); |
|
| 163 | 163 | return BaseCommand::FAILURE; |
| 164 | 164 | } else { |
| 165 | 165 | $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true); |
@@ -172,31 +172,31 @@ discard block |
||
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | if ($doc === null) { |
| 175 | - $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.'); |
|
| 175 | + $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.'); |
|
| 176 | 176 | return BaseCommand::FAILURE; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | $document->setSolrcore($solrCoreUid); |
| 180 | 180 | |
| 181 | 181 | if ($dryRun) { |
| 182 | - $io->section('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.'); |
|
| 182 | + $io->section('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.'); |
|
| 183 | 183 | $io->success('All done!'); |
| 184 | 184 | return BaseCommand::SUCCESS; |
| 185 | 185 | } else { |
| 186 | 186 | $document->setCurrentDocument($doc); |
| 187 | 187 | |
| 188 | 188 | if ($io->isVerbose()) { |
| 189 | - $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . '.'); |
|
| 189 | + $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.'.'); |
|
| 190 | 190 | } |
| 191 | 191 | $isSaved = $this->saveToDatabase($document); |
| 192 | 192 | |
| 193 | 193 | if ($isSaved) { |
| 194 | 194 | if ($io->isVerbose()) { |
| 195 | - $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on Solr core ' . $solrCoreUid . '.'); |
|
| 195 | + $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on Solr core '.$solrCoreUid.'.'); |
|
| 196 | 196 | } |
| 197 | 197 | $isSaved = Indexer::add($document, $this->documentRepository); |
| 198 | 198 | } else { |
| 199 | - $io->error('ERROR: Document with UID "' . $document->getUid() . '" could not be indexed on PID ' . $this->storagePid . ' . There are missing mandatory fields (at least one of those: ' . $this->extConf['requiredMetadataFields'] . ') in this document.'); |
|
| 199 | + $io->error('ERROR: Document with UID "'.$document->getUid().'" could not be indexed on PID '.$this->storagePid.' . There are missing mandatory fields (at least one of those: '.$this->extConf['requiredMetadataFields'].') in this document.'); |
|
| 200 | 200 | return BaseCommand::FAILURE; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -205,8 +205,8 @@ discard block |
||
| 205 | 205 | return BaseCommand::SUCCESS; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - $io->error('ERROR: Document with UID "' . $document->getUid() . '" could not be indexed on Solr core ' . $solrCoreUid . ' . There are missing mandatory fields (at least one of those: ' . $this->extConf['requiredMetadataFields'] . ') in this document.'); |
|
| 209 | - $io->info('INFO: Document with UID "' . $document->getUid() . '" is already in database. If you want to keep the database and index consistent you need to remove it.'); |
|
| 208 | + $io->error('ERROR: Document with UID "'.$document->getUid().'" could not be indexed on Solr core '.$solrCoreUid.' . There are missing mandatory fields (at least one of those: '.$this->extConf['requiredMetadataFields'].') in this document.'); |
|
| 209 | + $io->info('INFO: Document with UID "'.$document->getUid().'" is already in database. If you want to keep the database and index consistent you need to remove it.'); |
|
| 210 | 210 | return BaseCommand::FAILURE; |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -59,8 +59,8 @@ |
||
| 59 | 59 | |
| 60 | 60 | // Text field for document URL |
| 61 | 61 | $fieldName = 'doc'; |
| 62 | - $fieldId = 'task_' . $fieldName; |
|
| 63 | - $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >'; |
|
| 62 | + $fieldId = 'task_'.$fieldName; |
|
| 63 | + $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >'; |
|
| 64 | 64 | $additionalFields[$fieldId] = [ |
| 65 | 65 | 'code' => $fieldHtml, |
| 66 | 66 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.doc', |
@@ -65,16 +65,16 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | // Text field for library |
| 67 | 67 | $fieldName = 'lib'; |
| 68 | - $fieldId = 'task_' . $fieldName; |
|
| 68 | + $fieldId = 'task_'.$fieldName; |
|
| 69 | 69 | |
| 70 | 70 | $allLibraries = $this->getLibraries($taskInfo['pid']); |
| 71 | 71 | $options = []; |
| 72 | 72 | $options[] = '<option value="-1"></option>'; |
| 73 | 73 | foreach ($allLibraries as $label => $uid) { |
| 74 | - $options[] = '<option value="' . $uid . '" ' . ($taskInfo['lib'] == $uid ? 'selected' : '') . ' >' . $label . '</option>'; |
|
| 74 | + $options[] = '<option value="'.$uid.'" '.($taskInfo['lib'] == $uid ? 'selected' : '').' >'.$label.'</option>'; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>'; |
|
| 77 | + $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>'; |
|
| 78 | 78 | $additionalFields[$fieldId] = [ |
| 79 | 79 | 'code' => $fieldHtml, |
| 80 | 80 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.lib', |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | // Text field for from |
| 92 | 92 | $fieldName = 'from'; |
| 93 | - $fieldId = 'task_' . $fieldName; |
|
| 94 | - $fieldHtml = '<input type="date" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >'; |
|
| 93 | + $fieldId = 'task_'.$fieldName; |
|
| 94 | + $fieldHtml = '<input type="date" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >'; |
|
| 95 | 95 | $additionalFields[$fieldId] = [ |
| 96 | 96 | 'code' => $fieldHtml, |
| 97 | 97 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.from', |
@@ -101,8 +101,8 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | // Text field for until |
| 103 | 103 | $fieldName = 'until'; |
| 104 | - $fieldId = 'task_' . $fieldName; |
|
| 105 | - $fieldHtml = '<input type="date" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >'; |
|
| 104 | + $fieldId = 'task_'.$fieldName; |
|
| 105 | + $fieldHtml = '<input type="date" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >'; |
|
| 106 | 106 | $additionalFields[$fieldId] = [ |
| 107 | 107 | 'code' => $fieldHtml, |
| 108 | 108 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.until', |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | // Text field for set |
| 114 | 114 | $fieldName = 'set'; |
| 115 | - $fieldId = 'task_' . $fieldName; |
|
| 116 | - $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >'; |
|
| 115 | + $fieldId = 'task_'.$fieldName; |
|
| 116 | + $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >'; |
|
| 117 | 117 | $additionalFields[$fieldId] = [ |
| 118 | 118 | 'code' => $fieldHtml, |
| 119 | 119 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.set', |