From ff8e029a3b75a67aab303634f2cff2d5959de6c5 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@graves.cl>
Date: Sat, 16 Feb 2013 01:45:31 -0800
Subject: [PATCH] asks first if array size >0
---
classes/modules/serviceModule.php | 32 ++++++++++++++++---------------
classes/modules/typeModule.php | 30 +++++++++++++++--------------
2 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/classes/modules/serviceModule.php b/classes/modules/serviceModule.php
index 0175ac3b..58fdbe45 100644
--- a/classes/modules/serviceModule.php
+++ b/classes/modules/serviceModule.php
@@ -52,21 +52,23 @@ class ServiceModule extends abstractModule{
}else{
if($lodspk['model'] == null && $lodspk['view'] == null){
//checking other components
- foreach($conf['components']['services'] as $service){
- $serviceArray = explode("/", $service);
- if($serviceName == end($serviceArray)){
- array_pop($serviceArray);
- $conf['service']['prefix'] = array_pop($serviceArray);
- $conf['model']['directory'] = join("/", $serviceArray);
- $conf['view']['directory'] = $conf['model']['directory'];
- if(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl')){
- $subDir = $this->readScaffold($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl', join("/", $arguments));
- $subDir.= '/';
- $lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir;
- $lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir.$extension.'.template';
- }elseif(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName)){
- $lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/';
- $lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$extension.'.template';
+ if(sizeof($conf['components']['services'])>0){
+ foreach($conf['components']['services'] as $service){
+ $serviceArray = explode("/", $service);
+ if($serviceName == end($serviceArray)){
+ array_pop($serviceArray);
+ $conf['service']['prefix'] = array_pop($serviceArray);
+ $conf['model']['directory'] = join("/", $serviceArray);
+ $conf['view']['directory'] = $conf['model']['directory'];
+ if(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl')){
+ $subDir = $this->readScaffold($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl', join("/", $arguments));
+ $subDir.= '/';
+ $lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir;
+ $lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir.$extension.'.template';
+ }elseif(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName)){
+ $lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/';
+ $lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$extension.'.template';
+ }
}
}
}
diff --git a/classes/modules/typeModule.php b/classes/modules/typeModule.php
index 00067114..a2aa0ef3 100644
--- a/classes/modules/typeModule.php
+++ b/classes/modules/typeModule.php
@@ -159,20 +159,22 @@ class TypeModule extends abstractModule{
break;
}else{
$found = false;
- foreach($conf['components']['types'] as $type){
- $typeArray = explode("/", $type);
- $typeName = end($typeArray);
- if($v == $typeName && file_exists($type)){
- array_pop($typeArray);
- $conf['type']['prefix'] = array_pop($typeArray);
- $conf['model']['directory'] = join("/", $typeArray);
- $conf['view']['directory'] = $conf['model']['directory'];
- $lodspk['model'] = $conf['model']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/queries';
- $lodspk['view'] = $conf['view']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/'.$extension.'.template';
- $objResult['viewFile'] = $lodspk['view'];
- $objResult['modelFile'] = $lodspk['model'];
- $found = true;
- return $objResult;
+ if(sizeof($conf['components']['types'])>0){
+ foreach($conf['components']['types'] as $type){
+ $typeArray = explode("/", $type);
+ $typeName = end($typeArray);
+ if($v == $typeName && file_exists($type)){
+ array_pop($typeArray);
+ $conf['type']['prefix'] = array_pop($typeArray);
+ $conf['model']['directory'] = join("/", $typeArray);
+ $conf['view']['directory'] = $conf['model']['directory'];
+ $lodspk['model'] = $conf['model']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/queries';
+ $lodspk['view'] = $conf['view']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/'.$extension.'.template';
+ $objResult['viewFile'] = $lodspk['view'];
+ $objResult['modelFile'] = $lodspk['model'];
+ $found = true;
+ return $objResult;
+ }
}
}
if($found){break;}
--
GitLab