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
......@@ -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';
}
}
}
}
......
......@@ -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;}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment