Changeset 521
- Timestamp:
- Dec 13, 2007, 5:47:00 PM (15 years ago)
- Location:
- branches/uk_ac_ebi_Tab2MageImporter
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/uk_ac_ebi_Tab2MageImporter/html/hybridizations.html
r511 r521 93 93 <!-- file upload --> 94 94 <tr> 95 <td class="boldText">Please select the zip file on your local disk that contains the data files for import:</td> 96 <td class="input"><INPUT type="file" name="parameter:zipFile" size="50"></td> 95 <td class="boldText">Please select the zip file on your local disk that contains the data files for import:</td> 96 97 <td> 98 <table border="0" cellspacing="0" cellpadding="0" class="noBorder"> 99 <tr class="noBorder"> 100 <td><input type="text" class="text required" name="path" size="50" value=""> </td> 101 <td> 102 <div class="buttonclass" onmouseover="this.className='buttonclass_hover';" 103 onmouseout="this.className='buttonclass';" onclick="browseOnClick()"> 104 <div class="buttonclass_inner"> 105 <table border="0" cellspacing="0" cellpadding="0"> 106 <tr> 107 <td><img src="browse.png" border="0"></td> 108 <td>Browse…</td> 109 </tr> 110 </table> 111 </div> 112 </div> 113 </td> 114 115 </tr> 116 </table> 117 </td> 97 118 </tr> 98 119 -
branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/experiment.jsp
r519 r521 4 4 <%@ page import="java.util.*"%> 5 5 6 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope=" application"/>6 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session"/> 7 7 <!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name --> 8 8 <jsp:setProperty name="inputDataBean" property="*"/> … … 14 14 15 15 <link rel="stylesheet" type="text/css" href="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/styles.css" /> 16 16 17 17 18 <script type="text/javascript"> … … 77 78 %> 78 79 79 experiment name = <%=expName %><br>80 experiment ID = <%=experimentID %>81 80 82 81 <h2>Tab2MAGE Importer -- Your Experiment</h2> … … 379 378 </table> 380 379 381 380 <table align="center"> 381 <tr> 382 <td id="next" width="50%"><div class="buttonclass" onmouseover="this.className='buttonclass_hover';" onmouseout="this.className='buttonclass';" onclick="submit();"><div class="buttonclass_inner"><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="/base/images/gonext.gif" border="0"></td><td>Continue</td></tr></table></div></div></td> 383 <td id="close" width="50%"><div class="buttonclass" onmouseover="this.className='buttonclass_hover';" onmouseout="this.className='buttonclass';" onclick="window.close();"><div class="buttonclass_inner"><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="/base/images/cancel.gif" border="0"></td><td>Cancel</td></tr></table></div></div></td> 384 </tr> 385 </table> 382 386 383 387 </form> -
branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/hybridizations.jsp
r519 r521 4 4 <%@ page import="java.util.*"%> 5 5 6 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope=" application" />6 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session" /> 7 7 <!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name --> 8 8 <jsp:setProperty name="inputDataBean" property="*" /> … … 209 209 210 210 <!-- file upload --> 211 <tr >211 <tr > 212 212 <td class="boldText">Please select the zip file on your local disk that contains the data files for import:</td> 213 214 213 <td> 215 <table border="0" cellspacing="0" cellpadding="0"> 216 <tr> 217 <td><input type="text" class="text required" name="path" size="50" value=""> </td> 214 215 <table class="noBorder" border="0" cellspacing="0" cellpadding="0"> 216 <tr class="noBorder"> 217 <td><input type="text" class="text required" name="path" size="50" value=""> </td> 218 218 <td> 219 219 220 <div class="buttonclass" onmouseover="this.className='buttonclass_hover';" 220 221 onmouseout="this.className='buttonclass';" onclick="browseOnClick()"> 221 222 <div class="buttonclass_inner"> 223 222 224 <table border="0" cellspacing="0" cellpadding="0"> 223 225 <tr> 224 <td> <img src="/base/images/browse.png" border="0"></td>226 <td> <img src="/base/images/browse.png" border="0"></td> 225 227 <td>Browse…</td> 226 228 </tr> 227 229 </table> 230 228 231 </div> 229 232 </div> 230 233 </td> 231 232 234 </tr> 233 235 </table> 234 236 </td> 235 237 </tr> 236 238 … … 246 248 </table> 247 249 250 <table align="center"> 251 <tr> 252 <td id="next" width="50%"><div class="buttonclass" onmouseover="this.className='buttonclass_hover';" onmouseout="this.className='buttonclass';" onclick="submit();"><div class="buttonclass_inner"><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="/base/images/gonext.gif" border="0"></td><td>Submit</td></tr></table></div></div></td> 253 <td id="close" width="50%"><div class="buttonclass" onmouseover="this.className='buttonclass_hover';" onmouseout="this.className='buttonclass';" onclick="window.close();"><div class="buttonclass_inner"><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="/base/images/cancel.gif" border="0"></td><td>Cancel</td></tr></table></div></div></td> 254 </tr> 255 </table> 256 248 257 249 258 </form> -
branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/protocols.jsp
r519 r521 5 5 <%@ page import="java.lang.*"%> 6 6 7 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope=" application" />7 <jsp:useBean id="inputDataBean" class="uk.ac.ebi.nugo.plugins.DataBean" scope="session" /> 8 8 <!-- submits the form data back to the bean assuming that each form element is matched to a variable in the bean by the same name --> 9 9 <jsp:setProperty name="inputDataBean" property="*" /> … … 167 167 </table> 168 168 169 169 <table align="center"> 170 <tr> 171 <td id="next" width="50%"><div class="buttonclass" onmouseover="this.className='buttonclass_hover';" onmouseout="this.className='buttonclass';" onclick="submit();"><div class="buttonclass_inner"><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="/base/images/gonext.gif" border="0"></td><td>Continue</td></tr></table></div></div></td> 172 <td id="close" width="50%"><div class="buttonclass" onmouseover="this.className='buttonclass_hover';" onmouseout="this.className='buttonclass';" onclick="window.close();"><div class="buttonclass_inner"><table border="0" cellspacing="0" cellpadding="0"><tr><td><img src="/base/images/cancel.gif" border="0"></td><td>Cancel</td></tr></table></div></div></td> 173 </tr> 174 </table> 170 175 171 176 </form> -
branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/styles.css
r513 r521 35 35 border-style: solid; 36 36 border-width: 1px; 37 vertical-align: middle; 37 38 } 38 39 -
branches/uk_ac_ebi_Tab2MageImporter/src/uk/ac/ebi/nugo/plugins/Tab2MageImporter.java
r519 r521 383 383 dc.saveItem(subDir); 384 384 385 if(dc==null) 386 dc = sc.newDbControl(); 387 388 // String directoryName = (String)job.getValue("directory"); 389 // hostName= (String) job.getValue("emailHost"); 390 // if ((Boolean)job.getValue("overwrite") != null) overwrite = (Boolean)job.getValue("overwrite"); 391 // if ((Boolean)job.getValue("validation") != null) validation = (Boolean)job.getValue("validation"); 385 // if(dc==null) 386 // dc = sc.newDbControl(); 387 392 388 393 389 //get the experiment object that our data is meant to be imported into … … 398 394 RawDataType rdt= experiment.getRawDataType(); // experiment platform 399 395 400 // String statusp=(String)job.getValue("statusPath");401 // File statusFile=Helper.processFilePath(user,overwrite, sc,statusp);402 396 403 397 //FILE UNZIP MODULE: unzip the files into user specified directory … … 414 408 415 409 // -- end of file unzip module 410 416 411 417 412 /////////////////////////////////////////////////////////////////////////////////////////////////// … … 557 552 558 553 559 dc.commit();554 //dc.commit(); 560 555 response.setDone("Import plugin ended successfully"); 561 556 } … … 570 565 } 571 566 572 573 574 567 } 575 568 -
branches/uk_ac_ebi_Tab2MageImporter/src/uk/ac/ebi/nugo/plugins/Tab2MageWriter.java
r519 r521 315 315 t2mFile.setName("tab2mage.txt"); 316 316 dc.saveItem(t2mFile); 317 318 if (dc == null)319 dc = sc.newDbControl();320 321 317 Writer out = new BufferedWriter(new OutputStreamWriter(t2mFile.getUploadStream(false), "ISO-8859-1")); 322 318 … … 352 348 t2mFile.setName("statusReport.txt"); 353 349 dc.saveItem(t2mFile); 354 355 if (dc == null)356 dc = sc.newDbControl();357 358 350 Writer out = new BufferedWriter(new OutputStreamWriter(t2mFile.getUploadStream(false), "ISO-8859-1")); 359 351
Note: See TracChangeset
for help on using the changeset viewer.