Specify skosmos:defaultEndpoint as a resource, not literal. Fixes Nat…

…LibFi#786
tfrancart · Aug 28, 2018 · b9b9702 · b9b9702
1 parent 9d61b82
commit b9b9702
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/config.ttl.dist b/config.ttl.dist
@@ -18,7 +18,7 @@
 :config a skosmos:Configuration ;
     # SPARQL endpoint
     # a local Fuseki server is usually on localhost:3030
-    #skosmos:sparqlEndpoint "http://localhost:3030/ds/sparql" ;
+    #skosmos:sparqlEndpoint <http://localhost:3030/ds/sparql> ;
     # use the dev.finto.fi endpoint where the example vocabularies reside
     skosmos:sparqlEndpoint <http://api.dev.finto.fi/sparql> ;
     # sparql-query extension, or "Generic" for plain SPARQL 1.1

diff --git a/migrate-config.php b/migrate-config.php
@@ -98,7 +98,7 @@ function parse_vocabularies_file($vocabulariesFile)
 :config a skosmos:Configuration ;
     # SPARQL endpoint
     # a local Fuseki server is usually on localhost:3030
-    skosmos:sparqlEndpoint "$endpoint" ;
+    skosmos:sparqlEndpoint <$endpoint> ;
     # sparql-query extension, or "Generic" for plain SPARQL 1.1
     # set to "JenaText" instead if you use Fuseki with jena-text index
     skosmos:sparqlDialect "$dialect" ;

diff --git a/model/GlobalConfig.php b/model/GlobalConfig.php
@@ -164,7 +164,12 @@ public function getSparqlTimeout()
      */
     public function getDefaultEndpoint()
     {
-        return $this->getLiteral('skosmos:sparqlEndpoint', 'http://localhost:3030/ds/sparql');
+        $endpoint = $this->resource->get('skosmos:sparqlEndpoint');
+        if ($endpoint) {
+            return $endpoint->getUri();
+        } else {
+            return 'http://localhost:3030/ds/sparql';
+        }
     }
 
     /**

diff --git a/tests/testconfig.ttl b/tests/testconfig.ttl
@@ -21,7 +21,7 @@
 :config a skosmos:Configuration ;
     # SPARQL endpoint
     # a local Fuseki server is usually on localhost:3030
-    skosmos:sparqlEndpoint "http://localhost:13030/ds/sparql" ;
+    skosmos:sparqlEndpoint <http://localhost:13030/ds/sparql> ;
     # sparql-query extension, or "Generic" for plain SPARQL 1.1
     # set to "JenaText" instead if you use Fuseki with jena-text index
     skosmos:sparqlDialect "Generic" ;