Merge branch 'master' into amdadev

Benjamin Renard
2 parents 504c431a 0fc65398
Showing 3 changed files with 14 additions and 11 deletions Show diff stats
generic_data/Functions/functions.xml
index.html
php/classes/FilesMgr.php
@@ -111,7 +111,7 @@
     </function>
     <function name="filter()" args="3" kind="filter" group="space">
         <default_args>,6,100</default_args>
-        <info_brief>Remove Spikes: filter(param, factor,nPoints)</info_brief>
+        <info_brief>Remove Spikes ( ! Experimental ! ) : filter(param, factor,nPoints)</info_brief>
         <new_kernel>#filter</new_kernel>
     </function>
     <function name="BCain(,)" args="2" kind="model" group="space">
@@ -92,7 +92,7 @@
 <div id="Btn_About" onclick="location.href='help/info.html';"></div>
 <div id="textAbout">AMDA Info</div>
  
-<a href="http://www.cdpp.eu/" id="Logo_CDPP"></a>
+<a href="http://www.cdpp.eu/" id="Logo_CDPP" target="_blank"></a>
 <div id="PaveGuest">
     <form action="desktop.php" method="POST" onsubmit="return checkGuest();">
         <input id="Btn_GuestLogin" name="username" type="submit" value=""/>
@@ -104,11 +104,14 @@
  
 <div id="PaveAnnoucements">
 <div id="TitrePaveAnnoucement">Announcements</div>
-<div id="DateAnnoucement">03/06/2020</div>
-<div id="TexteAnnoucement">New data : Parker Solar Probe : SWEAP SPANe</div>
-<div id="DateAnnoucement">01/06/2020</div>
-<div id="TexteAnnoucement">JUNO FGM : perijove data is added</div>
-<div id="DateAnnoucement">14/05/2020</div>
-<div id="TexteAnnoucement">Solar wind ballistic delays for all planets, BepiColombo, Solar Orbiter</div>
-<div id="TexteAnnoucement"><b>New data:</b> <BR/>Stereo HET, SIT</BR>Solar Wind Propagation (TAO) : PSP, SolO</div>
-</div>
+
+<div id="DateAnnoucement">28/07/2021</div>
+<div id="TexteAnnoucement">New data:</br>MMS (including burst mode), <br/>VEX IMA: Version 2.0,<br/> BepiColombo Venus flybys ephemeris,<br/> PSP Venus flybys: ephemeris & data,<br/>JASON3: AMBRE</div>
+<div id="DateAnnoucement">28/07/2021</div>
+<div id="TexteAnnoucement">Fix remote access to CDAWeb</div>
+<div id="DateAnnoucement">19/04/2021</div>
+<div id="TexteAnnoucement">New tool:<a target='_blank' href="http://amda.irap.omp.eu/help/amdapy/index.html"> Python package for AMDA</a></div>
+<div id="DateAnnoucement">19/04/2021</div>
+<div id="TexteAnnoucement">New data:</br>ACE/SWEPAM Electron Pitch Angle</div>
+<div id="DateAnnoucement">22/02/2021</div>
+<div id="TexteAnnoucement">New data:</br>ARTEMIS, Mariner 10</div>
@@ -751,7 +751,7 @@ class FilesMgr extends AmdaObjectMgr
 			if (strpos($this->fileName,"cef.gz") !== false) return "cef";  
 		}
  
-		if (strpos($file_info[0],"application/xml") !== false)
+		if ((strpos($file_info[0],"application/xml") !== false) || (strpos($file_info[0],"text/xml") !== false))
 		{
 			//if ($this->getVotFileMgr()->isValidSchema()) //BRE : No schema validation for the moment due to some trouble with Topcat (it can create not valid VOTable)
 			return "vot";