Commit e34e8f4550229d6bf21230a9e03637a8f0026b93

Authored by Benjamin Renard
2 parents 504c431a 0fc65398

Merge branch 'master' into amdadev

generic_data/Functions/functions.xml
... ... @@ -111,7 +111,7 @@
111 111 </function>
112 112 <function name="filter()" args="3" kind="filter" group="space">
113 113 <default_args>,6,100</default_args>
114   - <info_brief>Remove Spikes: filter(param, factor,nPoints)</info_brief>
  114 + <info_brief>Remove Spikes ( ! Experimental ! ) : filter(param, factor,nPoints)</info_brief>
115 115 <new_kernel>#filter</new_kernel>
116 116 </function>
117 117 <function name="BCain(,)" args="2" kind="model" group="space">
... ...
index.html
... ... @@ -92,7 +92,7 @@
92 92 <div id="Btn_About" onclick="location.href='help/info.html';"></div>
93 93 <div id="textAbout">AMDA Info</div>
94 94  
95   -<a href="http://www.cdpp.eu/" id="Logo_CDPP"></a>
  95 +<a href="http://www.cdpp.eu/" id="Logo_CDPP" target="_blank"></a>
96 96 <div id="PaveGuest">
97 97 <form action="desktop.php" method="POST" onsubmit="return checkGuest();">
98 98 <input id="Btn_GuestLogin" name="username" type="submit" value=""/>
... ... @@ -104,11 +104,14 @@
104 104  
105 105 <div id="PaveAnnoucements">
106 106 <div id="TitrePaveAnnoucement">Announcements</div>
107   -<div id="DateAnnoucement">03/06/2020</div>
108   -<div id="TexteAnnoucement">New data : Parker Solar Probe : SWEAP SPANe</div>
109   -<div id="DateAnnoucement">01/06/2020</div>
110   -<div id="TexteAnnoucement">JUNO FGM : perijove data is added</div>
111   -<div id="DateAnnoucement">14/05/2020</div>
112   -<div id="TexteAnnoucement">Solar wind ballistic delays for all planets, BepiColombo, Solar Orbiter</div>
113   -<div id="TexteAnnoucement"><b>New data:</b> <BR/>Stereo HET, SIT</BR>Solar Wind Propagation (TAO) : PSP, SolO</div>
114   -</div>
  107 +
  108 +<div id="DateAnnoucement">28/07/2021</div>
  109 +<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>
  110 +<div id="DateAnnoucement">28/07/2021</div>
  111 +<div id="TexteAnnoucement">Fix remote access to CDAWeb</div>
  112 +<div id="DateAnnoucement">19/04/2021</div>
  113 +<div id="TexteAnnoucement">New tool:<a target='_blank' href="http://amda.irap.omp.eu/help/amdapy/index.html"> Python package for AMDA</a></div>
  114 +<div id="DateAnnoucement">19/04/2021</div>
  115 +<div id="TexteAnnoucement">New data:</br>ACE/SWEPAM Electron Pitch Angle</div>
  116 +<div id="DateAnnoucement">22/02/2021</div>
  117 +<div id="TexteAnnoucement">New data:</br>ARTEMIS, Mariner 10</div>
... ...
php/classes/FilesMgr.php
... ... @@ -751,7 +751,7 @@ class FilesMgr extends AmdaObjectMgr
751 751 if (strpos($this->fileName,"cef.gz") !== false) return "cef";
752 752 }
753 753  
754   - if (strpos($file_info[0],"application/xml") !== false)
  754 + if ((strpos($file_info[0],"application/xml") !== false) || (strpos($file_info[0],"text/xml") !== false))
755 755 {
756 756 //if ($this->getVotFileMgr()->isValidSchema()) //BRE : No schema validation for the moment due to some trouble with Topcat (it can create not valid VOTable)
757 757 return "vot";
... ...