@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Copyright (c) 2012-2013 Aalto University and University of Helsinki |
|
4 | - * MIT License |
|
5 | - * see LICENSE.txt for more information |
|
6 | - */ |
|
3 | + * Copyright (c) 2012-2013 Aalto University and University of Helsinki |
|
4 | + * MIT License |
|
5 | + * see LICENSE.txt for more information |
|
6 | + */ |
|
7 | 7 | |
8 | 8 | /* Register text: namespace needed for jena-text queries */ |
9 | 9 | EasyRdf_Namespace::set('text', 'http://jena.apache.org/text#'); |
@@ -80,7 +80,7 @@ |
||
80 | 80 | { |
81 | 81 | if (!empty($this->values)) { |
82 | 82 | uksort($this->values, function($a, $b) { |
83 | - return strnatcasecmp($a,$b); |
|
83 | + return strnatcasecmp($a, $b); |
|
84 | 84 | }); |
85 | 85 | } |
86 | 86 | $this->is_sorted = true; |
@@ -67,8 +67,9 @@ |
||
67 | 67 | public function getSearchTerm() |
68 | 68 | { |
69 | 69 | $term = $this->request->getQueryParam('q') ? $this->request->getQueryParam('q') : $this->request->getQueryParam('query'); |
70 | - if (!$term && $this->rest) |
|
71 | - $term = $this->request->getQueryParam('label'); |
|
70 | + if (!$term && $this->rest) { |
|
71 | + $term = $this->request->getQueryParam('label'); |
|
72 | + } |
|
72 | 73 | $term = trim($term); // surrounding whitespace is not considered significant |
73 | 74 | return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search |
74 | 75 | } |
@@ -118,7 +118,7 @@ |
||
118 | 118 | return $type; |
119 | 119 | } |
120 | 120 | |
121 | - private function getQueryParam($name, $explode=false) { |
|
121 | + private function getQueryParam($name, $explode = false) { |
|
122 | 122 | if ($explode) { |
123 | 123 | return $this->request->getQueryParam($name) ? explode(' ', $this->request->getQueryParam($name)) : null; |
124 | 124 | } |
@@ -585,7 +585,7 @@ |
||
585 | 585 | |
586 | 586 | /** |
587 | 587 | * Generate a VALUES clause for limiting the targeted graphs. |
588 | - * @param array $vocabs array of Vocabulary objects to target |
|
588 | + * @param Vocabulary[] $vocabs array of Vocabulary objects to target |
|
589 | 589 | * @return string VALUES clause, or "" if not necessary to limit |
590 | 590 | */ |
591 | 591 | protected function formatValuesGraph($vocabs) { |
@@ -56,12 +56,16 @@ |
||
56 | 56 | $this->model = $model; |
57 | 57 | |
58 | 58 | // set graphClause so that it can be used by all queries |
59 | - if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable) |
|
59 | + if ($this->isDefaultEndpoint()) { |
|
60 | + // default endpoint; query any graph (and catch it in a variable) |
|
60 | 61 | { |
61 | 62 | $this->graphClause = "GRAPH $graph"; |
62 | - } elseif ($graph) // query a specific graph |
|
63 | + } |
|
64 | + } elseif ($graph) { |
|
65 | + // query a specific graph |
|
63 | 66 | { |
64 | 67 | $this->graphClause = "GRAPH <$graph>"; |
68 | + } |
|
65 | 69 | } else // query the default graph |
66 | 70 | { |
67 | 71 | $this->graphClause = ""; |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | } |
650 | 650 | } |
651 | 651 | |
652 | - return implode(' UNION ', $type_patterns);; |
|
652 | + return implode(' UNION ', $type_patterns); ; |
|
653 | 653 | } |
654 | 654 | |
655 | 655 | /** |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | |
792 | 792 | $schemecond = ''; |
793 | 793 | if (!empty($schemes)) { |
794 | - foreach($schemes as $scheme) { |
|
794 | + foreach ($schemes as $scheme) { |
|
795 | 795 | $schemecond .= "?s skos:inScheme <$scheme> . "; |
796 | 796 | } |
797 | 797 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | // convert to vocids array to support multi-vocabulary search |
169 | 169 | $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array(); |
170 | 170 | $vocabObjects = array(); |
171 | - foreach($vocids as $vocid) { |
|
171 | + foreach ($vocids as $vocid) { |
|
172 | 172 | $vocabObjects[] = $this->model->getVocabulary($vocid); |
173 | 173 | } |
174 | 174 | $parameters->setVocabularies($vocabObjects); |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | if ($request->getQueryParam('labellang')) { |
202 | 202 | $ret['@context']['@language'] = $request->getQueryParam('labellang'); |
203 | 203 | } elseif ($request->getQueryParam('lang')) { |
204 | - $ret['@context']['@language'] = $request->getQueryParam('lang');; |
|
204 | + $ret['@context']['@language'] = $request->getQueryParam('lang'); ; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | return $this->returnJson($ret); |
@@ -6,7 +6,7 @@ |
||
6 | 6 | class GlobalConfig { |
7 | 7 | private $languages; |
8 | 8 | |
9 | - public function __construct($config_name='/../config.inc') |
|
9 | + public function __construct($config_name = '/../config.inc') |
|
10 | 10 | { |
11 | 11 | try { |
12 | 12 | $file_path = dirname(__FILE__) . $config_name; |
@@ -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)) { |
@@ -68,10 +68,12 @@ |
||
68 | 68 | if ($sortable !== null) { |
69 | 69 | uksort($sortable, array($this, 'mycompare')); |
70 | 70 | foreach ($sortable as $prop => $vals) { |
71 | - if (is_array($prop)) // the ConceptProperty objects have their own sorting methods |
|
71 | + if (is_array($prop)) { |
|
72 | + // the ConceptProperty objects have their own sorting methods |
|
72 | 73 | { |
73 | 74 | ksort($sortable[$prop]); |
74 | 75 | } |
76 | + } |
|
75 | 77 | |
76 | 78 | } |
77 | 79 | } |
@@ -114,7 +114,7 @@ |
||
114 | 114 | */ |
115 | 115 | public function getEnvLang() |
116 | 116 | { |
117 | - // get language from locale, same as used by gettext, set by Controller |
|
118 | - return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore |
|
117 | + // get language from locale, same as used by gettext, set by Controller |
|
118 | + return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore |
|
119 | 119 | } |
120 | 120 | } |