Changeset 551
- Timestamp:
- 09/17/12 11:07:20 (12 years ago)
- Location:
- geisa
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
geisa/persistence/implementation/hibernate.cfg.xml
r533 r551 22 22 <prop key="hibernate.connection.driver_class">com.mysql.jdbc.Driver</prop> 23 23 <prop key="hibernate.connection.url">jdbc:mysql://localhost/geisa</prop> 24 <!-- en local--> 24 25 <prop key="hibernate.connection.username">root</prop> 26 <!-- sur naboo --> 27 <!-- <prop key="hibernate.connection.username">geisa</prop>--> 25 28 <prop key="hibernate.connection.password">geisa11</prop> 26 29 <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop> -
geisa/web/initGeisa.jsp
r548 r551 115 115 <div id="specTrans" class="specTrans"> 116 116 <div id="spectralRange" class="spectralRange"> 117 <fieldset><legend><b>Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> :</b></legend> 117 <!--<fieldset><legend><b>Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> :</b></legend>--> 118 <fieldset><legend><b><div id="spectralRangeTitre"></div></b></legend> 119 118 120 <div id="spectralRangeLower" class="spectralRangeLower"></div> 119 121 <div id="spectralRangeUpper" class="spectralRangeUpper"></div> -
geisa/web/initGeisa_script.jsp
r548 r551 496 496 497 497 //Zone texte SpectralRange 498 //Titre général (qui changera en fonction de la base geisa choisie) 499 document.getElementById('spectralRangeTitre').innerHTML = ""; 500 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup>"; 501 498 502 //Titre 499 503 var titleSpectralRangeLower = document.createTextNode("Lower Bound :"); … … 865 869 switch (this.selectDatabase.getValue()) { 866 870 case 'GEISA2003': 867 //paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-diroutEEE"+this.LongPathImages+"EEE-fileinEEE"+this.pathProcess+"line_GEISA2003_asc_gs03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISA2003EEE-database_typeEEEgs03"; 868 paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-fileinEEE"+this.pathProcess+"line_GEISA2003_asc_gs03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISA2003EEE-database_typeEEEgs03"; 871 paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+" -filein "+this.pathProcess+"line_GEISA2003_asc_gs03_v1.0 -input_format asc -database_name GEISA2003 -database_type gs03"; 869 872 break; 870 873 case 'GEISA2011': 871 paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-diroutEEE"+this.LongPathImages+"EEE-fileinEEE"+this.pathProcess+"line_GEISA2009_binEEE-database_nameEEEGEISA2011EEE-database_typeEEEgs08"; 872 //paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-fileinEEE"+this.pathProcess+"line_GEISA2009_binEEE-database_nameEEEGEISA2011EEE-database_typeEEEgs08"; 874 paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+" -filein "+this.pathProcess+"line_GEISA2009_bin -database_name GEISA2011 -database_type gs08"; 873 875 break; 874 876 case 'GEISAIASI2003': 875 paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-diroutEEE"+this.LongPathImages+"EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2003_asc_gsi03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISAIASI2003EEE-database_typeEEEgsi03"; 876 //paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2003_asc_gsi03_v1.0EEE-input_formatEEEascEEE-database_nameEEEGEISAIASI2003EEE-database_typeEEEgsi03"; 877 paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+" -filein "+this.pathProcess+"line_GEISAIASI2003_asc_gsi03_v1.0 -input_format asc -database_name GEISAIASI2003 -database_type gsi03"; 877 878 break; 878 879 case 'GEISAIASI2011': 879 paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-diroutEEE"+this.LongPathImages+"EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI2011EEE-database_typeEEEgsi08"; 880 //paramBase = "EEE-dirinEEE"+this.pathProcess+"EEE-fileinEEE"+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0EEE-database_nameEEEGEISAIASI2011EEE-database_typeEEEgsi08"; 880 paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+" -filein "+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0 -database_name GEISAIASI2011 -database_type gsi08"; 881 881 break; 882 882 } … … 904 904 var molN=input.value; 905 905 var molN1=molN.replace("_", ":"); 906 // exemple : -moleisot EEEh2o:161EEE-moleisotEEEh2o:162EEE-moleisotEEEco2:626EEE-moleisotEEEco2:627EEE-moleisotEEEo3:666EEE-moleisotEEEo3:668907 isotopesSelectedName = isotopesSelectedName+"-moleisot EEE"+molN1+"EEE";906 // exemple : -moleisot h2o:161 -moleisot h2o:162 -moleisot co2:626 -moleisot co2:627 -moleisot o3:666 -moleisot o3:668 907 isotopesSelectedName = isotopesSelectedName+"-moleisot "+molN1+" "; 908 908 } 909 909 //récupération du nombre de molécules sélectionnées … … 929 929 switch (this.SelectNbCourbes.getValue()) { 930 930 case 'cm': 931 nbCourbes = "-separate_mol EEE-same_graphEEE";931 nbCourbes = "-separate_mol -same_graph "; 932 932 this.nbGraph = 1; 933 933 this.nbCourbe = this.nbMolecules; … … 938 938 break; 939 939 case 'ci': 940 nbCourbes = "-separate_iso EEE-same_graphEEE";940 nbCourbes = "-separate_iso -same_graph "; 941 941 this.nbGraph = 1; 942 942 this.nbCourbe = this.nbIsotopes; … … 947 947 break; 948 948 case 'gm': 949 nbCourbes = "-separate_mol EEE";949 nbCourbes = "-separate_mol "; 950 950 this.nbGraph = this.nbMolecules; 951 951 if (this.nbGraph > 20) { … … 955 955 break; 956 956 case 'gi': 957 nbCourbes = "-separate_iso EEE";957 nbCourbes = "-separate_iso "; 958 958 this.nbGraph = this.nbIsotopes; 959 959 if (this.nbGraph > 20) { … … 970 970 971 971 //Spectral range 972 var rangeLower="-wavenb_min EEE"+$("#RangeLower").val();973 var rangeUpper="-wavenb_max EEE"+$("#RangeUpper").val();972 var rangeLower="-wavenb_min "+$("#RangeLower").val(); 973 var rangeUpper="-wavenb_max "+$("#RangeUpper").val(); 974 974 975 975 //controle des valeurs entrées par l'utilisateur 976 //isNaN = n'est pas un nombre 977 if(isNaN($("#RangeLower").val()) == true || $("#RangeLower").val() < 0 ) 978 { 979 alert("Error: Invalid value for lower spectral range area"); 980 return; 981 } 976 977 switch (this.selectDatabase.getValue()) { 978 case 'GEISA2003': 979 //isNaN = n'est pas un nombre 980 if(isNaN($("#RangeLower").val()) == true || parseInt($("#RangeLower").val()) < 0 || parseInt($("#RangeLower").val()) > 35877.030506) 981 { 982 alert("Error: Invalid value for lower spectral range area"); 983 return; 984 } 985 986 if(isNaN($("#RangeUpper").val()) == true || parseInt( $("#RangeUpper").val()) == 0 || parseInt( $("#RangeUpper").val()) < 0 || parseInt($("#RangeUpper").val()) > 35877.030506) 987 { 988 alert("Error: Invalid value for upper spectral range area"); 989 return; 990 } 991 break; 992 case 'GEISA2011': 993 //isNaN = n'est pas un nombre 994 if(isNaN($("#RangeLower").val()) == true || parseInt($("#RangeLower").val()) < 0 || parseInt($("#RangeLower").val()) > 35877.030506) 995 { 996 alert("Error: Invalid value for lower spectral range area"); 997 return; 998 } 999 1000 if(isNaN($("#RangeUpper").val()) == true || parseInt( $("#RangeUpper").val()) == 0 || parseInt( $("#RangeUpper").val()) < 0 || parseInt($("#RangeUpper").val()) > 35877.030506) 1001 { 1002 alert("Error: Invalid value for upper spectral range area"); 1003 return; 1004 } 1005 break; 1006 case 'GEISAIASI2003': 1007 //isNaN = n'est pas un nombre 1008 if(isNaN($("#RangeLower").val()) == true || parseInt($("#RangeLower").val()) < 0 || parseInt($("#RangeLower").val()) < 599.000793 || parseInt($("#RangeLower").val()) > 3000.998767) 1009 { 1010 alert("Error: Invalid value for lower spectral range area"); 1011 return; 1012 } 1013 1014 if(isNaN($("#RangeUpper").val()) == true || parseInt( $("#RangeUpper").val()) == 0 || parseInt( $("#RangeUpper").val()) < 0 || parseInt($("#RangeUpper").val()) < 599.000793 || parseInt($("#RangeUpper").val()) > 3000.998767) 1015 { 1016 alert("Error: Invalid value for upper spectral range area"); 1017 return; 1018 } 1019 break; 1020 case 'GEISAIASI2011': 1021 //isNaN = n'est pas un nombre 1022 if(isNaN($("#RangeLower").val()) == true || parseInt($("#RangeLower").val()) < 0 || parseInt($("#RangeLower").val()) < 599.000793 || parseInt($("#RangeLower").val()) > 3000.998767) 1023 { 1024 alert("Error: Invalid value for lower spectral range area"); 1025 return; 1026 } 1027 1028 if(isNaN($("#RangeUpper").val()) == true || parseInt( $("#RangeUpper").val()) == 0 || parseInt( $("#RangeUpper").val()) < 0 || parseInt($("#RangeUpper").val()) < 599.000793 || parseInt($("#RangeUpper").val()) > 3000.998767) 1029 { 1030 alert("Error: Invalid value for upper spectral range area"); 1031 return; 1032 } 1033 break; 1034 } 1035 1036 982 1037 if ($("#RangeLower").val() == "" ) 983 1038 { 984 1039 rangeLower=""; 985 1040 } 986 if(isNaN($("#RangeUpper").val()) == true || parseInt( $("#RangeUpper").val()) < 0 || parseInt($("#RangeUpper").val()) > 35877.030506) 987 { 988 alert("Error: Invalid value for upper spectral range area"); 989 return; 990 } 1041 991 1042 if ($("#RangeUpper").val() == "" ) 992 1043 { … … 1000 1051 1001 1052 1002 1053 //Transitions to do 1003 1054 //exemple de requete avec transition 1004 //./all -filein line_GEISA2009_bin -moleisot h2o:161 -wavenb_min 1 -wavenb_max 1000 -database_name "GEISA2011" -vib_ident_lower '[000]' 1005 //var TransitionUpper ="-vib_ident_upperEEE'[EEE"+this.selectTransitionUpper.getValue()+"EEE]'"; 1006 1007 var TransitionUp=document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value; 1008 //Enlever les espaces blancs 1055 //./all -filein line_GEISA2009_bin -moleisot h2o:161 -wavenb_min 1 -wavenb_max 1000 -database_name "GEISA2011" -vib_ident_lower '[000]' 1056 //var TransitionUpper ="-vib_ident_upper '[ "+this.selectTransitionUpper.getValue()+" ]'"; 1057 var TransitionUp=document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value; 1058 //Enlever les espaces blancs 1009 1059 TransitionUp= TransitionUp.replace(/ /g,""); 1010 var TransitionUpper ="-vib_ident_upperEEE["+TransitionUp+"]"; 1011 // var TransitionUpper ="-vib_ident_upperEEE'["+document.getElementById('transition1').options[document.getElementById('transition1').selectedIndex].value+"]'"; 1012 // var TransitionLower ="-vib_ident_lowerEEE'[EEE"+this.selectTransitionLower.getValue()+"EEE]'"; 1013 1014 1060 var TransitionUpper ="-vib_ident_upper ["+TransitionUp+"]"; 1061 1062 // var TransitionLower ="-vib_ident_lower '[ "+this.selectTransitionLower.getValue()+" ]'"; 1015 1063 var TransitionLo=document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value; 1016 1064 TransitionLo= TransitionLo.replace(/ /g,""); 1017 var TransitionLower ="-vib_ident_lower EEE["+TransitionLo+"]";1018 // var TransitionLower ="-vib_ident_lowerEEE'["+document.getElementById('transition2').options[document.getElementById('transition2').selectedIndex].value+"]'"; 1019 //pas de transition sélectionnée1065 var TransitionLower ="-vib_ident_lower ["+TransitionLo+"]"; 1066 1067 //pas de transition sélectionnée 1020 1068 // if (( this.selectTransitionUpper.getValue()== -1) || (this.selectTransitionUpper.getValue() == "transition" )) 1021 1069 // { … … 1041 1089 1042 1090 //Intensity range 1043 var intensityLower="-int_min EEE"+$("#intensityLo").val();1044 var intensityUpper="-int_max EEE"+$("#intensityUp").val();1091 var intensityLower="-int_min "+$("#intensityLo").val(); 1092 var intensityUpper="-int_max "+$("#intensityUp").val(); 1045 1093 1046 1094 //controle des valeurs entrées par l'utilisateur … … 1074 1122 1075 1123 //Valeur de mean value 1076 var meanValue = "-step EEE"+$("#meanValue2").val();1124 var meanValue = "-step "+$("#meanValue2").val(); 1077 1125 //controle des valeurs entrées par l'utilisateur 1078 1126 //Si ce n'est pas un nombre ou si il est négatif … … 1089 1137 1090 1138 //sélection du premier choix pour l'axe des Y 1091 var field="-field EEE"+this.selectTraceAxeY1.getValue();1139 var field="-field "+this.selectTraceAxeY1.getValue(); 1092 1140 1093 1141 … … 1103 1151 1104 1152 //sélection du type de tracé pour Y1 1105 var lineType="-line_type EEE"+this.selectTypeTraceY1.getValue();1153 var lineType="-line_type "+this.selectTypeTraceY1.getValue(); 1106 1154 1107 1155 … … 1113 1161 else 1114 1162 { 1115 var field2 = "-field2 EEE"+this.selectTraceAxeY2.getValue();1163 var field2 = "-field2 "+this.selectTraceAxeY2.getValue(); 1116 1164 } 1117 1165 … … 1134 1182 else 1135 1183 { 1136 var lineType2 = "-line_type2 EEE"+this.selectTypeTraceY2.getValue();1184 var lineType2 = "-line_type2 "+this.selectTypeTraceY2.getValue(); 1137 1185 } 1138 1186 … … 1145 1193 1146 1194 //construction de la requête Fortran 1147 var parameters = "&fortranRequest="+paramBase+"EEE"+isotopesSelectedName+"EEE"+rangeLower+"EEE"+rangeUpper+"EEE"+TransitionUpper+"EEE"+TransitionLower+"EEE"+intensityLower+"EEE"+intensityUpper+"EEE"+ 1148 meanValue+"EEE"+nbCourbes+"EEE"+field+"EEE"+logScale+"EEE"+lineType+"EEE"+field2+"EEE"+logScale2+"EEE"+lineType2; 1149 1150 // var chaine=" 111 25 3 6 "; 1151 // alert("chaine1="+chaine); 1152 // chaine=chaine.replace(/ /g,"EEE"); 1153 // alert("chaine2="+chaine); 1195 var parameters = "&fortranRequest="+paramBase+" "+isotopesSelectedName+" "+rangeLower+" "+rangeUpper+" "+TransitionUpper+" "+TransitionLower+" "+intensityLower+" "+intensityUpper+" "+ 1196 meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2; 1197 1198 1199 //remplacement de espace par "EEE" pour que le shell script ne voit qu'un seul argument en entrée 1154 1200 parameters=parameters.replace(/ /g,"EEE"); 1155 //alert(parameters);1201 alert(parameters); 1156 1202 1157 1203 //envoie de la requête au controller … … 1516 1562 1517 1563 1518 //affichage d u bloc des molecules en fonction de la base de donnees selectionnee1564 //affichage de la valeur du spectral range et affichage du bloc des molecules en fonction de la base de donnees selectionnee 1519 1565 onClickSelectDatabase: function(value) 1520 1566 { … … 1522 1568 if ('GEISA2011' == value) 1523 1569 { 1570 document.getElementById('spectralRangeTitre').innerHTML = ""; 1571 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup>"; 1572 $("#RangeLower").val(0); 1573 $("#RangeUpper").val(35877.030506); 1574 1524 1575 document.getElementById( "BDD-GEISA2011" ).style.display = ""; 1525 1576 document.getElementById( "BDD-GEISAIASI2011" ).style.display = "none"; … … 1530 1581 if ('GEISAIASI2011' == value) 1531 1582 { 1583 document.getElementById('spectralRangeTitre').innerHTML = ""; 1584 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>)"; 1585 $("#RangeLower").val(599.000793); 1586 $("#RangeUpper").val(3000.998767); 1587 1532 1588 document.getElementById( "BDD-GEISA2011" ).style.display = "none"; 1533 1589 document.getElementById( "BDD-GEISAIASI2011" ).style.display = ""; … … 1538 1594 if ('GEISA2003' == value) 1539 1595 { 1596 document.getElementById('spectralRangeTitre').innerHTML = ""; 1597 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup>"; 1598 $("#RangeLower").val(0); 1599 $("#RangeUpper").val(35877.030506); 1600 1540 1601 document.getElementById( "BDD-GEISA2011" ).style.display = "none"; 1541 1602 document.getElementById( "BDD-GEISAIASI2011" ).style.display = "none"; … … 1545 1606 if ('GEISAIASI2003' == value) 1546 1607 { 1608 document.getElementById('spectralRangeTitre').innerHTML = ""; 1609 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>)"; 1610 $("#RangeLower").val(599.000793); 1611 $("#RangeUpper").val(3000.998767); 1612 1547 1613 document.getElementById( "BDD-GEISA2011" ).style.display = "none"; 1548 1614 document.getElementById( "BDD-GEISAIASI2011" ).style.display = "none"; -
geisa/web/src/com/ether/Controller.java
r542 r551 208 208 public static final String PATH_IMAGES = "resources/images/graphGeisa/"; 209 209 public static final String LONG_PATH_IMAGES = "/home_local/npipsl/workspaces/GEISA/web/resources/images/graphGeisa/"; 210 // naboo 211 // public static final String LONG_PATH_IMAGES = "/usr/local/apache-tomcat/webapps/geisa/resources/images/graphGeisa/"; 210 212 public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/"; 213 //naboo 214 // public static final String PATH_PROCESS = "/home/www/GEISA/"; 211 215 private static final String VIEW_INIT = "init"; 212 216 private static final String VIEW_INIT2 = "initGeisa";
Note: See TracChangeset
for help on using the changeset viewer.