Skip to content
Snippets Groups Projects
Commit 9ac99112 authored by Stein Magne Bjorklund's avatar Stein Magne Bjorklund
Browse files

Revert 0c67dc17 - Class Endpoint.php expect parameters

We cannot just remove data from common.inc.php
The class expect and try to use it throwing errors/warning every
time the application load.
parent 5ddb46d9
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
...@@ -8,7 +8,7 @@ class Endpoint ...@@ -8,7 +8,7 @@ class Endpoint
private $sparqlUrl; private $sparqlUrl;
private $params; private $params;
public function __construct($sparqlUrl, $params) public function __construct($sparqlUrl, array $params)
{ {
$this->sparqlUrl = $sparqlUrl; $this->sparqlUrl = $sparqlUrl;
$this->params = $params; $this->params = $params;
...@@ -29,7 +29,7 @@ class Endpoint ...@@ -29,7 +29,7 @@ class Endpoint
} elseif ($output == 'rdf') { } elseif ($output == 'rdf') {
$accept = 'application/rdf+xml'; $accept = 'application/rdf+xml';
} }
$aux = "";
$modified = 0; $modified = 0;
$now = time(); $now = time();
$cacheFile = ""; $cacheFile = "";
......
...@@ -5,8 +5,7 @@ $conf['home'] = LOADSPEAKR_ROOT . '/'; ...@@ -5,8 +5,7 @@ $conf['home'] = LOADSPEAKR_ROOT . '/';
$conf['output']['select'] = 'json'; $conf['output']['select'] = 'json';
$conf['output']['ask'] = 'json'; $conf['output']['ask'] = 'json';
$conf['output']['describe'] = 'rdf'; $conf['output']['describe'] = 'rdf';
//$conf['endpointParams']['config']['show_inline'] = 0; $conf['endpointParams']['config'] = [];
//$conf['endpointParams']['config']['named_graph'] = '';
//ALternative endpoints //ALternative endpoints
$conf['endpoint']['dbpedia'] = 'http://dbpedia.org/sparql'; $conf['endpoint']['dbpedia'] = 'http://dbpedia.org/sparql';
$conf['endpoint']['data_gov'] = 'http://services.data.gov/sparql'; $conf['endpoint']['data_gov'] = 'http://services.data.gov/sparql';
......
...@@ -36,7 +36,6 @@ if ($conf['debug']) { ...@@ -36,7 +36,6 @@ if ($conf['debug']) {
$results = array(); $results = array();
$firstResults = array(); $firstResults = array();
$endpoints = array();
$endpoints['local'] = new Endpoint($conf['endpoint']['local'], $conf['endpointParams']['config']); $endpoints['local'] = new Endpoint($conf['endpoint']['local'], $conf['endpointParams']['config']);
$acceptContentType = Utils::getBestContentType($_SERVER['HTTP_ACCEPT'], $conf['http_accept']); $acceptContentType = Utils::getBestContentType($_SERVER['HTTP_ACCEPT'], $conf['http_accept']);
$extension = Utils::getExtension($acceptContentType, $conf['http_accept']); $extension = Utils::getExtension($acceptContentType, $conf['http_accept']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment