We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -58,7 +58,8 @@ |
||
58 | 58 | * |
59 | 59 | * @return void |
60 | 60 | */ |
61 | - public function getTyposcriptConfigFromPluginSiteRoot($params) { |
|
61 | + public function getTyposcriptConfigFromPluginSiteRoot($params) |
|
62 | + { |
|
62 | 63 | $objectManager = GeneralUtility::makeInstance(ObjectManager::class); |
63 | 64 | $pid = $params['flexParentDatabaseRow']['pid']; |
64 | 65 | $rootline = \TYPO3\CMS\Backend\Utility\BackendUtility::BEgetRootLine($pid); |
@@ -48,7 +48,7 @@ |
||
48 | 48 | |
49 | 49 | $settingsParts = explode("/", $model); |
50 | 50 | $fileName = end($settingsParts); |
51 | - $path = substr($model, 0, strrpos($model, $fileName)); |
|
51 | + $path = substr($model, 0, strrpos($model, $fileName)); |
|
52 | 52 | $modelSettings = $path . "metadata/" . $fileName . "_viewer"; |
53 | 53 | |
54 | 54 | if (!empty($modelConverted)) { |
@@ -30,7 +30,8 @@ |
||
30 | 30 | * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm |
31 | 31 | * @return void |
32 | 32 | */ |
33 | - public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = NULL) { |
|
33 | + public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = NULL) |
|
34 | + { |
|
34 | 35 | if ($pageSelectForm) { |
35 | 36 | $uriBuilder = $this->getControllerContext()->getUriBuilder(); |
36 | 37 | $uri = $uriBuilder->reset() |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm |
31 | 31 | * @return void |
32 | 32 | */ |
33 | - public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = NULL) { |
|
33 | + public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = null) { |
|
34 | 34 | if ($pageSelectForm) { |
35 | 35 | $uriBuilder = $this->getControllerContext()->getUriBuilder(); |
36 | 36 | $uri = $uriBuilder->reset() |
@@ -75,7 +75,7 @@ |
||
75 | 75 | // extract collection(s) from collection parameter |
76 | 76 | $collection = null; |
77 | 77 | if ($this->searchParams['collection']) { |
78 | - foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) { |
|
78 | + foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) { |
|
79 | 79 | $collection[] = $this->collectionRepository->findByUid($collectionEntry); |
80 | 80 | } |
81 | 81 | } |
@@ -258,8 +258,7 @@ |
||
258 | 258 | // check for virtual collections query string |
259 | 259 | if($collectionEntry->getIndexSearch()) { |
260 | 260 | $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ; |
261 | - } |
|
262 | - else { |
|
261 | + } else { |
|
263 | 262 | $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"'; |
264 | 263 | } |
265 | 264 | } |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | // sanitize date search input |
111 | - if(empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) { |
|
111 | + if (empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) { |
|
112 | 112 | $this->searchParams['dateFrom'] = '*'; |
113 | 113 | } |
114 | - if(empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) { |
|
114 | + if (empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) { |
|
115 | 115 | $this->searchParams['dateTo'] = 'NOW'; |
116 | 116 | } |
117 | - if($this->searchParams['dateFrom'] > $this->searchParams['dateTo']) { |
|
117 | + if ($this->searchParams['dateFrom'] > $this->searchParams['dateTo']) { |
|
118 | 118 | $tmpDate = $this->searchParams['dateFrom']; |
119 | 119 | $this->searchParams['dateFrom'] = $this->searchParams['dateTo']; |
120 | 120 | $this->searchParams['dateTo'] = $tmpDate; |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | // extract collections from collection parameter |
260 | 260 | $collection = null; |
261 | 261 | if ($this->searchParams['collection']) { |
262 | - foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) { |
|
262 | + foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) { |
|
263 | 263 | $collection[] = $this->collectionRepository->findByUid($collectionEntry); |
264 | 264 | } |
265 | 265 | |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | $virtualCollectionsQueryString = ''; |
270 | 270 | foreach ($collection as $collectionEntry) { |
271 | 271 | // check for virtual collections query string |
272 | - if($collectionEntry->getIndexSearch()) { |
|
273 | - $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ; |
|
272 | + if ($collectionEntry->getIndexSearch()) { |
|
273 | + $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')'; |
|
274 | 274 | } |
275 | 275 | else { |
276 | 276 | $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"'; |
@@ -278,8 +278,8 @@ discard block |
||
278 | 278 | } |
279 | 279 | |
280 | 280 | // distinguish between simple collection browsing and actual searching within the collection(s) |
281 | - if(!empty($collectionsQueryString)) { |
|
282 | - if(empty($searchParams['query'])) { |
|
281 | + if (!empty($collectionsQueryString)) { |
|
282 | + if (empty($searchParams['query'])) { |
|
283 | 283 | $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)'; |
284 | 284 | } else { |
285 | 285 | $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))'; |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | } |
288 | 288 | |
289 | 289 | // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separatly |
290 | - if(!empty($virtualCollectionsQueryString)) { |
|
290 | + if (!empty($virtualCollectionsQueryString)) { |
|
291 | 291 | $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')'; |
292 | 292 | } |
293 | 293 |
@@ -71,7 +71,8 @@ discard block |
||
71 | 71 | * |
72 | 72 | * @return void |
73 | 73 | */ |
74 | - private function getAuthors() { |
|
74 | + private function getAuthors() |
|
75 | + { |
|
75 | 76 | $authors = $this->xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="aut"]'); |
76 | 77 | |
77 | 78 | // Get "author" and "author_sorting" again if that was too sophisticated. |
@@ -93,7 +94,8 @@ discard block |
||
93 | 94 | } |
94 | 95 | } |
95 | 96 | |
96 | - private function getAuthorFromOrcidApi($orcidId, $authors, $i) { |
|
97 | + private function getAuthorFromOrcidApi($orcidId, $authors, $i) |
|
98 | + { |
|
97 | 99 | $profile = new OrcidProfile($orcidId); |
98 | 100 | $name = $profile->getFullName(); |
99 | 101 | if (!empty($name)) { |
@@ -107,7 +109,8 @@ discard block |
||
107 | 109 | } |
108 | 110 | } |
109 | 111 | |
110 | - private function getAuthorFromXml($authors, $i) { |
|
112 | + private function getAuthorFromXml($authors, $i) |
|
113 | + { |
|
111 | 114 | $this->getAuthorFromXmlDisplayForm($authors, $i); |
112 | 115 | |
113 | 116 | $nameParts = $authors[$i]->xpath('./mods:namePart'); |
@@ -150,7 +153,8 @@ discard block |
||
150 | 153 | } |
151 | 154 | } |
152 | 155 | |
153 | - private function getAuthorFromXmlDisplayForm($authors, $i) { |
|
156 | + private function getAuthorFromXmlDisplayForm($authors, $i) |
|
157 | + { |
|
154 | 158 | $displayForm = $authors[$i]->xpath('./mods:displayForm'); |
155 | 159 | if ($displayForm) { |
156 | 160 | $this->metadata['author'][$i] = (string) $displayForm[0]; |
@@ -164,7 +168,8 @@ discard block |
||
164 | 168 | * |
165 | 169 | * @return void |
166 | 170 | */ |
167 | - private function getHolders() { |
|
171 | + private function getHolders() |
|
172 | + { |
|
168 | 173 | $holders = $this->xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="prv"]'); |
169 | 174 | |
170 | 175 | if (!empty($holders)) { |
@@ -181,7 +186,8 @@ discard block |
||
181 | 186 | } |
182 | 187 | } |
183 | 188 | |
184 | - private function getHolderFromViafApi($viafId, $holders, $i) { |
|
189 | + private function getHolderFromViafApi($viafId, $holders, $i) |
|
190 | + { |
|
185 | 191 | $profile = new ViafProfile($viafId); |
186 | 192 | $name = $profile->getFullName(); |
187 | 193 | if (!empty($name)) { |
@@ -195,7 +201,8 @@ discard block |
||
195 | 201 | } |
196 | 202 | } |
197 | 203 | |
198 | - private function getHolderFromXml($holders, $i) { |
|
204 | + private function getHolderFromXml($holders, $i) |
|
205 | + { |
|
199 | 206 | $this->getHolderFromXmlDisplayForm($holders, $i); |
200 | 207 | // Append "valueURI" to name using Unicode unit separator. |
201 | 208 | if (isset($holders[$i]['valueURI'])) { |
@@ -203,7 +210,8 @@ discard block |
||
203 | 210 | } |
204 | 211 | } |
205 | 212 | |
206 | - private function getHolderFromXmlDisplayForm($holders, $i) { |
|
213 | + private function getHolderFromXmlDisplayForm($holders, $i) |
|
214 | + { |
|
207 | 215 | // Check if there is a display form. |
208 | 216 | $displayForm = $holders[$i]->xpath('./mods:displayForm'); |
209 | 217 | if ($displayForm) { |
@@ -218,7 +226,8 @@ discard block |
||
218 | 226 | * |
219 | 227 | * @return void |
220 | 228 | */ |
221 | - private function getPlaces() { |
|
229 | + private function getPlaces() |
|
230 | + { |
|
222 | 231 | $places = $this->xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:place/mods:placeTerm'); |
223 | 232 | // Get "place" and "place_sorting" again if that was to sophisticated. |
224 | 233 | if (empty($places)) { |
@@ -242,7 +251,8 @@ discard block |
||
242 | 251 | * |
243 | 252 | * @return void |
244 | 253 | */ |
245 | - private function getYears() { |
|
254 | + private function getYears() |
|
255 | + { |
|
246 | 256 | // Get "year_sorting". |
247 | 257 | if (($years_sorting = $this->xml->xpath('./mods:originInfo[not(./mods:edition="[Electronic ed.]")]/mods:dateOther[@type="order" and @encoding="w3cdtf"]'))) { |
248 | 258 | foreach ($years_sorting as $year_sorting) { |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | ) { |
347 | 347 | $solrDoc->setField('date', $metadata['date'][0]); |
348 | 348 | // change date YYYYMMDD to YYYY-MM-DD |
349 | - } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){ |
|
349 | + } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])) { |
|
350 | 350 | $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0]))); |
351 | 351 | // convert any datetime to proper ISO extended datetime format and timezone for SOLR |
352 | 352 | } else { |
@@ -549,7 +549,8 @@ discard block |
||
549 | 549 | * |
550 | 550 | * @return \Solarium\Core\Query\DocumentInterface |
551 | 551 | */ |
552 | - private static function getSolrDocument($updateQuery, $document, $unit, $fullText = '') { |
|
552 | + private static function getSolrDocument($updateQuery, $document, $unit, $fullText = '') |
|
553 | + { |
|
553 | 554 | $solrDoc = $updateQuery->createDocument(); |
554 | 555 | // Create unique identifier from document's UID and unit's XML ID. |
555 | 556 | $solrDoc->setField('id', $document->getUid() . $unit['id']); |
@@ -573,7 +574,8 @@ discard block |
||
573 | 574 | * |
574 | 575 | * @return array|string |
575 | 576 | */ |
576 | - private static function removeAppendsFromAuthor($authors) { |
|
577 | + private static function removeAppendsFromAuthor($authors) |
|
578 | + { |
|
577 | 579 | if (is_array($authors)) { |
578 | 580 | foreach ($authors as $i => $author) { |
579 | 581 | $splitName = explode(chr(31), $author); |
@@ -337,7 +337,7 @@ discard block |
||
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 | // verify date formatting |
340 | - if(strtotime($metadata['date'][0])) { |
|
340 | + if (strtotime($metadata['date'][0])) { |
|
341 | 341 | // do not alter dates YYYY or YYYY-MM or YYYY-MM-DD |
342 | 342 | if ( |
343 | 343 | preg_match("/^[\d]{4}$/", $metadata['date'][0]) |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | ) { |
347 | 347 | $solrDoc->setField('date', $metadata['date'][0]); |
348 | 348 | // change date YYYYMMDD to YYYY-MM-DD |
349 | - } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){ |
|
349 | + } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])) { |
|
350 | 350 | $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0]))); |
351 | 351 | // convert any datetime to proper ISO extended datetime format and timezone for SOLR |
352 | 352 | } else { |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | !empty($data) |
485 | 485 | && substr($index_name, -8) == '_sorting' |
486 | 486 | ) { |
487 | - $solrDoc->setField($index_name , $doc->metadataArray[$doc->toplevelId][$index_name]); |
|
487 | + $solrDoc->setField($index_name, $doc->metadataArray[$doc->toplevelId][$index_name]); |
|
488 | 488 | } |
489 | 489 | } |
490 | 490 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | // Add filter query for date search |
213 | 213 | if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) { |
214 | 214 | // combine dateFrom and dateTo into range search |
215 | - $params['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}'. $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']'; |
|
215 | + $params['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']'; |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | // Add filter query for faceting. |
@@ -243,16 +243,16 @@ discard block |
||
243 | 243 | $virtualCollectionsQueryString = ''; |
244 | 244 | foreach ($this->collection as $collectionEntry) { |
245 | 245 | // check for virtual collections query string |
246 | - if($collectionEntry->getIndexSearch()) { |
|
247 | - $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ; |
|
246 | + if ($collectionEntry->getIndexSearch()) { |
|
247 | + $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')'; |
|
248 | 248 | } else { |
249 | 249 | $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"'; |
250 | 250 | } |
251 | 251 | } |
252 | 252 | |
253 | 253 | // distinguish between simple collection browsing and actual searching within the collection(s) |
254 | - if(!empty($collectionsQueryString)) { |
|
255 | - if(empty($query)) { |
|
254 | + if (!empty($collectionsQueryString)) { |
|
255 | + if (empty($query)) { |
|
256 | 256 | $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)'; |
257 | 257 | } else { |
258 | 258 | $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))'; |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | } |
261 | 261 | |
262 | 262 | // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separatly |
263 | - if(!empty($virtualCollectionsQueryString)) { |
|
263 | + if (!empty($virtualCollectionsQueryString)) { |
|
264 | 264 | $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')'; |
265 | 265 | } |
266 | 266 | |
@@ -337,8 +337,8 @@ discard block |
||
337 | 337 | } |
338 | 338 | if ($documents[$doc['uid']]) { |
339 | 339 | // translate language code if applicable |
340 | - if($doc['metadata']['language']) { |
|
341 | - foreach($doc['metadata']['language'] as $indexName => $language) { |
|
340 | + if ($doc['metadata']['language']) { |
|
341 | + foreach ($doc['metadata']['language'] as $indexName => $language) { |
|
342 | 342 | $doc['metadata']['language'][$indexName] = Helper::getLanguageName($doc['metadata']['language'][$indexName]); |
343 | 343 | } |
344 | 344 | } |
@@ -438,8 +438,8 @@ discard block |
||
438 | 438 | |
439 | 439 | foreach ($result['documents'] as $doc) { |
440 | 440 | // translate language code if applicable |
441 | - if($doc['metadata']['language']) { |
|
442 | - foreach($doc['metadata']['language'] as $indexName => $language) { |
|
441 | + if ($doc['metadata']['language']) { |
|
442 | + foreach ($doc['metadata']['language'] as $indexName => $language) { |
|
443 | 443 | $doc['metadata']['language'][$indexName] = Helper::getLanguageName($doc['metadata']['language'][$indexName]); |
444 | 444 | } |
445 | 445 | } |
@@ -77,7 +77,8 @@ |
||
77 | 77 | * |
78 | 78 | * @return void |
79 | 79 | */ |
80 | - public function setEndpoint($endpoint) { |
|
80 | + public function setEndpoint($endpoint) |
|
81 | + { |
|
81 | 82 | $this->endpoint = $endpoint; |
82 | 83 | } |
83 | 84 |