@@ -167,9 +167,11 @@ |
||
| 167 | 167 | */ |
| 168 | 168 | public function setVocab($vocabid) |
| 169 | 169 | { |
| 170 | - if (strpos($vocabid, ' ') !== false) // if there are multiple vocabularies just storing the string |
|
| 170 | + if (strpos($vocabid, ' ') !== false) { |
|
| 171 | + // if there are multiple vocabularies just storing the string |
|
| 171 | 172 | { |
| 172 | 173 | $this->setVocabids($vocabid); |
| 174 | + } |
|
| 173 | 175 | } else { |
| 174 | 176 | $this->vocab = $this->model->getVocabulary($vocabid); |
| 175 | 177 | } |
@@ -76,10 +76,12 @@ |
||
| 76 | 76 | */ |
| 77 | 77 | public function getUriSpace() |
| 78 | 78 | { |
| 79 | - if ($this->urispace === null) // initialize cache |
|
| 79 | + if ($this->urispace === null) { |
|
| 80 | + // initialize cache |
|
| 80 | 81 | { |
| 81 | 82 | $this->urispace = $this->resource->getLiteral('void:uriSpace')->getValue(); |
| 82 | 83 | } |
| 84 | + } |
|
| 83 | 85 | |
| 84 | 86 | return $this->urispace; |
| 85 | 87 | } |
@@ -10,6 +10,9 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | class VocabularyCategory extends DataObject |
| 12 | 12 | { |
| 13 | + /** |
|
| 14 | + * @param Model $model |
|
| 15 | + */ |
|
| 13 | 16 | public function __construct($model, $resource) |
| 14 | 17 | { |
| 15 | 18 | if (!($model instanceof Model)) { |
@@ -23,6 +23,9 @@ |
||
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | + /** |
|
| 27 | + * @param string $name |
|
| 28 | + */ |
|
| 26 | 29 | private function getConstant($name, $default) |
| 27 | 30 | { |
| 28 | 31 | if (defined($name) && constant($name)) { |
@@ -387,7 +387,9 @@ discard block |
||
| 387 | 387 | $hits[] = $res; |
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | - if (sizeof($hits) > 0) return $hits; |
|
| 390 | + if (sizeof($hits) > 0) { |
|
| 391 | + return $hits; |
|
| 392 | + } |
|
| 391 | 393 | |
| 392 | 394 | // case 2: case-insensitive match on preferred label |
| 393 | 395 | foreach ($results as $res) { |
@@ -395,7 +397,9 @@ discard block |
||
| 395 | 397 | $hits[] = $res; |
| 396 | 398 | } |
| 397 | 399 | } |
| 398 | - if (sizeof($hits) > 0) return $hits; |
|
| 400 | + if (sizeof($hits) > 0) { |
|
| 401 | + return $hits; |
|
| 402 | + } |
|
| 399 | 403 | |
| 400 | 404 | if ($lang === null) { |
| 401 | 405 | // case 1A: exact match on preferred label in any language |
@@ -406,7 +410,9 @@ discard block |
||
| 406 | 410 | $hits[] = $res; |
| 407 | 411 | } |
| 408 | 412 | } |
| 409 | - if (sizeof($hits) > 0) return $hits; |
|
| 413 | + if (sizeof($hits) > 0) { |
|
| 414 | + return $hits; |
|
| 415 | + } |
|
| 410 | 416 | |
| 411 | 417 | // case 2A: case-insensitive match on preferred label in any language |
| 412 | 418 | foreach ($results as $res) { |
@@ -416,7 +422,9 @@ discard block |
||
| 416 | 422 | $hits[] = $res; |
| 417 | 423 | } |
| 418 | 424 | } |
| 419 | - if (sizeof($hits) > 0) return $hits; |
|
| 425 | + if (sizeof($hits) > 0) { |
|
| 426 | + return $hits; |
|
| 427 | + } |
|
| 420 | 428 | } |
| 421 | 429 | |
| 422 | 430 | // case 3: exact match on alternate label |
@@ -425,7 +433,9 @@ discard block |
||
| 425 | 433 | $hits[] = $res; |
| 426 | 434 | } |
| 427 | 435 | } |
| 428 | - if (sizeof($hits) > 0) return $hits; |
|
| 436 | + if (sizeof($hits) > 0) { |
|
| 437 | + return $hits; |
|
| 438 | + } |
|
| 429 | 439 | |
| 430 | 440 | |
| 431 | 441 | // case 4: case-insensitive match on alternate label |
@@ -434,7 +444,9 @@ discard block |
||
| 434 | 444 | $hits[] = $res; |
| 435 | 445 | } |
| 436 | 446 | } |
| 437 | - if (sizeof($hits) > 0) return $hits; |
|
| 447 | + if (sizeof($hits) > 0) { |
|
| 448 | + return $hits; |
|
| 449 | + } |
|
| 438 | 450 | |
| 439 | 451 | return $hits; |
| 440 | 452 | } |
@@ -75,8 +75,9 @@ |
||
| 75 | 75 | public function getSearchTerm() |
| 76 | 76 | { |
| 77 | 77 | $term = $this->request->getQueryParamRaw('q') ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query'); |
| 78 | - if (!$term && $this->rest) |
|
| 79 | - $term = $this->request->getQueryParamRaw('label'); |
|
| 78 | + if (!$term && $this->rest) { |
|
| 79 | + $term = $this->request->getQueryParamRaw('label'); |
|
| 80 | + } |
|
| 80 | 81 | $term = trim($term); // surrounding whitespace is not considered significant |
| 81 | 82 | if ($this->rest) { |
| 82 | 83 | return $term; |
@@ -25,8 +25,7 @@ |
||
| 25 | 25 | public function store($key, $value, $ttl=3600) { |
| 26 | 26 | if (function_exists('apc_store')) { |
| 27 | 27 | return apc_store($key, $value); |
| 28 | - } |
|
| 29 | - else if (function_exists('apcu_store')) { |
|
| 28 | + } else if (function_exists('apcu_store')) { |
|
| 30 | 29 | return apcu_store($key, $value, $ttl); |
| 31 | 30 | } |
| 32 | 31 | } |
@@ -55,6 +55,7 @@ |
||
| 55 | 55 | |
| 56 | 56 | /** |
| 57 | 57 | * Steps back, restoring the previous character or statement read() to the input buffer. |
| 58 | + * @param string $chars |
|
| 58 | 59 | */ |
| 59 | 60 | protected function unread($chars) |
| 60 | 61 | { |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | * Returns information (as a graph) for one or more concept URIs |
| 454 | 454 | * @param mixed $uris concept URI (string) or array of URIs |
| 455 | 455 | * @param string|null $arrayClass the URI for thesaurus array class, or null if not used |
| 456 | - * @param \Vocabulary[]|null $vocabs vocabularies to target |
|
| 456 | + * @param Vocabulary[] $vocabs vocabularies to target |
|
| 457 | 457 | * @return \Concept[] |
| 458 | 458 | */ |
| 459 | 459 | public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) { |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | |
| 674 | 674 | /** |
| 675 | 675 | * Generate a VALUES clause for limiting the targeted graphs. |
| 676 | - * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target |
|
| 676 | + * @param Vocabulary[] $vocabs array of Vocabulary objects to target |
|
| 677 | 677 | * @return string VALUES clause, or "" if not necessary to limit |
| 678 | 678 | */ |
| 679 | 679 | protected function formatValuesGraph($vocabs) { |
@@ -853,6 +853,7 @@ discard block |
||
| 853 | 853 | * @param string $searchLang language code used for matching labels (null means any language) |
| 854 | 854 | * @param string[] $props properties to target e.g. array('skos:prefLabel','skos:altLabel') |
| 855 | 855 | * @param boolean $unique restrict results to unique concepts (default: false) |
| 856 | + * @param string $filterGraph |
|
| 856 | 857 | * @return string sparql query |
| 857 | 858 | */ |
| 858 | 859 | protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $props, $unique, $filterGraph) |
@@ -1118,6 +1119,7 @@ discard block |
||
| 1118 | 1119 | /** |
| 1119 | 1120 | * Generates sparql query clauses used for creating the alphabetical index. |
| 1120 | 1121 | * @param string $letter the letter (or special class) to search for |
| 1122 | + * @param string $lang |
|
| 1121 | 1123 | * @return array of sparql query clause strings |
| 1122 | 1124 | */ |
| 1123 | 1125 | private function formatFilterConditions($letter, $lang) { |
@@ -46,12 +46,16 @@ discard block |
||
| 46 | 46 | $this->client = new EasyRdf\Sparql\Client($endpoint); |
| 47 | 47 | |
| 48 | 48 | // set graphClause so that it can be used by all queries |
| 49 | - if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable) |
|
| 49 | + if ($this->isDefaultEndpoint()) { |
|
| 50 | + // default endpoint; query any graph (and catch it in a variable) |
|
| 50 | 51 | { |
| 51 | 52 | $this->graphClause = "GRAPH $graph"; |
| 52 | - } elseif ($graph) // query a specific graph |
|
| 53 | + } |
|
| 54 | + } elseif ($graph) { |
|
| 55 | + // query a specific graph |
|
| 53 | 56 | { |
| 54 | 57 | $this->graphClause = "GRAPH <$graph>"; |
| 58 | + } |
|
| 55 | 59 | } else // query the default graph |
| 56 | 60 | { |
| 57 | 61 | $this->graphClause = ""; |
@@ -100,8 +104,9 @@ discard block |
||
| 100 | 104 | } |
| 101 | 105 | } |
| 102 | 106 | foreach ($graphs as $graph) { |
| 103 | - if($graph !== NULL) |
|
| 104 | - $clause .= "FROM NAMED <$graph> "; |
|
| 107 | + if($graph !== NULL) { |
|
| 108 | + $clause .= "FROM NAMED <$graph> "; |
|
| 109 | + } |
|
| 105 | 110 | } |
| 106 | 111 | return $clause; |
| 107 | 112 | } |
@@ -1847,8 +1852,7 @@ discard block |
||
| 1847 | 1852 | if (sizeof($ret) > 0) { |
| 1848 | 1853 | // existing concept, with children |
| 1849 | 1854 | return $ret; |
| 1850 | - } |
|
| 1851 | - else { |
|
| 1855 | + } else { |
|
| 1852 | 1856 | // nonexistent concept |
| 1853 | 1857 | return null; |
| 1854 | 1858 | } |