Merge branch 'master' into fix-folders-fix-merge

Elena.Budnik
2 parents ef2dedb3 2b8ea2a7
Showing 2 changed files with 37 additions and 17 deletions Show diff stats
php/RemoteDataCenter/RemoteParamManager.php
php/classes/AmdaAction.php
@@ -6,7 +6,7 @@
 class RemoteParamManager
 { 
-	protected $Bases, $basesDom;	 	
+	public $Bases, $basesDom;	 	
 	protected $baseDom;
 	protected $center;
@@ -16,31 +16,41 @@ class RemoteParamManager
 	function __construct() 
 	{
+		$this->basesDom = new DomDocument("1.0");
+
+		if (!is_dir(RemoteData."/PARAMS"))
+				mkdir(RemoteData."/PARAMS", 0775, true);
+				
+		if (!is_dir(RemoteData."/PARAMS_INFO"))
+				mkdir(RemoteData."/PARAMS_INFO", 0775, true);
+
+		$this->xmlName = USERWSDIR."RemoteParams.xml";
+		$this->xmlDom = new DomDocument("1.0");
+		
+	}
+
+	public function init() {
+	
 		if (!file_exists(RemoteData."Bases.xml"))
 				return array("err" => "No Remote Data Bases");
-
-		$this->basesDom = new DomDocument("1.0");
+				
 		if (!$this->basesDom->load(RemoteData."Bases.xml"))
 				return array("err" => "Can not load Remote Data Bases definitions");
+		
 		$bases = $this->basesDom->getElementsByTagName('dataCenter');
 		foreach ($bases as $base) 
 			$this->Bases[] = $base->getAttribute('xml:id');
-		
+			
 		if (!file_exists(USERWSDIR."RemoteParams.xml"))
-				return array("err" => "No RemoteParams.xml");
+				return array("err" => "RemoteParams file error");
-		if (!is_dir(RemoteData."/PARAMS"))
-				mkdir(RemoteData."/PARAMS", 0775, true);
-				
-		if (!is_dir(RemoteData."/PARAMS_INFO"))
-				mkdir(RemoteData."/PARAMS_INFO", 0775, true);
-				
-		$this->xmlName = USERWSDIR."RemoteParams.xml";
-		$this->xmlDom = new DomDocument("1.0");
-		$this->xmlDom->load($this->xmlName);
+		if (!$this->xmlDom->load($this->xmlName))
+			return array("err" => "RemoteParams file error");
+		
+		return array("success" => true);
 	}
-
+	
 	/*
 	*  get baseId from parameter descriptor
 	*/
@@ -572,7 +572,12 @@ class AmdaAction
 	public  function saveTree($obj)
 	{
 		$paramMgr = new RemoteParamManager();
-		return $paramMgr->saveTree($obj);
+		$res = $paramMgr->init();
+		
+		if ($res['success'])
+			return $paramMgr->saveTree($obj);
+		else 
+			return $res;
 	}
 	/*
@@ -581,7 +586,12 @@ class AmdaAction
 	public  function deleteFromTree($obj)
 	{
 		$paramMgr = new RemoteParamManager();
-		return $paramMgr->deleteFromTree($obj);
+		$res = $paramMgr->init();
+		
+		if ($res['success'])
+			return $paramMgr->deleteFromTree($obj);
+		else 
+			return $res;
 	}
 	public  function doNothing($obj)