Changeset 666 for geisa/web/initGeisa_script.jsp

Timestamp:

11/07/12 18:19:06 (12 years ago)

Author:

npipsl

Message:

tar et download all

File:

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

geisa/web/initGeisa_script.jsp

@@ -38 +38 @@
                 this.containerDownload = $( "#downloadContainer" );
                 this.containerLoading = $( "#loading" );
+
                 /** *********** VARIABLE *********** **/
+                //on va chercher les chemin déclaré dans le controller
+                this.pathProcess = "<%=Controller.PATH_PROCESS%>";
+                this.LongPathImages = "<%=Controller.LONG_PATH_IMAGES%>";
+
                 <%--this.pathImg = <%=Controller.PATH_IMAGES%>;--%>
 
@@ -986 +991 @@
             requestGeisa: function()
             {
-
-                //on va chercher les chemin déclaré dans le controller
-                this.pathProcess = "<%=Controller.PATH_PROCESS%>";
-                this.LongPathImages = "<%=Controller.LONG_PATH_IMAGES%>";
-
-
+                //temps en ms pour obtenir un nom unique de répertoire
+                //this.dateTime = new Date().getTime();
+                var dateTime = new Date().getTime();
+                this.NomRepFileOut = "graph"+dateTime+"/";
+
+//                var verification = this.verifyBob();
+//                if(verification)
+                // appel ajax
 
                  //sélection du fichier binaire de la base geisa sélectionnée
@@ -997 +1004 @@
                 switch (this.selectDatabase.getValue()) {
                     case 'GEISA2003':
-                        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";
+                        paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein "+this.pathProcess+"line_GEISA2003_asc_gs03_v1.0 -input_format asc -database_name GEISA2003 -database_type gs03";
                         break;
                     case 'GEISA2011':
-                        paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+" -filein "+this.pathProcess+"line_GEISA2009_bin -database_name GEISA2011 -database_type gs08";
+                        paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein "+this.pathProcess+"line_GEISA2009_bin -database_name GEISA2011 -database_type gs08";
                         break;
                     case 'GEISAIASI2003':
-                        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";
+                        paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein "+this.pathProcess+"line_GEISAIASI2003_asc_gsi03_v1.0 -input_format asc -database_name GEISAIASI2003 -database_type gsi03";
                         break;
                     case 'GEISAIASI2011':
-                        paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+" -filein "+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0 -database_name GEISAIASI2011 -database_type gsi08";
+                        paramBase = " -dirin "+this.pathProcess+" -dirout "+this.LongPathImages+this.NomRepFileOut+" -filein "+this.pathProcess+"line_GEISAIASI2011_bin_gsi08_v1.0 -database_name GEISAIASI2011 -database_type gsi08";
                         break;
                 }
@@ -1443 +1450 @@
                             //url: "project?methodName=createUserRequest&"+parameters+"&nbGraph="+ this.nbGraph,
                             //url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph,
-                            url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph+"&nomFichier="+this.nomFichier,
+                            url: "project?methodName=createUserRequest&"+parameters+"&transitionUpper="+ transitionUpper+"&transitionLower="+ transitionLower+"&nbGraph="+ this.nbGraph+"&nomFichier="+this.nomFichier+"&NomRepFileOut="+this.NomRepFileOut,
                             success:jQuery.proxy( this.handleGeisa, this )
                         } );
@@ -1669 +1676 @@
                 //this.nb = jQuery.parseJSON( result ).nb;
                 //this.NomRepFileOut = jQuery.parseJSON( result ).NomRepFileOut;
-                this.NomRepFileOut = jQuery.parseJSON( result ).NomRepFileOut+"image/";
+                //this.NomRepFileOut = jQuery.parseJSON( result ).NomRepFileOut+"image/";
+                 this.NomRepFileOutImage = this.NomRepFileOut+"image/";
 
                 //chemin de l'image
 //                this.pathImg = jQuery.parseJSON( result ).pathImg;
-                this.pathImg = "<%=Controller.PATH_IMAGES%>"+this.NomRepFileOut;
+                this.pathImg = "<%=Controller.PATH_IMAGES%>"+this.NomRepFileOutImage;
 
 
@@ -1679 +1687 @@
                 var i=1;
                 //bouton  Download All
-                var content = "<a href=project?methodName=downloadFile&fileName=" +this.NomRepFileOut + 'GEISA.tar><button class="dataProtocolDownloadButton">Download All</button></a>';
+                var content = "<a href=project?methodName=downloadFile&fileName=" +this.NomRepFileOutImage + "GEISA.tar&fileNameToDisplay=GEISA.tar><button class='dataProtocolDownloadButton'>Download All</button></a>";
                 //tracer chaque graphe avec son bouton  download associé
                 for (i=1; i<this.nbGraph+1; i++) {
                     //content = content + '<img src=' + this.pathImg + "graph" + this.nb +"-"+i+ ".png"+ ' /><a href="project?methodName=downloadFile&fileName='  + "graph" + this.nb+"-"+i + ".png"+ '"><button class="dataProtocolDownloadButton">Download</button></a>';
-                    content = content +'<img src=' + this.pathImg + this.nomFichier +"-"+i+ ".png"+ ' /><a href="project?methodName=downloadFile&fileName=' +this.NomRepFileOut + this.nomFichier+"-"+i + ".png&fileNameToDisplay="+this.nomFichier+ '"><button class="dataProtocolDownloadButton">Download</button></a>';
-               }
+                    content = content +'<img src=' + this.pathImg + this.nomFichier +"-"+i+ ".png"+ ' /><a href="project?methodName=downloadFile&fileName=' +this.NomRepFileOutImage + this.nomFichier+"-"+i + ".png&fileNameToDisplay="+this.nomFichier+"-"+i + ".png"+ '"><button class="dataProtocolDownloadButton">Download</button></a>';
+                }
 
                 this.displayWindow(content);