Changeset 552 for geisa/web/initGeisa_script.jsp

Timestamp:

09/18/12 12:41:33 (12 years ago)

Author:

npipsl

Message:

transitions

File:

• geisa/web/initGeisa_script.jsp (modified) (4 diffs)

geisa/web/initGeisa_script.jsp

@@ -1055 +1055 @@
                 //./all -filein line_GEISA2009_bin -moleisot h2o:161 -wavenb_min 1 -wavenb_max 1000 -database_name "GEISA2011" -vib_ident_lower '[000]'
                 //var TransitionUpper ="-vib_ident_upper '[ "+this.selectTransitionUpper.getValue()+" ]'";
-                var TransitionUp=document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value;
+                var transitionUpper=document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value;
                 //Enlever les espaces blancs
-                TransitionUp= TransitionUp.replace(/ /g,"");
-                var TransitionUpper ="-vib_ident_upper ["+TransitionUp+"]";
+               // TransitionUp= TransitionUp.replace(/ /g,"");
+               //var TransitionUpper ="-vib_ident_upper ["+TransitionUp+"]";
+                // var transitionUpper = "["+transitionUp+"]";
+                alert ("transitionUpper"+transitionUpper);
 
                 // var TransitionLower ="-vib_ident_lower '[ "+this.selectTransitionLower.getValue()+" ]'";
-                  var TransitionLo=document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value;
-                  TransitionLo= TransitionLo.replace(/ /g,"");
-                  var TransitionLower ="-vib_ident_lower ["+TransitionLo+"]";
+                  var transitionLower=document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value;
+                //  TransitionLo= TransitionLo.replace(/ /g,"");
+                 // var TransitionLower ="-vib_ident_lower ["+TransitionLo+"]";
+                //var transitionLower ="["+transitionLo+"]";
 
                  //pas de transition sélectionnée
@@ -1076 +1079 @@
                   if (( document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == -1) ||  (document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value == "transition" ))
                  {
-                TransitionUpper ="";
+                transitionUpper ="no";
                 }
                  if (( document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == -1) ||  (document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value == "transition" ))
                  {
-                 TransitionLower ="";
+                 transitionLower ="no";
                  }
 
@@ -1193 +1196 @@
 
                 //construction de la requête Fortran
-                var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+TransitionUpper+" "+TransitionLower+" "+intensityLower+" "+intensityUpper+" "+
+               // var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+TransitionUpper+" "+TransitionLower+" "+intensityLower+" "+intensityUpper+" "+
+                                      // meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2;
+
+                var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+intensityLower+" "+intensityUpper+" "+
                                        meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2;
 
@@ -1199 +1205 @@
                 //remplacement de espace par "EEE" pour que le shell script ne voit qu'un seul argument en entrée
                 parameters=parameters.replace(/ /g,"EEE");
-                alert(parameters);
+                transitionUpper=transitionUpper.replace(/ /g,"EEE");
+                //le + est interprété comme un espace (plus sera retransformé en + dans le shell)
+                transitionUpper=transitionUpper.replace(/\+/g,"plus");
+                transitionLower=transitionLower.replace(/ /g,"EEE");
+                transitionLower=transitionLower.replace(/\+/g,"plus");
+
 
                 //envoie de la requête au controller
                 //en cas de succes appel de la fonction "handleGeisa"
                 $.ajax( {
-                            url: "project?methodName=createUserRequest&"+parameters+"&nbGraph="+ this.nbGraph,
+                            //url: "project?methodName=createUserRequest&"+parameters+"&nbGraph="+ this.nbGraph,
+                            url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph,
                             success:jQuery.proxy( this.handleGeisa, this )
                         } );