@@ -79,10 +79,12 @@ |
||
79 | 79 | if ($sortable !== null) { |
80 | 80 | uksort($sortable, array($this, 'mycompare')); |
81 | 81 | foreach ($sortable as $prop => $vals) { |
82 | - if (is_array($prop)) // the ConceptProperty objects have their own sorting methods |
|
82 | + if (is_array($prop)) { |
|
83 | + // the ConceptProperty objects have their own sorting methods |
|
83 | 84 | { |
84 | 85 | ksort($sortable[$prop]); |
85 | 86 | } |
87 | + } |
|
86 | 88 | } |
87 | 89 | } |
88 | 90 | return $sortable; |
@@ -124,8 +124,8 @@ |
||
124 | 124 | */ |
125 | 125 | public function getEnvLang() |
126 | 126 | { |
127 | - // get language from locale, same as used by gettext, set by Controller |
|
128 | - return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore |
|
127 | + // get language from locale, same as used by gettext, set by Controller |
|
128 | + return substr(getenv("LC_ALL"), 0, 2); // @codeCoverageIgnore |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -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 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @param string $query |
66 | 66 | * @return string |
67 | - */ |
|
67 | + */ |
|
68 | 68 | protected function generateQueryPrefixes($query) |
69 | 69 | { |
70 | 70 | // Check for undefined prefixes |
@@ -1809,7 +1809,7 @@ discard block |
||
1809 | 1809 | |
1810 | 1810 | /** |
1811 | 1811 | * Generates a sparql query for finding the hierarchy for a concept. |
1812 | - * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal. |
|
1812 | + * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal. |
|
1813 | 1813 | * @param string $uri concept uri. |
1814 | 1814 | * @param string $lang |
1815 | 1815 | * @param string $fallback language to use if label is not available in the preferred language |
@@ -1886,10 +1886,10 @@ discard block |
||
1886 | 1886 | $ret[$uri]['exact'] = $row->exact->getUri(); |
1887 | 1887 | } |
1888 | 1888 | if (isset($row->tops)) { |
1889 | - $topConceptsList=explode(" ", $row->tops->getValue()); |
|
1890 | - // sort to garantee an alphabetical ordering of the URI |
|
1891 | - sort($topConceptsList); |
|
1892 | - $ret[$uri]['tops'] = $topConceptsList; |
|
1889 | + $topConceptsList=explode(" ", $row->tops->getValue()); |
|
1890 | + // sort to garantee an alphabetical ordering of the URI |
|
1891 | + sort($topConceptsList); |
|
1892 | + $ret[$uri]['tops'] = $topConceptsList; |
|
1893 | 1893 | } |
1894 | 1894 | if (isset($row->children)) { |
1895 | 1895 | if (!isset($ret[$uri]['narrower'])) { |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | protected function query($query) { |
88 | 88 | $queryId = sprintf("%05d", rand(0, 99999)); |
89 | 89 | $logger = $this->model->getLogger(); |
90 | - $logger->info("[qid $queryId] SPARQL query:\n" . $this->generateQueryPrefixes($query) . "\n$query\n"); |
|
90 | + $logger->info("[qid $queryId] SPARQL query:\n".$this->generateQueryPrefixes($query)."\n$query\n"); |
|
91 | 91 | $starttime = microtime(true); |
92 | 92 | $result = $this->client->query($query); |
93 | 93 | $elapsed = intval(round((microtime(true) - $starttime) * 1000)); |
94 | - if(method_exists($result, 'numRows')) { |
|
94 | + if (method_exists($result, 'numRows')) { |
|
95 | 95 | $numRows = $result->numRows(); |
96 | 96 | $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms"); |
97 | 97 | } else { // graph result |
@@ -107,20 +107,20 @@ discard block |
||
107 | 107 | * @param Vocabulary[]|null $vocabs |
108 | 108 | * @return string |
109 | 109 | */ |
110 | - protected function generateFromClause($vocabs=null) { |
|
110 | + protected function generateFromClause($vocabs = null) { |
|
111 | 111 | $graphs = array(); |
112 | 112 | $clause = ''; |
113 | 113 | if (!$vocabs) { |
114 | 114 | return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : ''; |
115 | 115 | } |
116 | - foreach($vocabs as $vocab) { |
|
116 | + foreach ($vocabs as $vocab) { |
|
117 | 117 | $graph = $vocab->getGraph(); |
118 | 118 | if (!in_array($graph, $graphs)) { |
119 | 119 | array_push($graphs, $graph); |
120 | 120 | } |
121 | 121 | } |
122 | 122 | foreach ($graphs as $graph) { |
123 | - if($graph !== NULL) |
|
123 | + if ($graph !== NULL) |
|
124 | 124 | $clause .= "FROM NAMED <$graph> "; |
125 | 125 | } |
126 | 126 | return $clause; |
@@ -664,9 +664,9 @@ discard block |
||
664 | 664 | $conceptscheme['title'] = $row->title->getValue(); |
665 | 665 | } |
666 | 666 | // add dct:subject and their labels in the result |
667 | - if(isset($row->domain) && isset($row->domainLabel)){ |
|
668 | - $conceptscheme['subject']['uri']=$row->domain->getURI(); |
|
669 | - $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue(); |
|
667 | + if (isset($row->domain) && isset($row->domainLabel)) { |
|
668 | + $conceptscheme['subject']['uri'] = $row->domain->getURI(); |
|
669 | + $conceptscheme['subject']['prefLabel'] = $row->domainLabel->getValue(); |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | $ret[$row->cs->getURI()] = $conceptscheme; |
@@ -729,7 +729,7 @@ discard block |
||
729 | 729 | foreach ($graphs as $graph) { |
730 | 730 | $values[] = "<$graph>"; |
731 | 731 | } |
732 | - return "FILTER (?graph IN (" . implode(',', $values) . "))"; |
|
732 | + return "FILTER (?graph IN (".implode(',', $values)."))"; |
|
733 | 733 | } |
734 | 734 | |
735 | 735 | /** |
@@ -739,16 +739,16 @@ discard block |
||
739 | 739 | * @return string sparql query clauses |
740 | 740 | */ |
741 | 741 | protected function formatLimitAndOffset($limit, $offset) { |
742 | - $limit = ($limit) ? 'LIMIT ' . $limit : ''; |
|
743 | - $offset = ($offset) ? 'OFFSET ' . $offset : ''; |
|
742 | + $limit = ($limit) ? 'LIMIT '.$limit : ''; |
|
743 | + $offset = ($offset) ? 'OFFSET '.$offset : ''; |
|
744 | 744 | // eliminating whitespace and line changes when the conditions aren't needed. |
745 | 745 | $limitandoffset = ''; |
746 | 746 | if ($limit && $offset) { |
747 | - $limitandoffset = "\n" . $limit . "\n" . $offset; |
|
747 | + $limitandoffset = "\n".$limit."\n".$offset; |
|
748 | 748 | } elseif ($limit) { |
749 | - $limitandoffset = "\n" . $limit; |
|
749 | + $limitandoffset = "\n".$limit; |
|
750 | 750 | } elseif ($offset) { |
751 | - $limitandoffset = "\n" . $offset; |
|
751 | + $limitandoffset = "\n".$offset; |
|
752 | 752 | } |
753 | 753 | |
754 | 754 | return $limitandoffset; |
@@ -900,14 +900,14 @@ discard block |
||
900 | 900 | // if search language and UI/display language differ, must also consider case where there is no prefLabel in |
901 | 901 | // the display language; in that case, should use the label with the same language as the matched label |
902 | 902 | $labelcondFallback = ($searchLang != $lang) ? |
903 | - "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" . |
|
903 | + "OPTIONAL { # in case previous OPTIONAL block gives no labels\n". |
|
904 | 904 | "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : ""; |
905 | 905 | |
906 | 906 | // Including the labels if there is no query term given. |
907 | 907 | if ($rawterm === '') { |
908 | 908 | $labelClause = "?s skos:prefLabel ?label ."; |
909 | - $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . ""; |
|
910 | - return $labelClause . " BIND(?label AS ?match)"; |
|
909 | + $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause.""; |
|
910 | + return $labelClause." BIND(?label AS ?match)"; |
|
911 | 911 | } |
912 | 912 | |
913 | 913 | /* |
@@ -971,20 +971,20 @@ discard block |
||
971 | 971 | $schemecond = ''; |
972 | 972 | if (!empty($schemes)) { |
973 | 973 | $conditions = array(); |
974 | - foreach($schemes as $scheme) { |
|
974 | + foreach ($schemes as $scheme) { |
|
975 | 975 | $conditions[] = "{?s skos:inScheme <$scheme>}"; |
976 | 976 | } |
977 | - $schemecond = '{'.implode(" UNION ",$conditions).'}'; |
|
977 | + $schemecond = '{'.implode(" UNION ", $conditions).'}'; |
|
978 | 978 | } |
979 | - $filterDeprecated=""; |
|
979 | + $filterDeprecated = ""; |
|
980 | 980 | //show or hide deprecated concepts |
981 | - if(!$showDeprecated){ |
|
982 | - $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
981 | + if (!$showDeprecated) { |
|
982 | + $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
983 | 983 | } |
984 | 984 | // extra conditions for parent and group, if specified |
985 | - $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : ""; |
|
986 | - $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : ""; |
|
987 | - $pgcond = $parentcond . $groupcond; |
|
985 | + $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : ""; |
|
986 | + $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : ""; |
|
987 | + $pgcond = $parentcond.$groupcond; |
|
988 | 988 | |
989 | 989 | $orderextra = $this->isDefaultEndpoint() ? $this->graph : ''; |
990 | 990 | |
@@ -1057,9 +1057,9 @@ discard block |
||
1057 | 1057 | $hit['type'][] = $this->shortenUri($typeuri); |
1058 | 1058 | } |
1059 | 1059 | |
1060 | - if(!empty($fields)) { |
|
1060 | + if (!empty($fields)) { |
|
1061 | 1061 | foreach ($fields as $prop) { |
1062 | - $propname = $prop . 's'; |
|
1062 | + $propname = $prop.'s'; |
|
1063 | 1063 | if (isset($row->$propname)) { |
1064 | 1064 | foreach (explode("\n", $row->$propname->getValue()) as $line) { |
1065 | 1065 | $rdata = str_getcsv($line, ',', '"', '"'); |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | $propvals = $rdata[2]; |
1075 | 1075 | } |
1076 | 1076 | |
1077 | - $hit['skos:' . $prop][] = $propvals; |
|
1077 | + $hit['skos:'.$prop][] = $propvals; |
|
1078 | 1078 | } |
1079 | 1079 | } |
1080 | 1080 | } |
@@ -1150,7 +1150,7 @@ discard block |
||
1150 | 1150 | * @return array query result object |
1151 | 1151 | */ |
1152 | 1152 | public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) { |
1153 | - $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated); |
|
1153 | + $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated); |
|
1154 | 1154 | $results = $this->query($query); |
1155 | 1155 | return $this->transformConceptSearchResults($results, $vocabs, $fields); |
1156 | 1156 | } |
@@ -1204,9 +1204,9 @@ discard block |
||
1204 | 1204 | $conditions = $this->formatFilterConditions($letter, $lang); |
1205 | 1205 | $filtercondLabel = $conditions['filterpref']; |
1206 | 1206 | $filtercondALabel = $conditions['filteralt']; |
1207 | - $filterDeprecated=""; |
|
1208 | - if(!$showDeprecated){ |
|
1209 | - $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
1207 | + $filterDeprecated = ""; |
|
1208 | + if (!$showDeprecated) { |
|
1209 | + $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
1210 | 1210 | } |
1211 | 1211 | $query = <<<EOQ |
1212 | 1212 | SELECT DISTINCT ?s ?label ?alabel $fcl |
@@ -1282,8 +1282,8 @@ discard block |
||
1282 | 1282 | * @param array $classes |
1283 | 1283 | * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false) |
1284 | 1284 | */ |
1285 | - public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) { |
|
1286 | - $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated); |
|
1285 | + public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) { |
|
1286 | + $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated); |
|
1287 | 1287 | $results = $this->query($query); |
1288 | 1288 | return $this->transformAlphabeticalListResults($results); |
1289 | 1289 | } |
@@ -1617,7 +1617,7 @@ discard block |
||
1617 | 1617 | if (!isset($row->label) || $row->label->getLang() === $lang) { |
1618 | 1618 | $ret[$row->object->getUri()] = $val; |
1619 | 1619 | } elseif ($row->label->getLang() === $fallbacklang) { |
1620 | - $val['label'] .= ' (' . $row->label->getLang() . ')'; |
|
1620 | + $val['label'] .= ' ('.$row->label->getLang().')'; |
|
1621 | 1621 | $ret[$row->object->getUri()] = $val; |
1622 | 1622 | } |
1623 | 1623 | } |
@@ -1713,10 +1713,10 @@ discard block |
||
1713 | 1713 | |
1714 | 1714 | $label = null; |
1715 | 1715 | if (isset($row->label)) { |
1716 | - if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) { |
|
1716 | + if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) { |
|
1717 | 1717 | $label = $row->label->getValue(); |
1718 | 1718 | } else { |
1719 | - $label = $row->label->getValue() . " (" . $row->label->getLang() . ")"; |
|
1719 | + $label = $row->label->getValue()." (".$row->label->getLang().")"; |
|
1720 | 1720 | } |
1721 | 1721 | |
1722 | 1722 | } |
@@ -1792,8 +1792,8 @@ discard block |
||
1792 | 1792 | foreach ($result as $row) { |
1793 | 1793 | if (isset($row->top) && isset($row->label)) { |
1794 | 1794 | $label = $row->label->getValue(); |
1795 | - if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) { |
|
1796 | - $label .= ' (' . $row->label->getLang() . ')'; |
|
1795 | + if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) { |
|
1796 | + $label .= ' ('.$row->label->getLang().')'; |
|
1797 | 1797 | } |
1798 | 1798 | $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN)); |
1799 | 1799 | if (isset($row->notation)) { |
@@ -1886,7 +1886,7 @@ discard block |
||
1886 | 1886 | $ret[$uri]['exact'] = $row->exact->getUri(); |
1887 | 1887 | } |
1888 | 1888 | if (isset($row->tops)) { |
1889 | - $topConceptsList=explode(" ", $row->tops->getValue()); |
|
1889 | + $topConceptsList = explode(" ", $row->tops->getValue()); |
|
1890 | 1890 | // sort to garantee an alphabetical ordering of the URI |
1891 | 1891 | sort($topConceptsList); |
1892 | 1892 | $ret[$uri]['tops'] = $topConceptsList; |
@@ -1899,8 +1899,8 @@ discard block |
||
1899 | 1899 | $label = null; |
1900 | 1900 | if (isset($row->childlabel)) { |
1901 | 1901 | $label = $row->childlabel->getValue(); |
1902 | - if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) { |
|
1903 | - $label .= " (" . $row->childlabel->getLang() . ")"; |
|
1902 | + if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) { |
|
1903 | + $label .= " (".$row->childlabel->getLang().")"; |
|
1904 | 1904 | } |
1905 | 1905 | |
1906 | 1906 | } |
@@ -1921,8 +1921,8 @@ discard block |
||
1921 | 1921 | } |
1922 | 1922 | if (isset($row->label)) { |
1923 | 1923 | $preflabel = $row->label->getValue(); |
1924 | - if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) { |
|
1925 | - $preflabel .= ' (' . $row->label->getLang() . ')'; |
|
1924 | + if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) { |
|
1925 | + $preflabel .= ' ('.$row->label->getLang().')'; |
|
1926 | 1926 | } |
1927 | 1927 | |
1928 | 1928 | $ret[$uri]['prefLabel'] = $preflabel; |
@@ -2043,9 +2043,9 @@ discard block |
||
2043 | 2043 | */ |
2044 | 2044 | private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) { |
2045 | 2045 | $fcl = $this->generateFromClause(); |
2046 | - $filterDeprecated=""; |
|
2047 | - if(!$showDeprecated){ |
|
2048 | - $filterDeprecated=" FILTER NOT EXISTS { ?conc owl:deprecated true }"; |
|
2046 | + $filterDeprecated = ""; |
|
2047 | + if (!$showDeprecated) { |
|
2048 | + $filterDeprecated = " FILTER NOT EXISTS { ?conc owl:deprecated true }"; |
|
2049 | 2049 | } |
2050 | 2050 | $query = <<<EOQ |
2051 | 2051 | SELECT ?conc ?super ?label ?members ?type ?notation $fcl |
@@ -2084,10 +2084,10 @@ discard block |
||
2084 | 2084 | 'type' => array($row->type->shorten()), |
2085 | 2085 | ); |
2086 | 2086 | if (isset($row->label)) { |
2087 | - if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) { |
|
2087 | + if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) { |
|
2088 | 2088 | $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue(); |
2089 | 2089 | } else { |
2090 | - $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")"; |
|
2090 | + $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")"; |
|
2091 | 2091 | } |
2092 | 2092 | |
2093 | 2093 | } |
@@ -2115,8 +2115,8 @@ discard block |
||
2115 | 2115 | * @param boolean $showDeprecated whether to include deprecated concepts in search results |
2116 | 2116 | * @return array Result array with concept URI as key and concept label as value |
2117 | 2117 | */ |
2118 | - public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) { |
|
2119 | - $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated); |
|
2118 | + public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) { |
|
2119 | + $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated); |
|
2120 | 2120 | $result = $this->query($query); |
2121 | 2121 | return $this->transformConceptGroupContentsResults($result, $lang); |
2122 | 2122 | } |
@@ -2129,7 +2129,7 @@ discard block |
||
2129 | 2129 | */ |
2130 | 2130 | private function generateChangeListQuery($lang, $offset, $prop) { |
2131 | 2131 | $fcl = $this->generateFromClause(); |
2132 | - $offset = ($offset) ? 'OFFSET ' . $offset : ''; |
|
2132 | + $offset = ($offset) ? 'OFFSET '.$offset : ''; |
|
2133 | 2133 | |
2134 | 2134 | $query = <<<EOQ |
2135 | 2135 | SELECT DISTINCT ?concept ?date ?label $fcl |
@@ -289,6 +289,7 @@ discard block |
||
289 | 289 | /** |
290 | 290 | * Counts the number of concepts in a easyRDF graph with a specific language. |
291 | 291 | * @param array $langs Languages to query for |
292 | + * @param string[] $classes |
|
292 | 293 | * @return Array containing count of concepts for each language and property. |
293 | 294 | */ |
294 | 295 | public function countLangConcepts($langs, $classes = null) { |
@@ -473,7 +474,7 @@ discard block |
||
473 | 474 | * Returns information (as a graph) for one or more concept URIs |
474 | 475 | * @param mixed $uris concept URI (string) or array of URIs |
475 | 476 | * @param string|null $arrayClass the URI for thesaurus array class, or null if not used |
476 | - * @param \Vocabulary[]|null $vocabs vocabularies to target |
|
477 | + * @param Vocabulary[] $vocabs vocabularies to target |
|
477 | 478 | * @return \EasyRdf\Graph |
478 | 479 | */ |
479 | 480 | public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) { |
@@ -489,7 +490,7 @@ discard block |
||
489 | 490 | |
490 | 491 | /** |
491 | 492 | * Returns information (as an array of Concept objects) for one or more concept URIs |
492 | - * @param mixed $uris concept URI (string) or array of URIs |
|
493 | + * @param string $uris concept URI (string) or array of URIs |
|
493 | 494 | * @param string|null $arrayClass the URI for thesaurus array class, or null if not used |
494 | 495 | * @param \Vocabulary[] $vocabs vocabularies to target |
495 | 496 | * @param string|null $clang content language |
@@ -704,7 +705,7 @@ discard block |
||
704 | 705 | |
705 | 706 | /** |
706 | 707 | * Generate a VALUES clause for limiting the targeted graphs. |
707 | - * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target |
|
708 | + * @param Vocabulary[] $vocabs array of Vocabulary objects to target |
|
708 | 709 | * @return string VALUES clause, or "" if not necessary to limit |
709 | 710 | */ |
710 | 711 | protected function formatValuesGraph($vocabs) { |
@@ -884,6 +885,7 @@ discard block |
||
884 | 885 | * @param string $searchLang language code used for matching labels (null means any language) |
885 | 886 | * @param string[] $props properties to target e.g. array('skos:prefLabel','skos:altLabel') |
886 | 887 | * @param boolean $unique restrict results to unique concepts (default: false) |
888 | + * @param string $filterGraph |
|
887 | 889 | * @return string sparql query |
888 | 890 | */ |
889 | 891 | protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $props, $unique, $filterGraph) |
@@ -1158,6 +1160,7 @@ discard block |
||
1158 | 1160 | /** |
1159 | 1161 | * Generates sparql query clauses used for creating the alphabetical index. |
1160 | 1162 | * @param string $letter the letter (or special class) to search for |
1163 | + * @param string $lang |
|
1161 | 1164 | * @return array of sparql query clause strings |
1162 | 1165 | */ |
1163 | 1166 | private function formatFilterConditions($letter, $lang) { |
@@ -1325,6 +1328,7 @@ discard block |
||
1325 | 1328 | /** |
1326 | 1329 | * Query for the first characters (letter or otherwise) of the labels in the particular language. |
1327 | 1330 | * @param string $lang language |
1331 | + * @param string[] $classes |
|
1328 | 1332 | * @return array array of characters |
1329 | 1333 | */ |
1330 | 1334 | public function queryFirstCharacters($lang, $classes = null) { |
@@ -1647,7 +1651,7 @@ discard block |
||
1647 | 1651 | /** |
1648 | 1652 | * Query a single transitive property of a concept. |
1649 | 1653 | * @param string $uri |
1650 | - * @param array $props the property/properties. |
|
1654 | + * @param string[] $props the property/properties. |
|
1651 | 1655 | * @param string $lang |
1652 | 1656 | * @param string $fallbacklang language to use if label is not available in the preferred language |
1653 | 1657 | * @param integer $limit |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | // 1. Ensure characters with special meaning in Lucene are escaped |
41 | 41 | $lucenemap = array(); |
42 | 42 | foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) { |
43 | - $lucenemap[$char] = '\\' . $char; // escape with a backslash |
|
43 | + $lucenemap[$char] = '\\'.$char; // escape with a backslash |
|
44 | 44 | } |
45 | 45 | $term = strtr($term, $lucenemap); |
46 | 46 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @return string sparql order by clause |
83 | 83 | */ |
84 | 84 | private function formatOrderBy($expression, $lang) { |
85 | - if(!$this->model->getConfig()->getCollationEnabled()) { |
|
85 | + if (!$this->model->getConfig()->getCollationEnabled()) { |
|
86 | 86 | return $expression; |
87 | 87 | } |
88 | 88 | $orderby = sprintf('arq:collation(\'%2$s\', %1$s)', $expression, $lang); |
@@ -114,13 +114,13 @@ discard block |
||
114 | 114 | |
115 | 115 | # make text query clause |
116 | 116 | $lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe |
117 | - $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $lang); |
|
118 | - $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $lang); |
|
117 | + $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $lang); |
|
118 | + $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $lang); |
|
119 | 119 | $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang); |
120 | 120 | |
121 | - $filterDeprecated=""; |
|
122 | - if(!$showDeprecated){ |
|
123 | - $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
121 | + $filterDeprecated = ""; |
|
122 | + if (!$showDeprecated) { |
|
123 | + $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | $query = <<<EOQ |
@@ -3,6 +3,9 @@ |
||
3 | 3 | class LabelSkosXL extends DataObject |
4 | 4 | { |
5 | 5 | |
6 | + /** |
|
7 | + * @param Model $model |
|
8 | + */ |
|
6 | 9 | public function __construct($model, $resource) |
7 | 10 | { |
8 | 11 | parent::__construct($model, $resource); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | public function getPrefLabel() { |
12 | 12 | $label = null; |
13 | 13 | $labels = $this->resource->allResources('skosxl:prefLabel'); |
14 | - foreach($labels as $labres) { |
|
14 | + foreach ($labels as $labres) { |
|
15 | 15 | $label = $labres->getLiteral('skosxl:literalForm'); |
16 | 16 | if ($label->getLang() == $this->clang) { |
17 | 17 | return $label; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | public function getProperties() { |
24 | 24 | $ret = array(); |
25 | 25 | $props = $this->resource->properties(); |
26 | - foreach($props as $prop) { |
|
26 | + foreach ($props as $prop) { |
|
27 | 27 | if ($prop !== 'skosxl:prefLabel') { |
28 | 28 | $ret[$prop] = $this->resource->get($prop); |
29 | 29 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | return Punic\Calendar::formatDate($val, 'short'); |
50 | 50 | } catch (Exception $e) { |
51 | 51 | trigger_error($e->getMessage(), E_USER_WARNING); |
52 | - return (string) $this->literal; |
|
52 | + return (string)$this->literal; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | return $this->literal->getValue(); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $resources = $graph->resourcesMatching('skosxl:literalForm', $this->literal); |
81 | 81 | foreach ($resources as $xlres) { |
82 | 82 | foreach ($xlres->properties() as $prop) { |
83 | - foreach($graph->allLiterals($xlres, $prop) as $val) { |
|
83 | + foreach ($graph->allLiterals($xlres, $prop) as $val) { |
|
84 | 84 | if ($prop !== 'rdf:type') { |
85 | 85 | $ret[$prop] = $val; |
86 | 86 | } |
@@ -10,6 +10,11 @@ |
||
10 | 10 | /** property type */ |
11 | 11 | private $type; |
12 | 12 | |
13 | + /** |
|
14 | + * @param Model $model |
|
15 | + * @param Vocabulary $vocab |
|
16 | + * @param EasyRdf\Resource $resource |
|
17 | + */ |
|
13 | 18 | public function __construct($model, $vocab, $resource, $literal, $prop) |
14 | 19 | { |
15 | 20 | parent::__construct($model, $vocab, $resource); |
@@ -75,7 +75,7 @@ |
||
75 | 75 | if ($this->rest) { |
76 | 76 | return $term; |
77 | 77 | } |
78 | - return strpos($term, "*") === false ? $term . "*" : $term; // default to prefix search |
|
78 | + return strpos($term, "*") === false ? $term."*" : $term; // default to prefix search |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | public function getContentLang() |
@@ -69,8 +69,9 @@ |
||
69 | 69 | public function getSearchTerm() |
70 | 70 | { |
71 | 71 | $term = $this->request->getQueryParamRaw('q') ? $this->request->getQueryParamRaw('q') : $this->request->getQueryParamRaw('query'); |
72 | - if (!$term && $this->rest) |
|
73 | - $term = $this->request->getQueryParamRaw('label'); |
|
72 | + if (!$term && $this->rest) { |
|
73 | + $term = $this->request->getQueryParamRaw('label'); |
|
74 | + } |
|
74 | 75 | $term = trim($term); // surrounding whitespace is not considered significant |
75 | 76 | if ($this->rest) { |
76 | 77 | return $term; |
@@ -400,7 +400,9 @@ discard block |
||
400 | 400 | $hits[] = $res; |
401 | 401 | } |
402 | 402 | } |
403 | - if (sizeof($hits) > 0) return $hits; |
|
403 | + if (sizeof($hits) > 0) { |
|
404 | + return $hits; |
|
405 | + } |
|
404 | 406 | |
405 | 407 | // case 2: case-insensitive match on preferred label |
406 | 408 | foreach ($results as $res) { |
@@ -408,7 +410,9 @@ discard block |
||
408 | 410 | $hits[] = $res; |
409 | 411 | } |
410 | 412 | } |
411 | - if (sizeof($hits) > 0) return $hits; |
|
413 | + if (sizeof($hits) > 0) { |
|
414 | + return $hits; |
|
415 | + } |
|
412 | 416 | |
413 | 417 | if ($lang === null) { |
414 | 418 | // case 1A: exact match on preferred label in any language |
@@ -419,7 +423,9 @@ discard block |
||
419 | 423 | $hits[] = $res; |
420 | 424 | } |
421 | 425 | } |
422 | - if (sizeof($hits) > 0) return $hits; |
|
426 | + if (sizeof($hits) > 0) { |
|
427 | + return $hits; |
|
428 | + } |
|
423 | 429 | |
424 | 430 | // case 2A: case-insensitive match on preferred label in any language |
425 | 431 | foreach ($results as $res) { |
@@ -429,7 +435,9 @@ discard block |
||
429 | 435 | $hits[] = $res; |
430 | 436 | } |
431 | 437 | } |
432 | - if (sizeof($hits) > 0) return $hits; |
|
438 | + if (sizeof($hits) > 0) { |
|
439 | + return $hits; |
|
440 | + } |
|
433 | 441 | } |
434 | 442 | |
435 | 443 | // case 3: exact match on alternate label |
@@ -438,7 +446,9 @@ discard block |
||
438 | 446 | $hits[] = $res; |
439 | 447 | } |
440 | 448 | } |
441 | - if (sizeof($hits) > 0) return $hits; |
|
449 | + if (sizeof($hits) > 0) { |
|
450 | + return $hits; |
|
451 | + } |
|
442 | 452 | |
443 | 453 | |
444 | 454 | // case 4: case-insensitive match on alternate label |
@@ -447,7 +457,9 @@ discard block |
||
447 | 457 | $hits[] = $res; |
448 | 458 | } |
449 | 459 | } |
450 | - if (sizeof($hits) > 0) return $hits; |
|
460 | + if (sizeof($hits) > 0) { |
|
461 | + return $hits; |
|
462 | + } |
|
451 | 463 | |
452 | 464 | return $hits; |
453 | 465 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | // wrap with JSONP callback if requested |
26 | 26 | if (filter_input(INPUT_GET, 'callback', FILTER_SANITIZE_STRING)) { |
27 | 27 | header("Content-type: application/javascript; charset=utf-8"); |
28 | - echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW) . "(" . json_encode($data) . ");"; |
|
28 | + echo filter_input(INPUT_GET, 'callback', FILTER_UNSAFE_RAW)."(".json_encode($data).");"; |
|
29 | 29 | return; |
30 | 30 | } |
31 | 31 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | 'vocabularies' => 'onki:hasVocabulary', |
89 | 89 | 'id' => 'onki:vocabularyIdentifier', |
90 | 90 | 'uri' => '@id', |
91 | - '@base' => $this->getBaseHref() . "rest/v1/vocabularies", |
|
91 | + '@base' => $this->getBaseHref()."rest/v1/vocabularies", |
|
92 | 92 | ), |
93 | 93 | 'uri' => '', |
94 | 94 | 'vocabularies' => $results, |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | // convert to vocids array to support multi-vocabulary search |
106 | 106 | $vocids = ($vocabs !== null && $vocabs !== '') ? explode(' ', $vocabs) : array(); |
107 | 107 | $vocabObjects = array(); |
108 | - foreach($vocids as $vocid) { |
|
108 | + foreach ($vocids as $vocid) { |
|
109 | 109 | $vocabObjects[] = $this->model->getVocabulary($vocid); |
110 | 110 | } |
111 | 111 | $parameters->setVocabularies($vocabObjects); |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | foreach ($parameters->getAdditionalFields() as $field) { |
137 | 137 | |
138 | 138 | // Quick-and-dirty compactification |
139 | - $context[$field] = 'skos:' . $field; |
|
139 | + $context[$field] = 'skos:'.$field; |
|
140 | 140 | foreach ($results as &$result) { |
141 | 141 | foreach ($result as $k => $v) { |
142 | - if ($k == 'skos:' . $field) { |
|
142 | + if ($k == 'skos:'.$field) { |
|
143 | 143 | $result[$field] = $v; |
144 | - unset($result['skos:' . $field]); |
|
144 | + unset($result['skos:'.$field]); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | if ($request->getQueryParam('labellang')) { |
161 | 161 | $ret['@context']['@language'] = $request->getQueryParam('labellang'); |
162 | 162 | } elseif ($request->getQueryParam('lang')) { |
163 | - $ret['@context']['@language'] = $request->getQueryParam('lang');; |
|
163 | + $ret['@context']['@language'] = $request->getQueryParam('lang'); ; |
|
164 | 164 | } |
165 | 165 | return $ret; |
166 | 166 | } |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | 'prefLabel' => 'skos:prefLabel', |
228 | 228 | 'title' => 'dct:title', |
229 | 229 | '@language' => $request->getLang(), |
230 | - '@base' => $this->getBaseHref() . "rest/v1/" . $vocab->getId() . "/", |
|
230 | + '@base' => $this->getBaseHref()."rest/v1/".$vocab->getId()."/", |
|
231 | 231 | ), |
232 | 232 | 'uri' => '', |
233 | 233 | 'id' => $vocab->getId(), |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | 'subTypes' => array('@id' => 'void:class', '@type' => '@id'), |
278 | 278 | 'count' => 'void:entities', |
279 | 279 | '@language' => $request->getLang(), |
280 | - '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/", |
|
280 | + '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/", |
|
281 | 281 | ), |
282 | 282 | 'uri' => '', |
283 | 283 | 'id' => $request->getVocab()->getId(), |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | 'language' => 'void-ext:language', |
352 | 352 | 'properties' => 'void:propertyPartition', |
353 | 353 | 'labels' => 'void:triples', |
354 | - '@base' => $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/", |
|
354 | + '@base' => $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/", |
|
355 | 355 | ), |
356 | 356 | 'uri' => '', |
357 | 357 | 'id' => $request->getVocab()->getId(), |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | $types[] = $type; |
389 | 389 | } |
390 | 390 | |
391 | - $base = $request->getVocab() ? $this->getBaseHref() . "rest/v1/" . $request->getVocab()->getId() . "/" : $this->getBaseHref() . "rest/v1/"; |
|
391 | + $base = $request->getVocab() ? $this->getBaseHref()."rest/v1/".$request->getVocab()->getId()."/" : $this->getBaseHref()."rest/v1/"; |
|
392 | 392 | |
393 | 393 | $ret = array_merge_recursive($this->context, array( |
394 | 394 | '@context' => array( |
@@ -548,10 +548,10 @@ discard block |
||
548 | 548 | |
549 | 549 | $format = $this->negotiateFormat(array_keys($urls), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format')); |
550 | 550 | if (!$format) { |
551 | - return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . implode(' ', array_keys($urls))); |
|
551 | + return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".implode(' ', array_keys($urls))); |
|
552 | 552 | } |
553 | 553 | |
554 | - header("Location: " . $urls[$format]); |
|
554 | + header("Location: ".$urls[$format]); |
|
555 | 555 | } |
556 | 556 | |
557 | 557 | private function returnDataResults($results, $format) { |
@@ -610,7 +610,7 @@ discard block |
||
610 | 610 | |
611 | 611 | $format = $this->negotiateFormat(explode(' ', self::SUPPORTED_FORMATS), $request->getServerConstant('HTTP_ACCEPT'), $request->getQueryParam('format')); |
612 | 612 | if (!$format) { |
613 | - return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: " . self::SUPPORTED_FORMATS); |
|
613 | + return $this->returnError(406, 'Not Acceptable', "Unsupported format. Supported MIME types are: ".self::SUPPORTED_FORMATS); |
|
614 | 614 | } |
615 | 615 | |
616 | 616 | $vocid = $vocab ? $vocab->getId() : null; |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | } |
771 | 771 | } |
772 | 772 | // if the main concept scheme was not found, set 'top' to the first 'tops' (sorted alphabetically on the URIs) |
773 | - if (! isset($results[$uri]['top'])) { |
|
773 | + if (!isset($results[$uri]['top'])) { |
|
774 | 774 | $results[$uri]['top'] = $results[$uri]['tops'][0]; |
775 | 775 | } |
776 | 776 | } else { |
@@ -97,6 +97,9 @@ discard block |
||
97 | 97 | return $this->returnJson($ret); |
98 | 98 | } |
99 | 99 | |
100 | + /** |
|
101 | + * @param Request $request |
|
102 | + */ |
|
100 | 103 | private function constructSearchParameters($request) |
101 | 104 | { |
102 | 105 | $parameters = new ConceptSearchParameters($request, $this->model->getConfig(), true); |
@@ -112,6 +115,10 @@ discard block |
||
112 | 115 | return $parameters; |
113 | 116 | } |
114 | 117 | |
118 | + /** |
|
119 | + * @param Request $request |
|
120 | + * @param ConceptSearchParameters $parameters |
|
121 | + */ |
|
115 | 122 | private function transformSearchResults($request, $results, $parameters) |
116 | 123 | { |
117 | 124 | // before serializing to JSON, get rid of the Vocabulary object that came with each resource |
@@ -408,6 +415,10 @@ discard block |
||
408 | 415 | return $this->returnJson($ret); |
409 | 416 | } |
410 | 417 | |
418 | + /** |
|
419 | + * @param string $label |
|
420 | + * @param string $lang |
|
421 | + */ |
|
411 | 422 | private function findLookupHits($results, $label, $lang) |
412 | 423 | { |
413 | 424 | $hits = array(); |
@@ -469,6 +480,9 @@ discard block |
||
469 | 480 | return $hits; |
470 | 481 | } |
471 | 482 | |
483 | + /** |
|
484 | + * @param string $lang |
|
485 | + */ |
|
472 | 486 | private function transformLookupResults($lang, $hits) |
473 | 487 | { |
474 | 488 | if (sizeof($hits) == 0) { |
@@ -540,6 +554,9 @@ discard block |
||
540 | 554 | return $this->returnJson($ret); |
541 | 555 | } |
542 | 556 | |
557 | + /** |
|
558 | + * @param Request $request |
|
559 | + */ |
|
543 | 560 | private function redirectToVocabData($request) { |
544 | 561 | $urls = $request->getVocab()->getConfig()->getDataURLs(); |
545 | 562 | if (sizeof($urls) == 0) { |
@@ -555,6 +572,9 @@ discard block |
||
555 | 572 | header("Location: " . $urls[$format]); |
556 | 573 | } |
557 | 574 | |
575 | + /** |
|
576 | + * @param string $format |
|
577 | + */ |
|
558 | 578 | private function returnDataResults($results, $format) { |
559 | 579 | if ($format == 'application/ld+json' || $format == 'application/json') { |
560 | 580 | // further compact JSON-LD document using a context |
@@ -650,6 +670,12 @@ discard block |
||
650 | 670 | return $this->returnJson($ret); |
651 | 671 | } |
652 | 672 | |
673 | + /** |
|
674 | + * @param string $uri |
|
675 | + * @param string $lang |
|
676 | + * @param string $propname |
|
677 | + * @param string $propuri |
|
678 | + */ |
|
653 | 679 | private function transformPropertyResults($uri, $lang, $objects, $propname, $propuri) |
654 | 680 | { |
655 | 681 | $results = array(); |
@@ -665,6 +691,14 @@ discard block |
||
665 | 691 | return $ret; |
666 | 692 | } |
667 | 693 | |
694 | + /** |
|
695 | + * @param string $uri |
|
696 | + * @param string $lang |
|
697 | + * @param string $tpropname |
|
698 | + * @param string $tpropuri |
|
699 | + * @param string $dpropname |
|
700 | + * @param string $dpropuri |
|
701 | + */ |
|
668 | 702 | private function transformTransitivePropertyResults($uri, $lang, $objects, $tpropname, $tpropuri, $dpropname, $dpropuri) |
669 | 703 | { |
670 | 704 | $results = array(); |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | class PluginRegister { |
4 | 4 | private $requestedPlugins; |
5 | 5 | |
6 | - public function __construct($requestedPlugins=array()) { |
|
6 | + public function __construct($requestedPlugins = array()) { |
|
7 | 7 | $this->requestedPlugins = $requestedPlugins; |
8 | 8 | } |
9 | 9 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param boolean $raw interpret $type values as raw text instead of files |
32 | 32 | * @return array |
33 | 33 | */ |
34 | - private function filterPlugins($type, $raw=false) { |
|
34 | + private function filterPlugins($type, $raw = false) { |
|
35 | 35 | $plugins = $this->getPlugins(); |
36 | 36 | $ret = array(); |
37 | 37 | if (!empty($plugins)) { |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | } |
44 | 44 | else { |
45 | 45 | foreach ($files[$type] as $file) { |
46 | - array_push($ret[$name], 'plugins/' . $name . '/' . $file); |
|
46 | + array_push($ret[$name], 'plugins/'.$name.'/'.$file); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @param array $names the plugin name strings (foldernames) in an array |
75 | 75 | * @return array |
76 | 76 | */ |
77 | - public function getPluginsJS($names=null) { |
|
77 | + public function getPluginsJS($names = null) { |
|
78 | 78 | if ($names) { |
79 | 79 | $names = array_merge($this->requestedPlugins, $names); |
80 | 80 | return $this->filterPluginsByName('js', $names); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @param array $names the plugin name strings (foldernames) in an array |
88 | 88 | * @return array |
89 | 89 | */ |
90 | - public function getPluginsCSS($names=null) { |
|
90 | + public function getPluginsCSS($names = null) { |
|
91 | 91 | if ($names) { |
92 | 92 | $names = array_merge($this->requestedPlugins, $names); |
93 | 93 | return $this->filterPluginsByName('css', $names); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | * @param array $names the plugin name strings (foldernames) in an array |
101 | 101 | * @return array |
102 | 102 | */ |
103 | - public function getPluginsTemplates($names=null) { |
|
103 | + public function getPluginsTemplates($names = null) { |
|
104 | 104 | if ($names) { |
105 | 105 | $names = array_merge($this->requestedPlugins, $names); |
106 | 106 | return $this->filterPluginsByName('templates', $names); |
@@ -113,15 +113,15 @@ discard block |
||
113 | 113 | * @param array $names the plugin name strings (foldernames) in an array |
114 | 114 | * @return array |
115 | 115 | */ |
116 | - public function getTemplates($names=null) { |
|
116 | + public function getTemplates($names = null) { |
|
117 | 117 | $templateStrings = array(); |
118 | 118 | $plugins = $this->getPluginsTemplates($names); |
119 | 119 | foreach ($plugins as $folder => $templates) { |
120 | 120 | foreach ($templates as $path) { |
121 | 121 | if (file_exists($path)) { |
122 | 122 | $filename = explode('/', $path); |
123 | - $filename = $filename[sizeof($filename)-1]; |
|
124 | - $id = $folder . '-' . substr($filename, 0 , (strrpos($filename, "."))); |
|
123 | + $filename = $filename[sizeof($filename) - 1]; |
|
124 | + $id = $folder.'-'.substr($filename, 0, (strrpos($filename, "."))); |
|
125 | 125 | $templateStrings[$id] = file_get_contents($path); |
126 | 126 | } |
127 | 127 | } |
@@ -40,8 +40,7 @@ |
||
40 | 40 | $ret[$name] = array(); |
41 | 41 | if ($raw) { |
42 | 42 | $ret[$name] = $files[$type]; |
43 | - } |
|
44 | - else { |
|
43 | + } else { |
|
45 | 44 | foreach ($files[$type] as $file) { |
46 | 45 | array_push($ret[$name], 'plugins/' . $name . '/' . $file); |
47 | 46 | } |
@@ -312,8 +312,7 @@ discard block |
||
312 | 312 | foreach ($res->propertyUris() as $prop) { |
313 | 313 | $this->addPropertyValues($res, $prop, $seen); |
314 | 314 | } |
315 | - } |
|
316 | - else { |
|
315 | + } else { |
|
317 | 316 | foreach ($props as $prop) { |
318 | 317 | if ($res->hasProperty($prop)) { |
319 | 318 | $this->addPropertyValues($res, $prop, $seen); |
@@ -850,8 +849,7 @@ discard block |
||
850 | 849 | if (!in_array($vocabUriSpace, $context, true)) { |
851 | 850 | if (!isset($context[$vocabPrefix])) { |
852 | 851 | $context[$vocabPrefix] = $vocabUriSpace; |
853 | - } |
|
854 | - else if ($context[$vocabPrefix] !== $vocabUriSpace) { |
|
852 | + } else if ($context[$vocabPrefix] !== $vocabUriSpace) { |
|
855 | 853 | $i = 2; |
856 | 854 | while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) { |
857 | 855 | $i += 1; |
@@ -517,13 +517,13 @@ |
||
517 | 517 | |
518 | 518 | $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, ''); |
519 | 519 | |
520 | - if($envLangLabels) { |
|
521 | - $proplabel = $envLangLabels[$this->getEnvLang()]; |
|
520 | + if($envLangLabels) { |
|
521 | + $proplabel = $envLangLabels[$this->getEnvLang()]; |
|
522 | 522 | } else { |
523 | - if($defaultPropLabel) { |
|
524 | - $proplabel = $defaultPropLabel['']; |
|
525 | - } |
|
526 | - } |
|
523 | + if($defaultPropLabel) { |
|
524 | + $proplabel = $defaultPropLabel['']; |
|
525 | + } |
|
526 | + } |
|
527 | 527 | } |
528 | 528 | |
529 | 529 | // look for superproperties in the current graph |
@@ -74,6 +74,7 @@ discard block |
||
74 | 74 | * @param Vocabulary $vocab |
75 | 75 | * @param EasyRdf\Resource $resource |
76 | 76 | * @param EasyRdf\Graph $graph |
77 | + * @param string|null $clang |
|
77 | 78 | */ |
78 | 79 | public function __construct($model, $vocab, $resource, $graph, $clang) |
79 | 80 | { |
@@ -738,6 +739,7 @@ discard block |
||
738 | 739 | |
739 | 740 | /** |
740 | 741 | * Gets the groups/arrays the concept belongs to. |
742 | + * @param boolean $includeArrays |
|
741 | 743 | */ |
742 | 744 | private function getCollections($includeArrays) { |
743 | 745 | $groups = array(); |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | return $this->resource->label($fallback); |
138 | 138 | } |
139 | 139 | // We need to check all the labels in case one of them matches a subtag of the current language |
140 | - foreach($this->resource->allLiterals('skos:prefLabel') as $label) { |
|
140 | + foreach ($this->resource->allLiterals('skos:prefLabel') as $label) { |
|
141 | 141 | // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language |
142 | - if ($label !== null && strpos($label->getLang(), $fallback . '-') === 0) { |
|
142 | + if ($label !== null && strpos($label->getLang(), $fallback.'-') === 0) { |
|
143 | 143 | return EasyRdf\Literal::create($label, $fallback); |
144 | 144 | } |
145 | 145 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | public function hasXlLabel($prop = 'prefLabel') |
162 | 162 | { |
163 | - if ($this->resource->hasProperty('skosxl:' . $prop)) { |
|
163 | + if ($this->resource->hasProperty('skosxl:'.$prop)) { |
|
164 | 164 | return true; |
165 | 165 | } |
166 | 166 | return false; |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | public function getXlLabel() |
170 | 170 | { |
171 | 171 | $labels = $this->resource->allResources('skosxl:prefLabel'); |
172 | - foreach($labels as $labres) { |
|
172 | + foreach ($labels as $labres) { |
|
173 | 173 | $label = $labres->getLiteral('skosxl:literalForm'); |
174 | 174 | if ($label !== null && $label->getLang() == $this->clang) { |
175 | 175 | return new LabelSkosXL($this->model, $labres); |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | // catch external subjects that have $res as object |
277 | 277 | $extSubjects = $exGraph->resourcesMatching("schema:about", $res); |
278 | 278 | |
279 | - $propList = array_unique(array_merge( |
|
279 | + $propList = array_unique(array_merge( |
|
280 | 280 | $this->DEFAULT_EXT_PROPERTIES, |
281 | 281 | $this->getVocab()->getConfig()->getExtProperties(), |
282 | 282 | $this->getVocab()->getConfig()->getPlugins()->getExtProperties() |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * @param string[] $seen Processed resources so far |
302 | 302 | * @param string[] $props (optional) limit to these property URIs |
303 | 303 | */ |
304 | - private function addExternalTriplesToGraph($res, &$seen, $props=null) |
|
304 | + private function addExternalTriplesToGraph($res, &$seen, $props = null) |
|
305 | 305 | { |
306 | 306 | if (array_key_exists($res->getUri(), $seen) && $seen[$res->getUri()] === 0) { |
307 | 307 | return; |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | */ |
332 | 332 | private function addPropertyValues($res, $prop, &$seen) |
333 | 333 | { |
334 | - $resList = $res->allResources('<' . $prop . '>'); |
|
334 | + $resList = $res->allResources('<'.$prop.'>'); |
|
335 | 335 | |
336 | 336 | foreach ($resList as $res2) { |
337 | 337 | if ($res2->isBNode()) { |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | $this->addResourceReifications($res, $prop, $res2, $seen); |
342 | 342 | } |
343 | 343 | |
344 | - $litList = $res->allLiterals('<' . $prop . '>'); |
|
344 | + $litList = $res->allLiterals('<'.$prop.'>'); |
|
345 | 345 | |
346 | 346 | foreach ($litList as $lit) { |
347 | 347 | $this->graph->addLiteral($res, $prop, $lit); |
@@ -518,15 +518,15 @@ discard block |
||
518 | 518 | // if not found in current vocabulary, look up in the default graph to be able |
519 | 519 | // to read an ontology loaded in a separate graph |
520 | 520 | // note that this imply that the property has an rdf:type declared for the query to work |
521 | - if(!$is_well_known && !$proplabel) { |
|
521 | + if (!$is_well_known && !$proplabel) { |
|
522 | 522 | $envLangLabels = $this->model->getDefaultSparql()->queryLabel($longUri, $this->getEnvLang()); |
523 | 523 | |
524 | 524 | $defaultPropLabel = $this->model->getDefaultSparql()->queryLabel($longUri, ''); |
525 | 525 | |
526 | - if($envLangLabels) { |
|
526 | + if ($envLangLabels) { |
|
527 | 527 | $proplabel = $envLangLabels[$this->getEnvLang()]; |
528 | 528 | } else { |
529 | - if($defaultPropLabel) { |
|
529 | + if ($defaultPropLabel) { |
|
530 | 530 | $proplabel = $defaultPropLabel['']; |
531 | 531 | } |
532 | 532 | } |
@@ -539,12 +539,12 @@ discard block |
||
539 | 539 | } |
540 | 540 | |
541 | 541 | // also look up superprops in the default graph if not found in current vocabulary |
542 | - if(!$is_well_known && (!$superprops || empty($superprops))) { |
|
542 | + if (!$is_well_known && (!$superprops || empty($superprops))) { |
|
543 | 543 | $superprops = $this->model->getDefaultSparql()->querySuperProperties($longUri); |
544 | 544 | } |
545 | 545 | |
546 | 546 | // we're reading only one super property, even if there are multiple ones |
547 | - $superprop = ($superprops)?$superprops[0]:null; |
|
547 | + $superprop = ($superprops) ? $superprops[0] : null; |
|
548 | 548 | if ($superprop) { |
549 | 549 | $superprop = EasyRdf\RdfNamespace::shorten($superprop) ? EasyRdf\RdfNamespace::shorten($superprop) : $superprop; |
550 | 550 | } |
@@ -557,7 +557,7 @@ discard block |
||
557 | 557 | } |
558 | 558 | |
559 | 559 | // searching for subproperties of literals too |
560 | - if($superprops) { |
|
560 | + if ($superprops) { |
|
561 | 561 | foreach ($superprops as $subi) { |
562 | 562 | $suburi = EasyRdf\RdfNamespace::shorten($subi) ? EasyRdf\RdfNamespace::shorten($subi) : $subi; |
563 | 563 | $duplicates[$suburi] = $prop; |
@@ -677,14 +677,14 @@ discard block |
||
677 | 677 | |
678 | 678 | // making a human readable string from the timestamps |
679 | 679 | if ($created != '') { |
680 | - $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short')); |
|
680 | + $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short')); |
|
681 | 681 | } |
682 | 682 | |
683 | 683 | if ($modified != '') { |
684 | 684 | if ($created != '') { |
685 | - $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short')); |
|
685 | + $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short')); |
|
686 | 686 | } else { |
687 | - $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short')); |
|
687 | + $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short')); |
|
688 | 688 | } |
689 | 689 | |
690 | 690 | } |
@@ -692,12 +692,12 @@ discard block |
||
692 | 692 | trigger_error($e->getMessage(), E_USER_WARNING); |
693 | 693 | $ret = ''; |
694 | 694 | if ($this->resource->get('dc:modified')) { |
695 | - $modified = (string) $this->resource->get('dc:modified'); |
|
696 | - $ret = gettext('skosmos:modified') . ' ' . $modified; |
|
695 | + $modified = (string)$this->resource->get('dc:modified'); |
|
696 | + $ret = gettext('skosmos:modified').' '.$modified; |
|
697 | 697 | } |
698 | 698 | if ($this->resource->get('dc:created')) { |
699 | - $created .= (string) $this->resource->get('dc:created'); |
|
700 | - $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; |
|
699 | + $created .= (string)$this->resource->get('dc:created'); |
|
700 | + $ret .= ' '.gettext('skosmos:created').' '.$created; |
|
701 | 701 | } |
702 | 702 | } |
703 | 703 | return $ret; |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | $groups[$collLabel] = array($group); |
770 | 770 | |
771 | 771 | $res = $collection; |
772 | - while($super = $this->graph->resourcesMatching('skos:member', $res)) { |
|
772 | + while ($super = $this->graph->resourcesMatching('skos:member', $res)) { |
|
773 | 773 | foreach ($super as $res) { |
774 | 774 | $superprop = new ConceptPropertyValue($this->model, $this->vocab, $res, 'skosmos:memberOfSuper', $this->clang); |
775 | 775 | array_unshift($groups[$collLabel], $superprop); |
@@ -811,7 +811,7 @@ discard block |
||
811 | 811 | $ret = array(); |
812 | 812 | foreach ($labels as $lit) { |
813 | 813 | // filtering away subsets of the current language eg. en vs en-GB |
814 | - if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) { |
|
814 | + if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) { |
|
815 | 815 | $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel'; |
816 | 816 | $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop); |
817 | 817 | } |
@@ -873,10 +873,10 @@ discard block |
||
873 | 873 | } |
874 | 874 | else if ($context[$vocabPrefix] !== $vocabUriSpace) { |
875 | 875 | $i = 2; |
876 | - while (isset($context[$vocabPrefix . $i]) && $context[$vocabPrefix . $i] !== $vocabUriSpace) { |
|
876 | + while (isset($context[$vocabPrefix.$i]) && $context[$vocabPrefix.$i] !== $vocabUriSpace) { |
|
877 | 877 | $i += 1; |
878 | 878 | } |
879 | - $context[$vocabPrefix . $i] = $vocabUriSpace; |
|
879 | + $context[$vocabPrefix.$i] = $vocabUriSpace; |
|
880 | 880 | } |
881 | 881 | } |
882 | 882 | $compactJsonLD = \ML\JsonLD\JsonLD::compact($this->graph->serialise('jsonld'), json_encode($context)); |