Using -> instead of :: static resolution operator (even for static methods)

classes/Utils.php

@@ -224,7 +224,7 @@ class Utils{
   	global $conf;
   	$contentType = $lodspk['this']['contentType'];
   	$extension = Utils::getExtension($contentType); 
-  	
+
   	header('Content-Type: '.$contentType);
   	if($extension != 'html'){
   	  $data = Utils::serializeRdf($data, $extension);
@@ -495,7 +495,7 @@ class Utils{
   	global $conf;
   	global $uri;
   	global $extension;
-  	$lodspk = $conf['view']['standard'];
+  	//$lodspk = $conf['view']['standard'];
   	$lodspk = $lodspkData;
   	
   	if(isset($lodspkData['params'])){

classes/modules/serviceModule.php

@@ -7,19 +7,22 @@ class ServiceModule extends abstractModule{
   	global $conf; 
   	global $acceptContentType; 
     global $localUri;
+    global $lodspk;
   	$q = preg_replace('|^'.$conf['basedir'].'|', '', $localUri);
  	$qArr = explode('/', $q);
   	if(sizeof($qArr)==0){
   	  return FALSE;
   	}
   	$extension = Utils::getExtension($acceptContentType); 
-  	$viewFile  = $conf['service']['prefix'].$qArr[0]."/".$extension.".template";
-  	$modelFile = $conf['service']['prefix'].$qArr[0]."/".$extension.".queries";
-  	if(file_exists($conf['home'].$conf['model']['directory'].$modelFile) && file_exists($conf['home'].$conf['view']['directory'].$viewFile) && $qArr[0] != null){
+  	$lodspk['model']['directory'] = $conf['home'].$conf['model']['directory'].$conf['service']['prefix'].$qArr[0]."/";
+  	$lodspk['view']['directory'] = $conf['home'].$conf['view']['directory'].$conf['service']['prefix'].$qArr[0].'/';
+  	$viewFile  = $extension.".template";
+  	$modelFile = $extension.".queries";
+  	if(file_exists($lodspk['model']['directory'].$modelFile) && file_exists($lodspk['view']['directory'].$viewFile) && $qArr[0] != null){
   	  trigger_error("Using model ".$modelFile." and view ".$viewFile, E_USER_NOTICE);
-  	  return array($modelFile, $viewFile);
+ 	  return array($modelFile, $viewFile);
   	}elseif($extension != 'html' && file_exists($conf['model']['directory'].$conf['service']['prefix'].$qArr[0].'/html.queries')){
-  	  $modelFile = $conf['service']['prefix'].$qArr[0].'/html.queries';
+  	  $modelFile =  $conf['home'].$conf['model']['directory'].$conf['service']['prefix'].$qArr[0].'/html.queries';
   	  $viewFile = null;
   	  trigger_error("Using ".$modelFile." as model. It will be used as a CONSTRUCT", E_USER_NOTICE);
   	  return array($modelFile, $viewFile);
@@ -69,15 +72,15 @@ public function execute($service){
   	  $args["arg".$i]=$params[$i];
   	}
   	$results['params'] = $params;
-  	$lodspk = $conf['view']['standard'];
+  	//$lodspk = $conf['view']['standard'];
   	$lodspk['type'] = $modelFile;
   	$lodspk['root'] = $conf['root'];
   	$lodspk['home'] = $conf['basedir'];
   	$lodspk['this']['value'] = $uri;
   	$lodspk['this']['curie'] = Utils::uri2curie($uri);
   	$lodspk['this']['contentType'] = $acceptContentType;
-  	$lodspk['model']['directory'] = $conf['model']['directory'];
-  	$lodspk['view']['directory'] = $conf['view']['directory'];
+  	//$lodspk['model']['directory'] = $conf['model']['directory'];
+  	//$lodspk['view']['directory'] = $conf['view']['directory'];
   	$lodspk['ns'] = $conf['ns'];
   	$lodspk['endpoint'] = $conf['endpoint'];
   	$lodspk['type'] = $modelFile;
@@ -88,13 +91,12 @@ public function execute($service){
   	$lodspk['baseUrl'] = $conf['basedir'];
   	$lodspk['this']['value'] = $uri;
   	$lodspk['this']['contentType'] = $acceptContentType;
-  	$lodspk['view']['directory'] = $conf['home'].$conf['view']['directory'];//.$conf['service']['prefix'].$f.'/';
-  	$lodspk['model']['directory'] = $conf['home'].$conf['model']['directory'];
+  	//$lodspk['view']['directory'] = $viewFile;//$conf['home'].$conf['view']['directory'];//.$conf['service']['prefix'].$f.'/';
+  	//$lodspk['model']['directory'] = $conf['home'].$conf['model']['directory'];
   	if($viewFile == null){
   	  $lodspk['transform_select_query'] = true;
   	}
-  	
-  	chdir($conf['home'].$conf['model']['directory']);
+  	chdir($lodspk['model']['directory']);
   	
   	Utils::queryFile($modelFile, $endpoints['local'], $results, $first);
   	$results = Utils::internalize($results);
@@ -107,6 +109,7 @@ public function execute($service){
   	
   	//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);  
   	
   }catch (Exception $ex){

classes/modules/typeModule.php

@@ -61,7 +61,7 @@ class TypeModule extends abstractModule{
   	//Check if files for model and view exist
   	$t=Queries::getClass($uri, $endpoints['local']);
   	
-  	list($modelFile, $viewFile) = $this::getModelandView($t, $extension);
+  	list($modelFile, $viewFile) = $this->getModelandView($t, $extension);
   	$lodspk = $conf['view']['standard'];
   	if($viewFile == null){
   	  $lodspk['transform_select_query'] = true;

classes/modules/uriModule.php

@@ -30,7 +30,7 @@ class UriModule extends abstractModule{
   	}
   	$extension = Utils::getExtension($pair[2]); 
   	$curie = Utils::uri2curie($pair[0]);
-  	list($modelFile, $viewFile) = $this::getModelandView($curie, $extension);
+  	list($modelFile, $viewFile) = $this->getModelandView($curie, $extension);
   	
   	if($modelFile == NULL){
   	  return FALSE;
@@ -69,7 +69,7 @@ class UriModule extends abstractModule{
   	$acceptContentType = $format;
 
   	$curie = Utils::uri2curie($uri);
-  	list($modelFile, $viewFile) = $this::getModelandView($curie, $extension);
+  	list($modelFile, $viewFile) = $this->getModelandView($curie, $extension);
   	if($modelFile == NULL){
   	  return;
   	}