NatLibFi / Skosmos

model/sparql/GenericSparql.php

Doc Comments +10 added lines, -6 removed lines

@@ -262,8 +262,8 @@ 
 	
     /**
     * Used to generate the BIND + FILTER part related to the languages
-    * @param $varnameInput the name of the variable from which to extract the language
-    * @param $varnameOutput the name of the variable that will contain the language tag
+    * @param string $varnameInput the name of the variable from which to extract the language
+    * @param string $varnameOutput the name of the variable that will contain the language tag
     * @param array $values languages to use in the FILTER
     * @return string part of the sparql query dealing wit the languages 
     */
@@ -312,6 +312,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) {
@@ -496,7 +497,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()) {
@@ -512,7 +513,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
@@ -727,7 +728,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) {
@@ -907,6 +908,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)
@@ -1181,6 +1183,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) {
@@ -1348,6 +1351,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) {
@@ -1670,7 +1674,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

Indentation +17 added lines, -17 removed lines

@@ -64,7 +64,7 @@ 
      *
      * @param string $query
      * @return string
-    */
+     */
     protected function generateQueryPrefixes($query)
     {
         // Check for undefined prefixes
@@ -261,25 +261,25 @@ 
     }
 	
     /**
-    * Used to generate the BIND + FILTER part related to the languages
-    * @param $varnameInput the name of the variable from which to extract the language
-    * @param $varnameOutput the name of the variable that will contain the language tag
-    * @param array $values languages to use in the FILTER
-    * @return string part of the sparql query dealing wit the languages 
-    */
+     * Used to generate the BIND + FILTER part related to the languages
+     * @param $varnameInput the name of the variable from which to extract the language
+     * @param $varnameOutput the name of the variable that will contain the language tag
+     * @param array $values languages to use in the FILTER
+     * @return string part of the sparql query dealing wit the languages 
+     */
     protected function formatValuesFilterAndBind($varnameInput, $varnameOutput, $values) {
-    	  $queryPart = "BIND(lang($varnameInput) AS $varnameOutput)";
-	      $first = true;
+        $queryPart = "BIND(lang($varnameInput) AS $varnameOutput)";
+        $first = true;
 
-	      $queryPart .= "FILTER(" ;
+        $queryPart .= "FILTER(" ;
         foreach ($values as $val) {
             if($first != true){
               $queryPart .= ' || ';
             }
-	      $first = false;
+        $first = false;
             $queryPart .= "$varnameOutput = '$val'";
         }
-	      $queryPart .= ")";
+        $queryPart .= ")";
 
         return $queryPart;
     }
@@ -1832,7 +1832,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
@@ -1909,10 +1909,10 @@ 
                 $ret[$uri]['exact'] = $row->exact->getUri();
             }
             if (isset($row->tops)) {
-               $topConceptsList=explode(" ", $row->tops->getValue());
-               // sort to garantee an alphabetical ordering of the URI
-               sort($topConceptsList);
-               $ret[$uri]['tops'] = $topConceptsList;
+                $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'])) {