From a2c44674be6e55bfee1b2b520c5e6e1d282da3f2 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Fri, 13 Apr 2018 12:33:55 +0200
Subject: [PATCH] wsdl correct

---
 generic_data/SpecialSettings/Settings.xml | 12 +++++++++---
 index.html                                | 18 +++++++++++++++---
 install-scripts.sh                        |  2 +-
 js/resources/css/AccueilAmda.css          |  2 +-
 php/config.php                            |  1 +
 php/my_config.php                         | 17 ++++++++---------
 public/wsdl/Methods_AMDA.wsdl             |  2 +-
 update_amda/updateEnv.sh                  | 10 +++++-----
 8 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/generic_data/SpecialSettings/Settings.xml b/generic_data/SpecialSettings/Settings.xml
index 18420ae..9bbdabb 100644
--- a/generic_data/SpecialSettings/Settings.xml
+++ b/generic_data/SpecialSettings/Settings.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0"?>
-<users>
-	   <user xml:id="budnik">
+<users>    
+    <user xml:id="genot">
         <!--- 1024*1024*1000 pour 1000Mo -->
-        <setting name="DISK_QUOTA" value="1048576000"/>       
+        <setting name="DISK_QUOTA" value="1048576000"/>
+        <setting isSetting='true' name="memory_limit" value="100000000"/> 
+        <setting isSetting='true' name="max_execution_time" value="1200"/>
+    </user>
+    <user xml:id="budnik">
+        <!--- 1024*1024*1000 pour 1000Mo -->
+        <setting name="DISK_QUOTA" value="1048576000"/>
         <setting isSetting='true' name="memory_limit" value="100000000"/> 
         <setting isSetting='true' name="max_execution_time" value="1200"/>
     </user>
diff --git a/index.html b/index.html
index ad6b0de..20a657a 100644
--- a/index.html
+++ b/index.html
@@ -36,9 +36,21 @@
 <div id="Logos_partenaires"></div>
 
 <div id="PaveAnnoucements">
-<div id="TitrePaveAnnoucement">Announcements </div>
-<div id="DateAnnoucement">12/05/2016</div>
-<div id="TexteAnnoucement">New instance for CU tests </div>
+<div id="TitrePaveAnnoucement">To Test : </div>
+<div id="DateAnnoucement">Updated : 11/04/2018</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5943" target="new">Redmine #5943</a> : 	la fenetre de Log...</div>
+<div id="DateAnnoucement">Updated : 10/04/2018</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5960" target="new">Redmine #5960</a> : Params with different samplings</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5689" target="new">Redmine #5689</a> : Bug plot MEX ELS</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5849" target="new">Redmine #5849</a> : Download 2 params for TT</div>
+<div id="DateAnnoucement">Updated : 30/03/2018</div>
+<div id="TexteAnnoucement">SPASE modifs : Cluster-Rumba => Cluster1, etc</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/6010" target="new">Redmine #6010</a> : Statistics window</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5340" target="new">Redmine #5340</a> : Legende Y axis</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5993" target="new">Redmine #5993</a> : Change Label !!!!</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5744" target="new">Redmine #5744</a> : netCDF reader</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5727" target="new">Redmine #5727</a> : Plot : tickmarks</div>
+<div id="TexteAnnoucement"><a href="https://projects.irap.omp.eu/issues/5358" target="new">Redmine #5358</a> : user groups</div>
 </div>
 
 </div><!--TousLesBoutons-->
diff --git a/install-scripts.sh b/install-scripts.sh
index 03c9385..8ee10d3 100755
--- a/install-scripts.sh
+++ b/install-scripts.sh
@@ -3,7 +3,7 @@
 # script to compile/install php/src C executables
 
 # AMDA_IHM installation root
-export IHM_DIR=/home/budnik/AMDA/AMDA_IHM
+export IHM_DIR=/home/myriam/AMDA_20170601/AMDA_IHM
 
 
 cd $IHM_DIR/php/src &&  make clean && make && make install && make clean
diff --git a/js/resources/css/AccueilAmda.css b/js/resources/css/AccueilAmda.css
index f73ae60..adb4a2b 100644
--- a/js/resources/css/AccueilAmda.css
+++ b/js/resources/css/AccueilAmda.css
@@ -1 +1 @@
-@charset "UTF-8";
@import url("../fonts/stylesheet.css");
/* CSS Document */
body{
		text-align: left;
		background-color: #FFF;
}
/*•••••••••••••• couvercle et trou ••••••••••••*/

#trou{
		position: relative;
		margin-right: 50%;
		margin-left: 50%;
		left: -1050px;
		top: -10px;
		width: 1920px;
		height: 1170px;
		z-index: 1;
		background-attachment: scroll;
		background-image: url(../images/trou.jpg);
		background-repeat: no-repeat;
}


#couvercle{
		position: relative;
		margin-right: auto;
		margin-left: auto;
		left: -276px;
		top: -130px;
		width: 676px;
		height: 676px;
		z-index: 1;
		background: url(../images/Couvercle_complet.png) 0 0 no-repeat scroll;
		background-repeat: no-repeat;
		background-image: url(../images/Couvercle_complet.png);
		-webkit-transition: all 0.5s ease-in-out;
		-moz-transition: all 0.5s ease-in-out;
		
		
	}
#couvercle:hover{
		left: -400px;
		top: -100px;
/*		-webkit-transform: rotate(-5deg)*/
		
		 }
		

		 
/*•••••••••••••• boutons ••••••••••••*/

#TousLesBoutons{
	left: 937px;
	top: -608px;
	z-index: 6;
	position: relative;
	width: 350px;
	height: 500px;
	}	 

#Btn_FirstVisit, #Btn_Rules, #Btn_Login, #Btn_Register, #Btn_Contact{
		background: url(../images/bouton_off.png) 0 0 no-repeat scroll;
		z-index: 6;
		position: relative;
		width: 40px;
		height: 40px;
	}
		
#Btn_FirstVisit:hover, #Btn_Rules:hover, #Btn_Login:hover, #Btn_Register:hover, #Btn_Contact:hover{
		background: url(../images/bouton_over.png) 0 0 no-repeat scroll;
	}
	
#Btn_EnterLogin, #Btn_EnterPassword{
	left: 90px;
	z-index: 6;
	position: relative;
	width: 230px;
	height: 25px;
	background-color: rgba(0, 0, 0, 1);
	border-radius:5px 0px 10px 5px;
	padding: 1px 0px 0px 15px;
	border:none;

	}
	#Btn_EnterLogin:hover, #Btn_EnterPassword:hover{
	background-color: rgba(66, 66, 66, 1);

	
	}




#Btn_EnterLogin, #Btn_EnterPassword{
		font-family: orbitronbold;
		font-size: 10px;
		text-align: left;
	}
	
.PlaceHolder {
	  color: #0CF; 
	}

/*••••••••••••••••••••••••••• positionnement des boutons ••••••••••••••••••*/

#Btn_FirstVisit{
		left: 83px;
		top: 0px;	
	}

#Btn_Rules{
		left: 92px;
		top: 13px;		
	}

#Btn_EnterLogin{
		top: 35px;
		
	}

#Btn_EnterPassword{
		
		top: 45px;
	}

#Btn_Login{
		left: 83px;
		top: 75px;
		border: none;
	}

#Btn_Register{
		left: 62px;
		top: 95px;
		display: block;
	}

#Btn_Contact{
		left: 30px;
		top: 112px;
		display: block;
	}
	


	
#Logo_CDPP{
	width: 209px;
	height: 144px;
	display: block;
	top: -70px;
	left:400px;
	z-index: 50;
	position: absolute;
	background: url(../images/Logo_CDPP_off.png) 0 0 no-repeat scroll;
	}
#Logo_CDPP:hover{
	background: url(../images/Logo_CDPP_over.png) 0 0 no-repeat scroll;
	z-index: 100;
}	

#Logos_partenaires{
	margin-right: auto;
	margin-left: auto;
	left:15%;
	right:10%;
	width: 1500px;
	height: 42px;
	bottom: 50px;
	z-index: 50;
	position: fixed;
	background: url(../images/LogosPartenaires.png) 0px 0px no-repeat scroll;				
}
#PaveGuest{
		font-family: orbitronbold;
		font-size: 15px;
		color: rgba(0, 0, 42, 0.3);
		left: 350px;
		top: -178px;
		width: 300px;
		height: 30px;
		z-index: 100;
		padding:20px 20px 20px 20px;
		position: relative;
		background-color: rgba(255, 255, 255, 0);
		border-radius:0px 30px 0px 30px;	
}
#TitrePaveGuest{
		font-family: orbitronlight;
		font-size: 17px;
		color: rgba(0, 0, 0, 0.3);
		background-color: rgba(255, 100, 255, 0);
		margin-top:20px;
}
#TextePaveGuest{
		font-family: orbitronlight;
		font-size: 14px;
		color: rgba(0, 0, 0, 0.5);
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 2px 5px;
		border-radius:0px 0px 20px 0px;
}
/* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/

#PaveAnnoucements{
		font-family: orbitronbold;
		font-size: 30px;
		color: rgba(0, 0, 42, 0.3);
		left: 300px;
		top: -100px;
		width: 300px;
		height: 300px;
		z-index: 100;
		padding:20px 20px 20px 20px;
		position: relative;
		background-color: rgba(255, 255, 255, 0);
		border-radius:0px 30px 0px 30px;
}
#TitrePaveAnnoucement{
		font-family: orbitronlight;
		font-size: 35px;
		color: rgba(0, 0, 0, 0.2);
		background-color: rgba(255, 100, 255, 0);
		margin-top:20px;
}
#DateAnnoucement{
		font-family: orbitronbold;
		font-size: 12px;
		color: rgba(163, 224, 255, 1);
		background-color: rgba(0, 0, 0, 1);
		padding:4px 5px 2px 5px;
		border-radius:3px 3px 3px 3px;
		width: 100px;
}
#DateAnnoucementRed{
		font-family: orbitronbold;
		font-size: 12px;
		color: #F00;
		background-color: rgba(0, 0, 0, 1);
		padding:4px 5px 2px 5px;
		border-radius:3px 3px 3px 3px;
		width: 100px;
}
#TexteAnnoucement{
		font-family: orbitronlight;
		font-size: 14px;
		color: rgba(0, 0, 0, 0.5);
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 5px 10px;
		border-top:1px solid rgba(255, 255, 255, 1);
		border-radius:0px 0px 20px 0px;
}
#TexteAnnoucementRed{
		font-family: orbitronbold;
		font-size: 14px;
		color: #F00;
		text-decoration: blink;
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 5px 10px;
		border-top:1px solid rgba(255, 255, 255, 1);
		border-radius:0px 0px 20px 0px;
}
\ No newline at end of file
+@charset "UTF-8";
@import url("../fonts/stylesheet.css");
/* CSS Document */
body{
		text-align: left;
		background-color: #FFF;
}
/*•••••••••••••• couvercle et trou ••••••••••••*/

#trou{
		position: relative;
		margin-right: 50%;
		margin-left: 50%;
		left: -1050px;
		top: -10px;
		width: 1920px;
		height: 1170px;
		z-index: 1;
		background-attachment: scroll;
		background-image: url(../images/trou.jpg);
		background-repeat: no-repeat;
}


#couvercle{
		position: relative;
		margin-right: auto;
		margin-left: auto;
		left: -276px;
		top: -130px;
		width: 676px;
		height: 676px;
		z-index: 1;
		background: url(../images/Couvercle_complet.png) 0 0 no-repeat scroll;
		background-repeat: no-repeat;
		background-image: url(../images/Couvercle_complet.png);
		-webkit-transition: all 0.5s ease-in-out;
		-moz-transition: all 0.5s ease-in-out;
		
		
	}
#couvercle:hover{
		left: -400px;
		top: -100px;
/*		-webkit-transform: rotate(-5deg)*/
		
		 }
		

		 
/*•••••••••••••• boutons ••••••••••••*/

#TousLesBoutons{
	left: 937px;
	top: -608px;
	z-index: 6;
	position: relative;
	width: 350px;
	height: 500px;
	}	 

#Btn_FirstVisit, #Btn_Rules, #Btn_Login, #Btn_Register, #Btn_Contact{
		background: url(../images/bouton_off.png) 0 0 no-repeat scroll;
		z-index: 6;
		position: relative;
		width: 40px;
		height: 40px;
	}
		
#Btn_FirstVisit:hover, #Btn_Rules:hover, #Btn_Login:hover, #Btn_Register:hover, #Btn_Contact:hover{
		background: url(../images/bouton_over.png) 0 0 no-repeat scroll;
	}
	
#Btn_EnterLogin, #Btn_EnterPassword{
	left: 90px;
	z-index: 6;
	position: relative;
	width: 230px;
	height: 25px;
	background-color: rgba(0, 0, 0, 1);
	border-radius:5px 0px 10px 5px;
	padding: 1px 0px 0px 15px;
	border:none;

	}
	#Btn_EnterLogin:hover, #Btn_EnterPassword:hover{
	background-color: rgba(66, 66, 66, 1);

	
	}




#Btn_EnterLogin, #Btn_EnterPassword{
		font-family: orbitronbold;
		font-size: 10px;
		text-align: left;
	}
	
.PlaceHolder {
	  color: #0CF; 
	}

/*••••••••••••••••••••••••••• positionnement des boutons ••••••••••••••••••*/

#Btn_FirstVisit{
		left: 83px;
		top: 0px;	
	}

#Btn_Rules{
		left: 92px;
		top: 13px;		
	}

#Btn_EnterLogin{
		top: 35px;
		
	}

#Btn_EnterPassword{
		
		top: 45px;
	}

#Btn_Login{
		left: 83px;
		top: 75px;
		border: none;
	}

#Btn_Register{
		left: 62px;
		top: 95px;
		display: block;
	}

#Btn_Contact{
		left: 30px;
		top: 112px;
		display: block;
	}
	


	
#Logo_CDPP{
	width: 209px;
	height: 144px;
	display: block;
	top: -70px;
	left:400px;
	z-index: 50;
	position: absolute;
	background: url(../images/Logo_CDPP_off.png) 0 0 no-repeat scroll;
	}
#Logo_CDPP:hover{
	background: url(../images/Logo_CDPP_over.png) 0 0 no-repeat scroll;
	z-index: 100;
}	

#Logos_partenaires{
	margin-right: auto;
	margin-left: auto;
	left:15%;
	right:10%;
	width: 1500px;
	height: 42px;
	bottom: 50px;
	z-index: 50;
	position: fixed;
	background: url(../images/LogosPartenaires.png) 0px 0px no-repeat scroll;				
}
#PaveGuest{
		font-family: orbitronbold;
		font-size: 15px;
		color: rgba(0, 0, 42, 0.3);
		left: 350px;
		top: -178px;
		width: 300px;
		height: 30px;
		z-index: 100;
		padding:20px 20px 20px 20px;
		position: relative;
		background-color: rgba(255, 255, 255, 0);
		border-radius:0px 30px 0px 30px;	
}
#TitrePaveGuest{
		font-family: orbitronlight;
		font-size: 17px;
		color: rgba(0, 0, 0, 0.3);
		background-color: rgba(255, 100, 255, 0);
		margin-top:20px;
}
#TextePaveGuest{
		font-family: orbitronlight;
		font-size: 14px;
		color: rgba(0, 0, 0, 0.5);
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 2px 5px;
		border-radius:0px 0px 20px 0px;
}
/* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/

#PaveAnnoucements{
		font-family: orbitronbold;
		font-size: 30px;
		color: rgba(0, 0, 42, 0.3);
		left: 300px;
		top: -100px;
		width: 300px;
		height: 300px;
		z-index: 100;
		padding:20px 20px 20px 20px;
		position: relative;
		background-color: rgba(255, 255, 255, 0);
		border-radius:0px 30px 0px 30px;
}
#TitrePaveAnnoucement{
		font-family: orbitronlight;
		font-size: 35px;
		color: rgba(0, 0, 0, 0.2);
		background-color: rgba(255, 100, 255, 0);
		margin-top:20px;
}
#DateAnnoucement{
		font-family: orbitronbold;
		font-size: 12px;
		color: rgba(163, 224, 255, 1);
		background-color: rgba(0, 0, 0, 1);
		padding:4px 5px 2px 5px;
		border-radius:3px 3px 3px 3px;
		width: 200px;
}
#DateAnnoucementRed{
		font-family: orbitronbold;
		font-size: 12px;
		color: #F00;
		background-color: rgba(0, 0, 0, 1);
		padding:4px 5px 2px 5px;
		border-radius:3px 3px 3px 3px;
		width: 100px;
}
#TexteAnnoucement{
		font-family: orbitronlight;
		font-size: 12px;
		color: rgba(0, 0, 0, 0.5);
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 5px 10px;
		border-top:1px solid rgba(255, 255, 255, 1);
		border-radius:0px 0px 20px 0px;
}
#TexteAnnoucementRed{
		font-family: orbitronbold;
		font-size: 14px;
		color: #F00;
		text-decoration: blink;
		background-color: rgba(255, 255, 255, 0.2);
		padding:5px 10px 5px 10px;
		border-top:1px solid rgba(255, 255, 255, 1);
		border-radius:0px 0px 20px 0px;
}
\ No newline at end of file
diff --git a/php/config.php b/php/config.php
index f67ba56..c78419c 100644
--- a/php/config.php
+++ b/php/config.php
@@ -85,6 +85,7 @@ define('IMPEX_INTERVAL_LIMIT', 86400); // one day for impex request
 define('USERPATH', IHM_SRC_DIR . 'data/');
 
 // Shared dir
+
 define('SHAREDPATH', IHM_SRC_DIR . 'shared_data/');
 
 // AKKA - KERNELBIN is now the new kernel bin dir
diff --git a/php/my_config.php b/php/my_config.php
index e98a3d7..2e8eb6f 100644
--- a/php/my_config.php
+++ b/php/my_config.php
@@ -3,18 +3,18 @@
  * @file my_config.php
  * @version $Id: my_config.php 2372 2014-05-21 09:38:38Z myriam $
  *
+ *
  */
 
 //AKKA - Path to AMDA_Integration base dir
-define('INTEGRATION_BASE_PATH', '/home/myriam/AMDA_20161215/AMDA_Integration/');
+define('INTEGRATION_BASE_PATH', '/home/myriam/AMDA_20170601/AMDA_Integration/');
 
 require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php');
-
-define('CEFLIB', '/opt/local/cef/lib');
+ 
+define('CEFLIB', '/usr/local/cef/lib');
 define('CDFLIB', '/opt/local/lib');
-
 define('SYS_LIBS', '/lib:/usr/lib:/usr/local/lib64');
-define('SYS_BIN',  '/bin:/usr/bin/:/usr/local/bin/');
+define('SYS_BIN','/bin:/usr/bin/:/usr/local/bin/');
 
 //AKKA - For compatibility with IHM
 define('BASE_PATH', IHM_SRC_DIR);
@@ -27,10 +27,9 @@ define('log', IHM_SRC_DIR.'LOG');
 // User apache
 define('APACHE_USER', 'apache');
 // Alias for name of AMDA
-
 define('APACHE_ALIAS', '/');
 //email to send errors from AmdaUpdate/AmdaInstall
-define('email','ebudnik@irap.omp.eu');
+define('email','mbouchemit@irap.omp.eu');
 
 //DDPATH
 define('DDBIN','/opt/local/bin/');
@@ -39,8 +38,8 @@ define('DDLIB','/opt/local/lib/');
 // for updateAmda
 define('DD_WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl');
 
-//define('DD_WSDL','http://apus.irap.omp.eu/NEWAMDA/DDService/dd.wsdl');
-define('TITLE', 'AMDANEW-Test');
+define('TITLE', 'AMDADEV-Test');
+$SERVER_NAME = "amdadev.irap.omp.eu";
 
 // real upload_max_filesize is defined in /etc/php.ini : ini_get('upload_max_filesize')
 // here for additional flexibility
diff --git a/public/wsdl/Methods_AMDA.wsdl b/public/wsdl/Methods_AMDA.wsdl
index 19e92a0..b693095 100644
--- a/public/wsdl/Methods_AMDA.wsdl
+++ b/public/wsdl/Methods_AMDA.wsdl
@@ -1378,7 +1378,7 @@ of a set of typically orthogonal axes.
 
     <wsdl:service name="Methods_AMDA">
         <wsdl:port name="Methods_AMDAPort" binding="tns:Methods_AMDASoapBinding">
-            <soap:address location="http://amdadev.irap.op.eu/php/AMDA_METHODS_WSDL.php"/>
+            <soap:address location="http://amdadev.irap.omp.eu/php/AMDA_METHODS_WSDL.php"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
diff --git a/update_amda/updateEnv.sh b/update_amda/updateEnv.sh
index ad225aa..021f3dd 100644
--- a/update_amda/updateEnv.sh
+++ b/update_amda/updateEnv.sh
@@ -1,30 +1,30 @@
 #!/bin/bash
 
- export AMDA_SPASE_INTERFACE=/home/budnik/AMDA_SPASE_INTERFACE/
+ export AMDA_SPASE_INTERFACE=/home/myriam/AMDA_20170601/AMDA_SPASE_INTERFACE/
  if [[ ${AMDA_SPASE_INTERFACE: -1} != "/" ]]; then
 	export AMDA_SPASE_INTERFACE=$AMDA_SPASE_INTERFACE/
  fi
  
  # info dirs will be written here
- export NEWMETA=/home/budnik/NEWMETA/
+ export NEWMETA=/home/myriam/AMDA_20170601/NEWMETA/
  if [[ ${NEWMETA: -1} != "/" ]]; then
 	export NEWMETA=$NEWMETA/
  fi
  
  # AMDA internal parameter XMLs  
- export AMDAINTERNALDIR=/home/budnik/AMDA_INTERNAL_METADATA/
+ export AMDAINTERNALDIR=/home/myriam/AMDA_20170601/AMDA_INTERNAL_METADATA/
  if [[ ${AMDAINTERNALDIR: -1} != "/" ]]; then
 	export AMDAINTERNALDIR=$AMDAINTERNALDIR/
  fi
  
  # AMDA Installation
- export AMDAINSTALLATION=/home/budnik/AMDA
+ export AMDAINSTALLATION=/home/myriam/AMDA_20170601
  # DD Installation
  export DDROOT=/opt/local
  # GCC Installation
  export GCCROOT=/opt/tools/gcc/4.7.2/rtf
  #AMDA_Kernel build type to use for paraminfo generation
- export BUILD_TYPE=Debug
+ export BUILD_TYPE=Release
  
  export AMDA_IHM=$AMDAINSTALLATION/AMDA_IHM
  export LD_LIBRARY_PATH=$GCCROOT/lib64:$GCCROOT/lib:$DDROOT/lib
--
libgit2 0.21.2