NatLibFi / Skosmos

model/sparql/GenericSparql.php

Doc Comments +9 added lines, -5 removed lines

@@ -152,7 +152,7 @@ 
 
     /**
      * Returns the graph instance
-     * @return object EasyRDF graph instance.
+     * @return string|null EasyRDF graph instance.
      */
     public function getGraph() {
         return $this->graph;
@@ -287,6 +287,7 @@ 
     /**
      * Counts the number of concepts in a easyRDF graph with a specific language.
      * @param array $langs Languages to query for
+     * @param string[] $classes
      * @return Array containing count of concepts for each language and property.
      */
     public function countLangConcepts($langs, $classes = null) {
@@ -471,7 +472,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 \EasyRdf\Graph
      */
     public function queryConceptInfoGraph($uris, $arrayClass = null, $vocabs = array()) {
@@ -487,7 +488,7 @@ 
 
     /**
      * Returns information (as an array of Concept objects) for one or more concept URIs
-     * @param mixed $uris concept URI (string) or array of URIs
+     * @param string $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[] $vocabs vocabularies to target
      * @param string|null $clang content language
@@ -705,7 +706,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) {
@@ -887,6 +888,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)
@@ -1161,6 +1163,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) {
@@ -1328,6 +1331,7 @@ 
     /**
      * Query for the first characters (letter or otherwise) of the labels in the particular language.
      * @param string $lang language
+     * @param string[] $classes
      * @return array array of characters
      */
     public function queryFirstCharacters($lang, $classes = null) {
@@ -1650,7 +1654,7 @@ 
     /**
      * Query a single transitive property of a concept.
      * @param string $uri
-     * @param array $props the property/properties.
+     * @param string[] $props the property/properties.
      * @param string $lang
      * @param string $fallbacklang language to use if label is not available in the preferred language
      * @param integer $limit

Braces +7 added lines, -4 removed lines

@@ -47,12 +47,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 = "";
@@ -1943,8 +1947,7 @@ 
         if (sizeof($ret) > 0) {
             // existing concept, with children
             return $ret;
-        }
-        else {
+        } else {
             // nonexistent concept
             return null;
         }