Merge branch 'development' into hotfixes

classes/Endpoint.php

@@ -61,7 +61,7 @@ class Endpoint{
           $r = json_decode($aux, true);
           return $r;
         }
-  }
+    }
   
   public function queryPost($q){
   	$params =  $this->params;

classes/Utils.php

@@ -174,7 +174,7 @@ class Utils{
   }
   
   
-  private static function serializeRdf($data, $extension){
+  public static function serializeRdf($data, $extension='rdf'){
   	global $conf;
   	global $lodspk;
   	$ser;
@@ -427,6 +427,7 @@ class Utils{
   	  	  $rPointer[$modelFile]['first'] = $rPointer[$modelFile][0];
   	  	  }*/
   	  	}else{
+  	  	  $lodspk['resultRdf'] = true;
   	  	  $rPointer[$strippedModelFile] = $aux;
   	  	}
   	  }else{
@@ -437,6 +438,7 @@ class Utils{
   	  	  $rPointer['first'] = $rPointer[0];
   	  	  }*/
   	  	}else{
+  	  	  $lodspk['resultRdf'] = true;
   	  	  $rPointer = $aux;
   	  	}  	 
   	  }
@@ -521,9 +523,12 @@ class Utils{
 	  echo($data);
 	}elseif(is_file($lodspk['view'].$view)){
 	  Haanga::Load($view, $vars);
+	}elseif($view == null){
+	  $fnc = Haanga::compile('{{models|safe}}');
+	  $fnc($vars, TRUE);
 	}else{
 	  $fnc = Haanga::compile($view);
-	  $fnc($vars, FALSE);
+	  $fnc($vars, TRUE);
 	}
   	
   }

classes/modules/uriModule.php

@@ -35,10 +35,16 @@ class UriModule extends abstractModule{
   	if($modelFile == NULL){
   	  return FALSE;
   	}
-  	return $pair;
+  	$result = array( 'res' => $pair[0],
+  	  					 'page' => $pair[1], 
+  	  					 'format' => $pair[2], 
+  	  					 'modelFile' => $modelFile, 
+  	  					 'viewFile' => $viewFile);
+
+  	return $result;
   }
   
-  public function execute($pair){
+  public function execute($p){
   	global $conf;
   	global $localUri;
   	global $uri;
@@ -47,10 +53,14 @@ class UriModule extends abstractModule{
   	global $lodspk;
   	global $results;
   	global $first;
-  	list($res, $page, $format) = $pair;
+  	$res = $p['res'];
+  	$page = $p['page'];
+  	$format = $p['format'];
+  	$modelFile = $p['modelFile'];
+  	$viewFile = $p['viewFile'];
   	$uri = $res;
   	$curie = Utils::uri2curie($res);
-
+  	
   	//If resource is not the page, send a 303 to the document
   	if($res == $localUri){
   	  Utils::send303($page, $acceptContentType);
@@ -67,14 +77,14 @@ class UriModule extends abstractModule{
   	* dcterms:format for this page
   	*/
   	$acceptContentType = $format;
-
+  	
   	$curie = Utils::uri2curie($uri);
-  	list($modelFile, $viewFile) = $this->getModelandView($curie, $extension);
   	if($modelFile == NULL){
   	  return;
   	}
   	
-  	$lodspk = $conf['view']['standard'];
+  	//$lodspk = $conf['view']['standard'];
+
   	$lodspk['type'] = $modelFile;
   	$lodspk['module'] = 'uri';
   	$lodspk['add_mirrored_uris'] = true;
@@ -92,8 +102,12 @@ class UriModule extends abstractModule{
   	chdir($conf['home'].$conf['model']['directory']);
   	
   	Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
-  	$results = Utils::internalize($results); 
-  	
+  	if($lodspk['resultRdf']){
+  	  echo Utils::serializeRdf($results, $extension);
+  	  exit(0);
+  	}else{
+  	  $results = Utils::internalize($results); 
+  	}
   	$lodspk['first'] = Utils::getFirsts($results);
   	chdir($conf['home']);
   	if(is_array($results)){
@@ -101,17 +115,40 @@ class UriModule extends abstractModule{
   	}else{
   	  $resultsObj = $results;
   	}
+  	if($conf['debug']){
+  	  trigger_error("Using template ".$viewFile, E_USER_NOTICE);
+  	  echo("TEMPLATE: ".$viewFile."\n\n");
+  	}
   	Utils::processDocument($viewFile, $lodspk, $resultsObj);
   	
   }
   
   private static function getModelandView($uri, $extension){  	
   	global $conf;
+  	global $lodspk;
   	$auxViewFile  = $conf['view']['directory'].$conf['uri']['prefix'].$uri.'/'.$extension.'.template';
   	$auxModelFile = $conf['model']['directory'].$conf['uri']['prefix'].$uri.'/'.$extension.'.queries';
-  	if(file_exists($auxModelFile) && file_exists($auxViewFile) ){
-  	  $viewFile = $conf['uri']['prefix'].$uri.'/'.$extension.'.template';
+ 	if(file_exists($auxModelFile)){
+ 	  //Model exists
   	  $modelFile = $conf['uri']['prefix'].$uri.'/'.$extension.'.queries';
+  	  if(file_exists($auxViewFile) ){
+  	  	//View exists, everything is fine
+  	  	$viewFile = $conf['uri']['prefix'].$uri.'/'.$extension.'.template';
+  	  }elseif($extension != 'html'){
+  	  	//View doesn't exists (and is not HTML)
+  	  	$viewFile = null;  	  	
+  	  }
+  	  return array($modelFile, $viewFile);
+  	}elseif($extension != 'html' && file_exists($conf['model']['directory'].$conf['uri']['prefix'].$uri.'/html.queries')){
+  	  $modelFile = $conf['uri']['prefix'].$uri.'/html.queries';
+  	  if(file_exists($auxViewFile) ){
+  	  	//View exists, everything is fine
+  	  	$viewFile = $conf['uri']['prefix'].$uri.'/'.$extension.'.template';
+  	  }elseif($extension != 'html'){
+  	  	//View doesn't exists (and is not HTML)
+  	  	$lodspk['transform_select_query'] = true;
+  	  	$viewFile = null;  	  	
+  	  }
   	  return array($modelFile, $viewFile);
   	}
   	return array(NULL, NULL);

utils/modules/debug.php

 <?
+error_reporting(E_ERROR);
 $s = 'settings.inc.php';
 $c = file_get_contents($s);
 $optionarray = Array('on' => 'true', '1' => 'true', 'off' => 'false', '0' =>'false');