NatLibFi / Skosmos

model/sparql/GenericSparql.php

Doc Comments +4 added lines, -2 removed lines

@@ -453,7 +453,7 @@ 
      * Returns information (as a graph) for one or more concept URIs
      * @param mixed $uris concept URI (string) or array of URIs
      * @param string|null $arrayClass the URI for thesaurus array class, or null if not used
-     * @param \Vocabulary[]|null $vocabs vocabularies to target
+     * @param Vocabulary[] $vocabs vocabularies to target
      * @return \Concept[]
      */
     public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) {
@@ -673,7 +673,7 @@ 
 
     /**
      * Generate a VALUES clause for limiting the targeted graphs.
-     * @param Vocabulary[]|null $vocabs array of Vocabulary objects to target
+     * @param Vocabulary[] $vocabs array of Vocabulary objects to target
      * @return string VALUES clause, or "" if not necessary to limit
      */
     protected function formatValuesGraph($vocabs) {
@@ -853,6 +853,7 @@ 
      * @param string $searchLang language code used for matching labels (null means any language)
      * @param string[] $props properties to target e.g. array('skos:prefLabel','skos:altLabel')
      * @param boolean $unique restrict results to unique concepts (default: false)
+     * @param string $filterGraph
      * @return string sparql query
      */
     protected function generateConceptSearchQueryInner($term, $lang, $searchLang, $props, $unique, $filterGraph)
@@ -1118,6 +1119,7 @@ 
     /**
      * Generates sparql query clauses used for creating the alphabetical index.
      * @param string $letter the letter (or special class) to search for
+     * @param string $lang
      * @return array of sparql query clause strings
      */
     private function formatFilterConditions($letter, $lang) {

Braces +10 added lines, -6 removed lines

@@ -46,12 +46,16 @@ 
         $this->client = new EasyRdf\Sparql\Client($endpoint);
 
         // set graphClause so that it can be used by all queries
-        if ($this->isDefaultEndpoint()) // default endpoint; query any graph (and catch it in a variable)
+        if ($this->isDefaultEndpoint()) {
+          // default endpoint; query any graph (and catch it in a variable)
         {
             $this->graphClause = "GRAPH $graph";
-        } elseif ($graph) // query a specific graph
+        }
+        } elseif ($graph) {
+          // query a specific graph
         {
             $this->graphClause = "GRAPH <$graph>";
+        }
         } else // query the default graph
         {
             $this->graphClause = "";
@@ -100,8 +104,9 @@ 
             }
         }
         foreach ($graphs as $graph) {
-            if($graph !== NULL)
-                $clause .= "FROM NAMED <$graph> "; 
+            if($graph !== NULL) {
+                            $clause .= "FROM NAMED <$graph> ";
+            }
         }
         return $clause;
     }
@@ -1847,8 +1852,7 @@ 
         if (sizeof($ret) > 0) {
             // existing concept, with children
             return $ret;
-        }
-        else {
+        } else {
             // nonexistent concept
             return null;
         }

Indentation +6 added lines, -6 removed lines

@@ -1744,7 +1744,7 @@ 
 
     /**
      * Generates a sparql query for finding the hierarchy for a concept.
-	 * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal.
+     * A concept may be a top concept in multiple schemes, returned as a single whitespace-separated literal.
      * @param string $uri concept uri.
      * @param string $lang
      * @param string $fallback language to use if label is not available in the preferred language
@@ -1821,11 +1821,11 @@ 
                 $ret[$uri]['exact'] = $row->exact->getUri();
             }
             if (isset($row->tops)) {
-               $topConceptsList=array();
-               $topConceptsList=explode(" ", $row->tops->getValue());
-               // sort to garantee an alphabetical ordering of the URI
-               sort($topConceptsList);
-               $ret[$uri]['tops'] = $topConceptsList;
+                $topConceptsList=array();
+                $topConceptsList=explode(" ", $row->tops->getValue());
+                // sort to garantee an alphabetical ordering of the URI
+                sort($topConceptsList);
+                $ret[$uri]['tops'] = $topConceptsList;
             }
             if (isset($row->children)) {
                 if (!isset($ret[$uri]['narrower'])) {

Spacing +53 added lines, -53 removed lines

@@ -71,7 +71,7 @@ 
         $starttime = microtime(true);
         $result = $this->client->query($query);
         $elapsed = intval(round((microtime(true) - $starttime) * 1000));
-        if(method_exists($result, 'numRows')) {
+        if (method_exists($result, 'numRows')) {
             $numRows = $result->numRows();
             $logger->info("[qid $queryId] result: $numRows rows returned in $elapsed ms");
         } else { // graph result
@@ -87,20 +87,20 @@ 
      * @param Vocabulary[]|null $vocabs
      * @return string
      */
-    protected function generateFromClause($vocabs=null) {
+    protected function generateFromClause($vocabs = null) {
         $graphs = array();
         $clause = '';
         if (!$vocabs) {
             return $this->graph !== '?graph' && $this->graph !== NULL ? "FROM <$this->graph>" : '';
         }
-        foreach($vocabs as $vocab) {
+        foreach ($vocabs as $vocab) {
             $graph = $vocab->getGraph();
             if (!in_array($graph, $graphs)) {
                 array_push($graphs, $graph);
             }
         }
         foreach ($graphs as $graph) {
-            if($graph !== NULL)
+            if ($graph !== NULL)
                 $clause .= "FROM NAMED <$graph> "; 
         }
         return $clause;
@@ -644,9 +644,9 @@ 
                 $conceptscheme['title'] = $row->title->getValue();
             }
             // add dct:subject and their labels in the result
-            if(isset($row->domain) && isset($row->domainLabel)){
-                $conceptscheme['subject']['uri']=$row->domain->getURI();
-                $conceptscheme['subject']['prefLabel']=$row->domainLabel->getValue();
+            if (isset($row->domain) && isset($row->domainLabel)) {
+                $conceptscheme['subject']['uri'] = $row->domain->getURI();
+                $conceptscheme['subject']['prefLabel'] = $row->domainLabel->getValue();
             }
 
             $ret[$row->cs->getURI()] = $conceptscheme;
@@ -709,7 +709,7 @@ 
         foreach ($graphs as $graph) {
           $values[] = "<$graph>";
         }
-        return "FILTER (?graph IN (" . implode(',', $values) . "))";
+        return "FILTER (?graph IN (".implode(',', $values)."))";
     }
 
     /**
@@ -719,16 +719,16 @@ 
      * @return string sparql query clauses
      */
     protected function formatLimitAndOffset($limit, $offset) {
-        $limit = ($limit) ? 'LIMIT ' . $limit : '';
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $limit = ($limit) ? 'LIMIT '.$limit : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
         // eliminating whitespace and line changes when the conditions aren't needed.
         $limitandoffset = '';
         if ($limit && $offset) {
-            $limitandoffset = "\n" . $limit . "\n" . $offset;
+            $limitandoffset = "\n".$limit."\n".$offset;
         } elseif ($limit) {
-            $limitandoffset = "\n" . $limit;
+            $limitandoffset = "\n".$limit;
         } elseif ($offset) {
-            $limitandoffset = "\n" . $offset;
+            $limitandoffset = "\n".$offset;
         }
 
         return $limitandoffset;
@@ -748,7 +748,7 @@ 
             }
         }
 
-        return implode(' UNION ', $typePatterns);;
+        return implode(' UNION ', $typePatterns); ;
     }
 
     /**
@@ -880,14 +880,14 @@ 
         // if search language and UI/display language differ, must also consider case where there is no prefLabel in
         // the display language; in that case, should use the label with the same language as the matched label
         $labelcondFallback = ($searchLang != $lang) ?
-          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n" .
+          "OPTIONAL { # in case previous OPTIONAL block gives no labels\n".
           "?s skos:prefLabel ?label . FILTER (LANGMATCHES(LANG(?label), LANG(?match))) }" : "";
           
         //  Including the labels if there is no query term given.
         if ($rawterm === '') {
           $labelClause = "?s skos:prefLabel ?label .";
-          $labelClause = ($lang) ? $labelClause . " FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause . "";
-          return $labelClause . " BIND(?label AS ?match)";
+          $labelClause = ($lang) ? $labelClause." FILTER (LANGMATCHES(LANG(?label), '$lang'))" : $labelClause."";
+          return $labelClause." BIND(?label AS ?match)";
         }
 
         /*
@@ -951,20 +951,20 @@ 
         $schemecond = '';
         if (!empty($schemes)) {
             $conditions = array();
-            foreach($schemes as $scheme) {
+            foreach ($schemes as $scheme) {
                 $conditions[] = "{?s skos:inScheme <$scheme>}";
             }
-            $schemecond = '{'.implode(" UNION ",$conditions).'}';
+            $schemecond = '{'.implode(" UNION ", $conditions).'}';
         }
-        $filterDeprecated="";
+        $filterDeprecated = "";
         //show or hide deprecated concepts
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         // extra conditions for parent and group, if specified
-        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <" . $params->getParentLimit() . "> ." : "";
-        $groupcond = ($params->getGroupLimit()) ? "<" . $params->getGroupLimit() . "> skos:member ?s ." : "";
-        $pgcond = $parentcond . $groupcond;
+        $parentcond = ($params->getParentLimit()) ? "?s skos:broader+ <".$params->getParentLimit()."> ." : "";
+        $groupcond = ($params->getGroupLimit()) ? "<".$params->getGroupLimit()."> skos:member ?s ." : "";
+        $pgcond = $parentcond.$groupcond;
 
         $orderextra = $this->isDefaultEndpoint() ? $this->graph : '';
 
@@ -1037,9 +1037,9 @@ 
             $hit['type'][] = $this->shortenUri($typeuri);
         }
 
-        if(!empty($fields)) {
+        if (!empty($fields)) {
             foreach ($fields as $prop) {
-                $propname = $prop . 's';
+                $propname = $prop.'s';
                 if (isset($row->$propname)) {
                     foreach (explode("\n", $row->$propname->getValue()) as $line) {
                         $rdata = str_getcsv($line, ',', '"', '"');
@@ -1054,7 +1054,7 @@ 
                             $propvals = $rdata[2];
                         }
 
-                        $hit['skos:' . $prop][] = $propvals;
+                        $hit['skos:'.$prop][] = $propvals;
                     }
                 }
             }
@@ -1130,7 +1130,7 @@ 
      * @return array query result object
      */
     public function queryConcepts($vocabs, $fields = null, $unique = false, $params, $showDeprecated = false) {
-        $query = $this->generateConceptSearchQuery($fields, $unique, $params,$showDeprecated);
+        $query = $this->generateConceptSearchQuery($fields, $unique, $params, $showDeprecated);
         $results = $this->query($query);
         return $this->transformConceptSearchResults($results, $vocabs, $fields);
     }
@@ -1184,9 +1184,9 @@ 
         $conditions = $this->formatFilterConditions($letter, $lang);
         $filtercondLabel = $conditions['filterpref'];
         $filtercondALabel = $conditions['filteralt'];
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         $query = <<<EOQ
 SELECT DISTINCT ?s ?label ?alabel $fcl
@@ -1262,8 +1262,8 @@ 
      * @param array $classes
      * @param boolean $showDeprecated whether to include deprecated concepts in the result (default: false)
      */
-    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null,$showDeprecated = false) {
-        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes,$showDeprecated);
+    public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset = null, $classes = null, $showDeprecated = false) {
+        $query = $this->generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated);
         $results = $this->query($query);
         return $this->transformAlphabeticalListResults($results);
     }
@@ -1555,7 +1555,7 @@ 
                 if (!isset($row->label) || $row->label->getLang() === $lang) {
                     $ret[$row->object->getUri()] = $val;
                 } elseif ($row->label->getLang() === $fallbacklang) {
-                    $val['label'] .= ' (' . $row->label->getLang() . ')';
+                    $val['label'] .= ' ('.$row->label->getLang().')';
                     $ret[$row->object->getUri()] = $val;
                 }
             }
@@ -1651,10 +1651,10 @@ 
 
             $label = null;
             if (isset($row->label)) {
-                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                     $label = $row->label->getValue();
                 } else {
-                    $label = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                    $label = $row->label->getValue()." (".$row->label->getLang().")";
                 }
 
             }
@@ -1730,8 +1730,8 @@ 
         foreach ($result as $row) {
             if (isset($row->top) && isset($row->label)) {
                 $label = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $label .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $label .= ' ('.$row->label->getLang().')';
                 }
                 $top = array('uri' => $row->top->getUri(), 'topConceptOf' => $row->topuri->getUri(), 'label' => $label, 'hasChildren' => filter_var($row->children->getValue(), FILTER_VALIDATE_BOOLEAN));
                 if (isset($row->notation)) {
@@ -1824,8 +1824,8 @@ 
                 $ret[$uri]['exact'] = $row->exact->getUri();
             }
             if (isset($row->tops)) {
-               $topConceptsList=array();
-               $topConceptsList=explode(" ", $row->tops->getValue());
+               $topConceptsList = array();
+               $topConceptsList = explode(" ", $row->tops->getValue());
                // sort to garantee an alphabetical ordering of the URI
                sort($topConceptsList);
                $ret[$uri]['tops'] = $topConceptsList;
@@ -1838,8 +1838,8 @@ 
                 $label = null;
                 if (isset($row->childlabel)) {
                     $label = $row->childlabel->getValue();
-                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang . "-") !== 0) {
-                        $label .= " (" . $row->childlabel->getLang() . ")";
+                    if ($row->childlabel->getLang() !== $lang && strpos($row->childlabel->getLang(), $lang."-") !== 0) {
+                        $label .= " (".$row->childlabel->getLang().")";
                     }
 
                 }
@@ -1860,8 +1860,8 @@ 
             }
             if (isset($row->label)) {
                 $preflabel = $row->label->getValue();
-                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang . "-") !== 0) {
-                    $preflabel .= ' (' . $row->label->getLang() . ')';
+                if ($row->label->getLang() && $row->label->getLang() !== $lang && strpos($row->label->getLang(), $lang."-") !== 0) {
+                    $preflabel .= ' ('.$row->label->getLang().')';
                 }
 
                 $ret[$uri]['prefLabel'] = $preflabel;
@@ -1982,9 +1982,9 @@ 
      */
     private function generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated = false) {
         $fcl = $this->generateFromClause();
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="  FILTER NOT EXISTS { ?conc owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "  FILTER NOT EXISTS { ?conc owl:deprecated true }";
         }
         $query = <<<EOQ
 SELECT ?conc ?super ?label ?members ?type ?notation $fcl
@@ -2023,10 +2023,10 @@ 
                     'type' => array($row->type->shorten()),
                 );
                 if (isset($row->label)) {
-                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang . "-") == 0) {
+                    if ($row->label->getLang() == $lang || strpos($row->label->getLang(), $lang."-") == 0) {
                         $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue();
                     } else {
-                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue() . " (" . $row->label->getLang() . ")";
+                        $values[$row->conc->getURI()]['prefLabel'] = $row->label->getValue()." (".$row->label->getLang().")";
                     }
 
                 }
@@ -2054,8 +2054,8 @@ 
      * @param boolean $showDeprecated whether to include deprecated concepts in search results
      * @return array Result array with concept URI as key and concept label as value
      */
-    public function listConceptGroupContents($groupClass, $group, $lang,$showDeprecated = false) {
-        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang,$showDeprecated);
+    public function listConceptGroupContents($groupClass, $group, $lang, $showDeprecated = false) {
+        $query = $this->generateConceptGroupContentsQuery($groupClass, $group, $lang, $showDeprecated);
         $result = $this->query($query);
         return $this->transformConceptGroupContentsResults($result, $lang);
     }
@@ -2068,7 +2068,7 @@ 
      */
     private function generateChangeListQuery($lang, $offset, $prop) {
         $fcl = $this->generateFromClause();
-        $offset = ($offset) ? 'OFFSET ' . $offset : '';
+        $offset = ($offset) ? 'OFFSET '.$offset : '';
 
         $query = <<<EOQ
 SELECT DISTINCT ?concept ?date ?label $fcl

model/Concept.php

Doc Comments +2 added lines

@@ -50,6 +50,7 @@ 
      * @param Vocabulary $vocab
      * @param EasyRdf\Resource $resource
      * @param EasyRdf\Graph $graph
+     * @param string|null $clang
      */
     public function __construct($model, $vocab, $resource, $graph, $clang)
     {
@@ -526,6 +527,7 @@ 
 
     /**
      * Gets the groups/arrays the concept belongs to.
+     * @param boolean $includeArrays
      */
     public function getReverseResources($includeArrays) {
         $groups = array();

Spacing +11 added lines, -11 removed lines

@@ -121,9 +121,9 @@ 
 
         // 3. label in a subtag of the current language
         // We need to check all the labels in case one of them matches a subtag of the current language
-        foreach($this->resource->allLiterals('skos:prefLabel') as $label) {
+        foreach ($this->resource->allLiterals('skos:prefLabel') as $label) {
             // the label lang code is a subtag of the UI lang eg. en-GB - create a new literal with the main language
-            if ($label !== null && strpos($label->getLang(), $lang . '-') === 0) {
+            if ($label !== null && strpos($label->getLang(), $lang.'-') === 0) {
                 return EasyRdf\Literal::create($label, $lang);
             }
         }
@@ -131,7 +131,7 @@ 
         // 4. label in any language, including literal with empty language tag
         $label = $this->resource->label();
         if ($label !== null) {
-            return $label->getLang() ? $label->getValue() . " (" . $label->getLang() . ")" : $label->getValue();
+            return $label->getLang() ? $label->getValue()." (".$label->getLang().")" : $label->getValue();
         }
 
         // empty
@@ -462,14 +462,14 @@ 
 
             // making a human readable string from the timestamps
             if ($created != '') {
-                $ret = gettext('skosmos:created') . ' ' . (Punic\Calendar::formatDate($created, 'short'));
+                $ret = gettext('skosmos:created').' '.(Punic\Calendar::formatDate($created, 'short'));
             }
 
             if ($modified != '') {
                 if ($created != '') {
-                    $ret .= ', ' . gettext('skosmos:modified') . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ', '.gettext('skosmos:modified').' '.(Punic\Calendar::formatDate($modified, 'short'));
                 } else {
-                    $ret .= ' ' . ucfirst(gettext('skosmos:modified')) . ' ' . (Punic\Calendar::formatDate($modified, 'short'));
+                    $ret .= ' '.ucfirst(gettext('skosmos:modified')).' '.(Punic\Calendar::formatDate($modified, 'short'));
                 }
 
             }
@@ -477,12 +477,12 @@ 
             trigger_error($e->getMessage(), E_USER_WARNING);
             $ret = '';
             if ($this->resource->get('dc:modified')) {
-                $modified = (string) $this->resource->get('dc:modified');
-                $ret = gettext('skosmos:modified') . ' ' . $modified; 
+                $modified = (string)$this->resource->get('dc:modified');
+                $ret = gettext('skosmos:modified').' '.$modified; 
             }
             if ($this->resource->get('dc:created')) {
-                $created .= (string) $this->resource->get('dc:created');
-                $ret .= ' ' . gettext('skosmos:created') . ' ' . $created; 
+                $created .= (string)$this->resource->get('dc:created');
+                $ret .= ' '.gettext('skosmos:created').' '.$created; 
             }
         }
         return $ret;
@@ -592,7 +592,7 @@ 
         $ret = array();
         foreach ($labels as $lit) {
             // filtering away subsets of the current language eg. en vs en-GB
-            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
+            if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang().'-') !== 0) {
                 $prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel'; 
                 $ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($lit, $prop);
             }

model/ConceptPropertyValue.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
     {
         $label = is_string($this->getLabel()) ? $this->getLabel() : $this->getLabel()->getValue();
         if ($this->vocab->getConfig()->sortByNotation()) {
-            $label = $this->getNotation() . $label;
+            $label = $this->getNotation().$label;
         }
 
         return $label;
@@ -120,7 +120,7 @@ 
     public function getReifiedPropertyValues() {
         $ret = array();
         $props = $this->resource->propertyUris();
-        foreach($props as $prop) {
+        foreach ($props as $prop) {
             $prop = (EasyRdf\RdfNamespace::shorten($prop) !== null) ? EasyRdf\RdfNamespace::shorten($prop) : $prop;
             foreach ($this->resource->allLiterals($prop) as $val) {
                 if ($prop !== 'rdf:value' && $this->resource->get($prop)) { // shown elsewhere

model/sparql/JenaTextSparql.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
         // 1. Ensure characters with special meaning in Lucene are escaped
         $lucenemap = array();
         foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) {
-            $lucenemap[$char] = '\\' . $char; // escape with a backslash
+            $lucenemap[$char] = '\\'.$char; // escape with a backslash
         }
         $term = strtr($term, $lucenemap);
 
@@ -82,7 +82,7 @@ 
      * @return string sparql order by clause
      */
     private function formatOrderBy($expression, $lang) {
-        if(!$this->model->getConfig()->getCollationEnabled()) {
+        if (!$this->model->getConfig()->getCollationEnabled()) {
             return $expression;
         }
         $orderby = sprintf('arq:collation(\'%2$s\', %1$s)', $expression, $lang);
@@ -114,13 +114,13 @@ 
 
         # make text query clause
         $lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe
-        $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $lang);
-        $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $lang);
+        $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $lang);
+        $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $lang);
         $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang);
 
-        $filterDeprecated="";
-        if(!$showDeprecated){
-            $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
+        $filterDeprecated = "";
+        if (!$showDeprecated) {
+            $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         
         $query = <<<EOQ

model/Model.php

Spacing +12 added lines, -12 removed lines

@@ -64,15 +64,15 @@ 
     private function initializeVocabularies()
     {
         if (!file_exists($this->getConfig()->getVocabularyConfigFile())) {
-            throw new Exception($this->getConfig()->getVocabularyConfigFile() . ' is missing, please provide one.');
+            throw new Exception($this->getConfig()->getVocabularyConfigFile().' is missing, please provide one.');
         }
 
         try {
             // use APC user cache to store parsed vocabularies.ttl configuration
             if ($this->cache->isAvailable()) {
                 // @codeCoverageIgnoreStart
-                $key = realpath($this->getConfig()->getVocabularyConfigFile()) . ", " . filemtime($this->getConfig()->getVocabularyConfigFile());
-                $nskey = "namespaces of " . $key;
+                $key = realpath($this->getConfig()->getVocabularyConfigFile()).", ".filemtime($this->getConfig()->getVocabularyConfigFile());
+                $nskey = "namespaces of ".$key;
                 $this->graph = $this->cache->fetch($key);
                 $this->namespaces = $this->cache->fetch($nskey);
                 if ($this->graph === false || $this->namespaces === false) { // was not found in cache
@@ -85,7 +85,7 @@ 
                 $this->parseVocabularies($this->getConfig()->getVocabularyConfigFile());
             }
         } catch (Exception $e) {
-            echo "Error: " . $e->getMessage();
+            echo "Error: ".$e->getMessage();
         }
     }
 
@@ -297,18 +297,18 @@ 
         }
 
         $vocabs = $params->getVocabs();
-        $showDeprecated=false;
+        $showDeprecated = false;
         if (sizeof($vocabs) === 1) { // search within vocabulary
             $voc = $vocabs[0];
             $sparql = $voc->getSparql();
-            $showDeprecated=$voc->getConfig()->getShowDeprecated();
+            $showDeprecated = $voc->getConfig()->getShowDeprecated();
         } else { // multi-vocabulary or global search
             $voc = null;
             $sparql = $this->getDefaultSparql();
             // @TODO : in a global search showDeprecated will always be false and cannot be set globally
         }
 
-        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params,$showDeprecated);
+        $results = $sparql->queryConcepts($vocabs, $params->getAdditionalFields(), $params->getUnique(), $params, $showDeprecated);
         if ($params->getRest() && $results && $params->getSearchLimit() !== 0) {
           $results = array_slice($results, $params->getOffset(), $params->getSearchLimit());
         }
@@ -458,7 +458,7 @@ 
     public function getVocabularyCategories()
     {
         $cats = $this->graph->allOfType('skos:Concept');
-        if(empty($cats)) {
+        if (empty($cats)) {
             return array(new VocabularyCategory($this, null));
         }
 
@@ -541,9 +541,9 @@ 
         }
         
         // if there are multiple vocabularies and one is the preferred vocabulary, return it
-        if($preferredVocabId != null) {
+        if ($preferredVocabId != null) {
             foreach ($vocabs as $vocab) {
-                if($vocab->getId() == $preferredVocabId) {
+                if ($vocab->getId() == $preferredVocabId) {
                     return $vocab;
                 }
             }
@@ -643,7 +643,7 @@ 
         // using apc cache for the resource if available
         if ($this->cache->isAvailable()) {
             // @codeCoverageIgnoreStart
-            $key = 'fetch: ' . $uri;
+            $key = 'fetch: '.$uri;
             $resource = $this->cache->fetch($key);
             if ($resource === null || $resource === false) { // was not found in cache, or previous request failed
                 $resource = $this->fetchResourceFromUri($uri);
@@ -664,7 +664,7 @@ 
      */
     public function getSparqlImplementation($dialect, $endpoint, $graph)
     {
-        $classname = $dialect . "Sparql";
+        $classname = $dialect."Sparql";
 
         return new $classname($endpoint, $graph, $this);
     }

Braces +9 added lines, -4 removed lines

@@ -108,10 +108,12 @@ 
     
     private function initializeNamespaces() {
         foreach ($this->namespaces as $prefix => $fullUri) {
-            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
+            if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
+              // if not already defined
             {
                 EasyRdf\RdfNamespace::set($prefix, $fullUri);
             }
+            }
         }
     }
     
@@ -425,10 +427,12 @@ 
                 // register vocabulary ids as RDF namespace prefixes
                 $prefix = preg_replace('/\W+/', '', $voc->getId()); // strip non-word characters
                 try {
-                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) // if not already defined
+                    if ($prefix != '' && EasyRdf\RdfNamespace::get($prefix) === null) {
+                      // if not already defined
                     {
                         EasyRdf\RdfNamespace::set($prefix, $voc->getUriSpace());
                     }
+                    }
 
                 } catch (Exception $e) {
                     // not valid as namespace identifier, ignore
@@ -551,8 +555,9 @@ 
         
         // no preferred vocabulary, or it was not found, search in which vocabulary the concept has a label
         foreach ($vocabs as $vocab) {
-            if ($vocab->getConceptLabel($uri, null) !== null)
-                return $vocab;
+            if ($vocab->getConceptLabel($uri, null) !== null) {
+                            return $vocab;
+            }
         }
 
         // if the URI couldn't be found, fall back to the first vocabulary