Including RDF exporting in processDocument.

Fixing bug with Contenttype returned

classes/Utils.php

@@ -224,9 +224,13 @@ class Utils{
   	global $conf;
   	$contentType = $lodspk['contentType'];
   	$extension = Utils::getExtension($contentType); 
-
+  	
   	header('Content-Type: '.$contentType);
-  	Utils::showView($lodspk, $data, $viewFile);  	
+  	if($lodspk['resultRdf']){
+  	  echo Utils::serializeRdf($data, $extension);
+  	}else{
+  	  Utils::showView($lodspk, $data, $viewFile);  	
+  	}
   }
   
   public static function getResultsType($query){

classes/modules/serviceModule.php

@@ -105,24 +105,24 @@ class ServiceModule extends abstractModule{
   	  chdir($lodspk['model']);
   	  
   	  Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
-  	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)){
-  	  	$results = Convert::array_to_object($results);
-  	  }
+      if(!$lodspk['resultRdf']){
+      	$results = Utils::internalize($results); 
+      	$lodspk['first'] = Utils::getFirsts($results);
+      	
+      	chdir($conf['home']);
+      	if(is_array($results)){
+      	  $resultsObj = Convert::array_to_object($results);
+      	}else{
+      	  $resultsObj = $results;
+      	}
+      }else{
+      	$resultsObj = $results;
+      }
   	  
   	  //Need to redefine viewFile as 'local' i.e., inside service.foo/ so I can load files with the relative path correctly
   	  //$viewFile = $extension.".template";
-  	  
-  	  Utils::processDocument($viewFile, $lodspk, $results);  
-  	  
+  	  chdir($conf['home']);  	  
+  	  Utils::processDocument($viewFile, $lodspk, $results);    	  
   	}catch (Exception $ex){
   	  echo $ex->getMessage();
   	  trigger_error($ex->getMessage(), E_ERROR);

classes/modules/typeModule.php

@@ -84,19 +84,18 @@ class TypeModule extends abstractModule{
   	$lodspk['this']['curie'] = Utils::uri2curie($uri);
   	$lodspk['this']['local'] = $localUri;
    	$lodspk['this']['extension'] = $extension;
-   	
   	chdir($conf['home'].$conf['model']['directory']);
   	Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
-    if($lodspk['resultRdf']){
-  	  echo Utils::serializeRdf($results, $extension);
-  	  exit(0);
-  	}else{
+    if(!$lodspk['resultRdf']){
   	  $results = Utils::internalize($results); 
-  	}  	
-  	$lodspk['first'] = Utils::getFirsts($results);
-  	chdir($conf['home']);
-  	if(is_array($results)){
-  	  $resultsObj = Convert::array_to_object($results);
+  	  $lodspk['first'] = Utils::getFirsts($results);
+  	  
+  	  chdir($conf['home']);
+  	  if(is_array($results)){
+  	  	$resultsObj = Convert::array_to_object($results);
+  	  }else{
+  	  	$resultsObj = $results;
+  	  }
   	}else{
   	  $resultsObj = $results;
   	}

classes/modules/uriModule.php

@@ -101,19 +101,20 @@ class UriModule extends abstractModule{
   	
   	chdir($conf['home'].$conf['model']['directory']);
   	Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
-  	if($lodspk['resultRdf']){
-  	  echo Utils::serializeRdf($results, $extension);
-  	  exit(0);
-  	}else{
+  	if(!$lodspk['resultRdf']){
   	  $results = Utils::internalize($results); 
-  	}
-  	$lodspk['first'] = Utils::getFirsts($results);
-  	chdir($conf['home']);
-  	if(is_array($results)){
-  	  $resultsObj = Convert::array_to_object($results);
+  	  $lodspk['first'] = Utils::getFirsts($results);
+  	  
+  	  chdir($conf['home']);
+  	  if(is_array($results)){
+  	  	$resultsObj = Convert::array_to_object($results);
+  	  }else{
+  	  	$resultsObj = $results;
+  	  }
   	}else{
   	  $resultsObj = $results;
   	}
+  	chdir($conf['home']);
   	if($conf['debug']){
   	  trigger_error("Using template ".$viewFile, E_USER_NOTICE);
   	  echo("TEMPLATE: ".$viewFile."\n\n");