Merge branch 'develop' into MAZ_6018

Benjamin Renard
2 parents 679ab391 df1281eb
Showing 2 changed files with 16 additions and 2 deletions Show diff stats
php/WebServices/WebServer.php
public/wsdl/Methods_AMDA.wsdl
@@ -130,8 +130,11 @@ class WebServer
                         $tagName = $object == "timetables" ? "timeTableList" : "catalogList";
 		}
 		else {
-				if (!@$dom->load(USERWSDIR.'Tt.xml'))
-					$this->throwError("workspaceError", "Workspace Error : Cannot load TimeTable list for ".$this->userID);
+			if (!file_exists(USERWSDIR.'Tt.xml')) {
+				$ttMgr = new TimeTableMgr();
+			}
+			if (!@$dom->load(USERWSDIR.'Tt.xml'))
+				$this->throwError("workspaceError", "Workspace Error : Cannot load TimeTable list for ".$this->userID);
                         $tagName = $object == "timetables" ? "timetabList" : "catalogList";
 		}
  
@@ -382,6 +385,10 @@ class WebServer
 // 			$this->throwError('workspaceError', 'No Amda Local DataBase Parameters description file for '.$this->userID);
  
 		$this->excludePrivateNodes($locParamSrc,$locParamDst);
+
+		if (!file_exists($wsParamSrc)) {
+			$paramMgr = new DerivedParamMgr('derivedParam');
+		}
  
 		if (($this->userID == WSConfigClass::getAnonymousUserName()) ||  !copy($wsParamSrc, WSConfigClass::getWsResultDir().$wsParamDst))
 			return  array('success' => true,'ParameterList' => 
@@ -179,6 +179,13 @@
                     <xs:enumeration value="MAVEN"/>
                     <xs:enumeration value="PSP"/>
                     <xs:enumeration value="SOLO"/>
+                    <xs:enumeration value="SOLO_MAG"/>
+                    <xs:enumeration value="ROSETTA"/>
+                    <xs:enumeration value="JUNO_CRUISE"/>
+                    <xs:enumeration value="JUNO_JUPITER_ORBIT"/>
+                    <xs:enumeration value="CASSINI"/>
+                    <xs:enumeration value="MGS"/>
+                    <xs:enumeration value="MESSENGER"/>
                </xs:restriction>
             </xs:simpleType>