needsArgs to SimuParams

Elena.Budnik
1 parent 9fad5834
Showing 1 changed file with 77 additions and 81 deletions Show diff stats
php/classes/AmdaAction.php
@@ -425,7 +425,7 @@ class AmdaAction
 								$isScatter = true;					   
 							}
  
-							$needsArgs =  $child->hasAttribute('needsArgs');
+							$needsArgs =  $child->getAttribute('needsArgs');
  
 							if (($child->tagName == 'parameter' && $child->hasChildNodes()) || $needsArgs) $isScatter = false;
  
@@ -551,38 +551,37 @@ class AmdaAction
 		return $paramMgr->saveTree($obj);            
 	}
  
-    public  function doNothing($obj) 
-    {	    
-        return array("res" => 'ok');
-        
-    }
+	public  function doNothing($obj) 
+	{	    
+		return array("res" => 'ok');
+		
+	}
  
-    public  function deleteFromTree($obj) 
-    {    
-        $paramMgr = new ParamMgr();
-        return $paramMgr->deleteFromTree($obj);
-        
-    }
+	public  function deleteFromTree($obj) 
+	{    
+		$paramMgr = new ParamMgr();
+		return $paramMgr->deleteFromTree($obj);		
+	}
  
 /*
 *  temporary object fromUpload
 */ 
-    public  function getUploadedObject($name, $format, $nodeType)
-    {  
-            switch ($nodeType) 
-            {
-                case 'timeTable' : 
-                        $objectMgr = new TimeTableMgr();		  
-                        break;
-                case 'myDataParam' : 
-                        $objectMgr = new FilesMgr();			  	  
-                        break;
-                default:
-                        return array("error" => $nodeType." NOT_IMPLEMENTED_YET");
-            }
-            return  $objectMgr -> getUploadedObject($name, $format, true);
-
-    }	
+	public  function getUploadedObject($name, $format, $nodeType)
+	{  
+		switch ($nodeType) 
+		{
+			case 'timeTable' : 
+				$objectMgr = new TimeTableMgr();		  
+				break;
+			case 'myDataParam' : 
+				$objectMgr = new FilesMgr();			  	  
+				break;
+			default:
+				return array("error" => $nodeType." NOT_IMPLEMENTED_YET");
+		}
+		return  $objectMgr -> getUploadedObject($name, $format, true);
+
+	}	
  
 /*
 *  fill ascii file into grid 
@@ -725,64 +724,61 @@ class AmdaAction
 /*   
 *   $obj = { name: obj.name, obj.nodeType, obj.leaf (??), OBJ DEPENDENT ATTRIBUTES }
 */
-    public  function createObject($obj, $folder) {  
- 
-	    switch ($obj->nodeType) {
-
-		  case 'myDataParam' :                           
-		  case 'derivedParam' :
-                        if ($obj->nodeType == 'derivedParam' &&  $this->amdaStat->success) 
-                             $this->amdaStat->addTask('create', $this->user, null);
-
-                        $objectMgr = new DerivedParamMgr($obj->nodeType);			   
-                        break;		  
-		  case 'timeTable' : 
-                        $objectMgr = new TimeTableMgr();			  
-			   break; 
-		  case 'catalog' : 
-                        $objectMgr = new CatalogMgr();			  
+	public  function createObject($obj, $folder) 
+	{   
+		switch ($obj->nodeType) 
+		{
+			case 'myDataParam' :                           
+			case 'derivedParam' :
+				if ($obj->nodeType == 'derivedParam' &&  $this->amdaStat->success) 
+						$this->amdaStat->addTask('create', $this->user, null);
+				$objectMgr = new DerivedParamMgr($obj->nodeType);			   
+				break;		  
+			case 'timeTable' : 
+				$objectMgr = new TimeTableMgr();			  
+				break; 
+			case 'catalog' : 
+				$objectMgr = new CatalogMgr();			  
 			   break;
-		  case 'condition' :
-		  case 'request' : 
-			   $objectMgr = new RequestMgr($obj->nodeType);			  
-			   break;		
-		  case 'alias' :
-			    $objectMgr = new AliasMgr();  
-			    break;   
-		  default:
-			    return array("error" => $obj->nodeType." NOT_IMPLEMENTED_YET");
-              }
-
-	    return  $objectMgr -> createObject($obj, $folder);
-    }
+			case 'condition' :
+			case 'request' : 
+				$objectMgr = new RequestMgr($obj->nodeType);			  
+				break;		
+			case 'alias' :
+				$objectMgr = new AliasMgr();  
+				break;   
+			default:
+				return array("error" => $obj->nodeType." NOT_IMPLEMENTED_YET");
+		}
+		return  $objectMgr -> createObject($obj, $folder);
+	}
  
 /*   
 *   $obj = { id:obj.id, name: obj.name, obj.nodeType, obj.leaf (??), OBJ DEPENDENT ATTRIBUTES }
 */
-    public  function modifyObject($obj) {
- 
-	    switch ($obj->nodeType) {  
-
-		  case 'myDataParam' : 
-		  case 'derivedParam' : 
-			   $objectMgr = new DerivedParamMgr($obj->nodeType);			   
-			   break;
-		  case 'timeTable' : 
-			   $objectMgr = new TimeTableMgr();			  
-			   break;
-		  case 'catalog' : 
-			   $objectMgr = new CatalogMgr();			  
-			   break;  	   
-		  case 'condition' : 
-		  case 'request' :
-			   $objectMgr = new RequestMgr($obj->nodeType);			  
-			   break;
-		  default:
-			    return array("error" => $obj->nodeType." NOT_IMPLEMENTED_YET");
-              }
-
-	    return  $objectMgr -> modifyObject($obj);
-    }   
+	public  function modifyObject($obj) 
+	{
+		switch ($obj->nodeType) 
+		{  
+			case 'myDataParam' : 
+			case 'derivedParam' : 
+				$objectMgr = new DerivedParamMgr($obj->nodeType);			   
+				break;
+			case 'timeTable' : 
+				$objectMgr = new TimeTableMgr();			  
+				break;
+			case 'catalog' : 
+				$objectMgr = new CatalogMgr();			  
+				break;  	   
+			case 'condition' : 
+			case 'request' :
+				$objectMgr = new RequestMgr($obj->nodeType);			  
+				break;
+			default:
+				return array("error" => $obj->nodeType." NOT_IMPLEMENTED_YET");
+		}
+		return  $objectMgr -> modifyObject($obj);
+	}   
 /*
  * {obj.name, obj.nodeType, obj.leaf}
  */