CDPP / AMDA_IHM

Commit e48a45d78c9e9e9e3b81748c150cee8adcb043f7

Authored by Elena.Budnik
1 parent b8194303
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

WebServices folder

Showing 8 changed files with 5 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/WSClientInterface.php renamed to php/WebServices/Client/WSClientInterface.php
  Diff comments   View file @e48a45d
php/classes/WSClientREST.php renamed to php/WebServices/Client/WSClientREST.php
  Diff comments   View file @e48a45d
php/classes/WSClientSOAP.php renamed to php/WebServices/Client/WSClientSOAP.php
  Diff comments   View file @e48a45d
php/classes/WSUserMgr.php renamed to php/WebServices/WSUserMgr.php
  Diff comments   View file @e48a45d
php/classes/WebServer.php renamed to php/WebServices/WebServer.php
  Diff comments   View file @e48a45d
... ... @@ -678,7 +678,8 @@ class WebServer
678 678 $resultFilePrefix .= "_".$this->userID;
679 679  
680 680 $dom = new DomDocument("1.0");
681   - $dom->load(plotsXml);
  681 + if (!@$dom->load(WSConfigClass::getXslDir()."AmdaPlots.xml"))
  682 + $this->throwError("systemError", "Cannot load predefined plot definition"); ;
682 683  
683 684 $missionTag = $dom->getElementById($mission);
684 685 $params = $missionTag->getElementsByTagName('param');
... ...
public/WebServices/XML/AmdaPlots.xml renamed to php/WebServices/xml/AmdaPlots.xml
  Diff comments   View file @e48a45d
php/XML/xml2vot.xsl renamed to php/WebServices/xml/xml2vot.xsl
  Diff comments   View file @e48a45d
php/testWebServer.php
  Diff comments   View file @e48a45d
1 1 <?php
2 2  
3   -require_once("classes/WSClientSOAP.php");
4   -require_once("classes/WSClientREST.php");
  3 +require_once("WebServices/WSClientSOAP.php");
  4 +require_once("WebServices/WSClientREST.php");
5 5  
6 6 function runSuiteTests($client)
7 7 {
... ... @@ -150,7 +150,7 @@ function runSuiteTests($client)
150 150 }
151 151 }
152 152  
153   -$clientSOAP = new WSClientSOAP("http://localhost/NEWAMDA-BENJAMIN/public/wsdl/Methods_AMDA.wsdl");
  153 +$clientSOAP = new WSClientSOAP("http://apus.irap.omp.eu/NEWAMDA/public/wsdl/Methods_AMDA.wsdl");
154 154  
155 155 echo "==> Suite tests for SOAP client".PHP_EOL;
156 156 runSuiteTests($clientSOAP);
... ...