Fixing bug with format

classes/Endpoint.php

@@ -9,7 +9,7 @@ class Endpoint{
   	$this->params = $params;
   }
   
-  public function query($q, $output = null){
+  public function query($q, $output = 'json'){
   	global $conf;
   	$auxoutput = $this->params['output'];
   	if($output != null){

classes/Queries.php

@@ -48,7 +48,7 @@ class Queries{
   	}
   	}LIMIT 1
 QUERY;
-$r = $e->query($q, $e);
+$r = $e->query($q);
 if(sizeof($r['results']['bindings'])>0){
   $u = (isset($r['results']['bindings'][0]['uri']))?$r['results']['bindings'][0]['uri']['value']:NULL;
   $p = (isset($r['results']['bindings'][0]['page']))?$r['results']['bindings'][0]['page']['value']:NULL;

index.php

@@ -63,7 +63,7 @@ if($res != NULL && $page == NULL){ // Original URI is a page
   
   header('Content-Type: '.$acceptContentType);
   if(preg_match("/describe/i", $query)){
-  	$results = $endpoint->query($query);
+  	$results = $endpoint->query($query, $conf['endpoint']['config']['describe']['output']);
   	require('lib/arc2/ARC2.php');
   	$parser = ARC2::getRDFParser();
   	$parser->parse($conf['basedir'], $results);
@@ -85,7 +85,7 @@ if($res != NULL && $page == NULL){ // Original URI is a page
   	exit(0);
   }
   elseif(preg_match("/select/i", $query)){
-  	$results = $endpoint->query($query);
+  	$results = $endpoint->query($query, $conf['endpoint']['config']['select']['output']);
   	if(sizeof($results['results']['bindings']) == 0){
   	  Utils::send404($uri);
   	}