Skip to content
Snippets Groups Projects
Commit ff8e029a authored by alvaro's avatar alvaro
Browse files

asks first if array size >0

parent 9fea3ef2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
classes/modules/serviceModule.php
+ 17
− 15
View file @ ff8e029a
...@@ -52,21 +52,23 @@ class ServiceModule extends abstractModule{ ...@@ -52,21 +52,23 @@ class ServiceModule extends abstractModule{
}else{ }else{
if($lodspk['model'] == null && $lodspk['view'] == null){ if($lodspk['model'] == null && $lodspk['view'] == null){
//checking other components //checking other components
foreach($conf['components']['services'] as $service){ if(sizeof($conf['components']['services'])>0){
$serviceArray = explode("/", $service); foreach($conf['components']['services'] as $service){
if($serviceName == end($serviceArray)){ $serviceArray = explode("/", $service);
array_pop($serviceArray); if($serviceName == end($serviceArray)){
$conf['service']['prefix'] = array_pop($serviceArray); array_pop($serviceArray);
$conf['model']['directory'] = join("/", $serviceArray); $conf['service']['prefix'] = array_pop($serviceArray);
$conf['view']['directory'] = $conf['model']['directory']; $conf['model']['directory'] = join("/", $serviceArray);
if(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl')){ $conf['view']['directory'] = $conf['model']['directory'];
$subDir = $this->readScaffold($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl', join("/", $arguments)); if(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl')){
$subDir.= '/'; $subDir = $this->readScaffold($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/scaffold.ttl', join("/", $arguments));
$lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir; $subDir.= '/';
$lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir.$extension.'.template'; $lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir;
}elseif(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName)){ $lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$subDir.$extension.'.template';
$lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'; }elseif(file_exists($conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName)){
$lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$extension.'.template'; $lodspk['model'] = $conf['model']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/';
$lodspk['view'] = $conf['view']['directory'].'/'.$conf['service']['prefix'].'/'.$serviceName.'/'.$extension.'.template';
}
} }
} }
} }
......
classes/modules/typeModule.php
+ 16
− 14
View file @ ff8e029a
...@@ -159,20 +159,22 @@ class TypeModule extends abstractModule{ ...@@ -159,20 +159,22 @@ class TypeModule extends abstractModule{
break; break;
}else{ }else{
$found = false; $found = false;
foreach($conf['components']['types'] as $type){ if(sizeof($conf['components']['types'])>0){
$typeArray = explode("/", $type); foreach($conf['components']['types'] as $type){
$typeName = end($typeArray); $typeArray = explode("/", $type);
if($v == $typeName && file_exists($type)){ $typeName = end($typeArray);
array_pop($typeArray); if($v == $typeName && file_exists($type)){
$conf['type']['prefix'] = array_pop($typeArray); array_pop($typeArray);
$conf['model']['directory'] = join("/", $typeArray); $conf['type']['prefix'] = array_pop($typeArray);
$conf['view']['directory'] = $conf['model']['directory']; $conf['model']['directory'] = join("/", $typeArray);
$lodspk['model'] = $conf['model']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/queries'; $conf['view']['directory'] = $conf['model']['directory'];
$lodspk['view'] = $conf['view']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/'.$extension.'.template'; $lodspk['model'] = $conf['model']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/queries';
$objResult['viewFile'] = $lodspk['view']; $lodspk['view'] = $conf['view']['directory'].'/'.$conf['type']['prefix'].'/'.$typeName.'/'.$extension.'.template';
$objResult['modelFile'] = $lodspk['model']; $objResult['viewFile'] = $lodspk['view'];
$found = true; $objResult['modelFile'] = $lodspk['model'];
return $objResult; $found = true;
return $objResult;
}
} }
} }
if($found){break;} if($found){break;}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment