Changeset 521


Ignore:
Timestamp:
Dec 13, 2007, 5:47:00 PM (14 years ago)
Author:
mbayer
Message:

some minor bug fixes

Location:
branches/uk_ac_ebi_Tab2MageImporter
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/uk_ac_ebi_Tab2MageImporter/html/hybridizations.html

    r511 r521  
    9393  <!-- file upload -->
    9494  <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="">&nbsp;</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&hellip;</td>
     109          </tr>
     110        </table>
     111        </div>
     112        </div>
     113        </td>
     114
     115      </tr>
     116    </table>
     117    </td>
    97118  </tr>
    98119
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/experiment.jsp

    r519 r521  
    44<%@ page import="java.util.*"%>
    55
    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"/>
    77<!-- 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 -->
    88<jsp:setProperty name="inputDataBean" property="*"/>
     
    1414
    1515<link rel="stylesheet" type="text/css" href="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/styles.css" />
     16
    1617
    1718<script type="text/javascript">
     
    7778 %>
    7879 
    79  experiment name = <%=expName %><br>
    80  experiment ID = <%=experimentID %>
    8180
    8281<h2>Tab2MAGE Importer -- Your Experiment</h2>
     
    379378</table>
    380379
    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>
    382386
    383387</form>
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/hybridizations.jsp

    r519 r521  
    44<%@ page import="java.util.*"%>
    55
    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" />
    77<!-- 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 -->
    88<jsp:setProperty name="inputDataBean" property="*" />
     
    209209
    210210  <!-- file upload -->
    211   <tr>
     211  <tr >
    212212    <td class="boldText">Please select the zip file on your local disk that contains the data files for import:</td>
    213 
    214213    <td>
    215     <table border="0" cellspacing="0" cellpadding="0">
    216       <tr>
    217         <td><input type="text" class="text required" name="path" size="50" value="">&nbsp;&nbsp;&nbsp;</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="">&nbsp;</td>
    218218        <td>
     219       
    219220        <div class="buttonclass" onmouseover="this.className='buttonclass_hover';"
    220221          onmouseout="this.className='buttonclass';" onclick="browseOnClick()">
    221222        <div class="buttonclass_inner">
     223       
    222224        <table border="0" cellspacing="0" cellpadding="0">
    223225          <tr>
    224             <td><img src="/base/images/browse.png" border="0"></td>
     226            <td>&nbsp;&nbsp;<img src="/base/images/browse.png" border="0"></td>
    225227            <td>Browse&hellip;</td>
    226228          </tr>
    227229        </table>
     230
    228231        </div>
    229232        </div>
    230233        </td>
    231 
    232234      </tr>
    233235    </table>
    234     </td>
     236  </td>
    235237  </tr>
    236238
     
    246248</table>
    247249
     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
    248257
    249258</form>
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/protocols.jsp

    r519 r521  
    55<%@ page import="java.lang.*"%>
    66
    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" />
    88<!-- 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 -->
    99<jsp:setProperty name="inputDataBean" property="*" />
     
    167167</table>
    168168
    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>
    170175
    171176</form>
  • branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/styles.css

    r513 r521  
    3535  border-style: solid;
    3636  border-width: 1px;
     37  vertical-align: middle;
    3738}
    3839
  • branches/uk_ac_ebi_Tab2MageImporter/src/uk/ac/ebi/nugo/plugins/Tab2MageImporter.java

    r519 r521  
    383383      dc.saveItem(subDir);
    384384     
    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
    392388
    393389      //get the experiment object that our data is meant to be imported into
     
    398394      RawDataType rdt= experiment.getRawDataType(); // experiment platform
    399395
    400 //      String statusp=(String)job.getValue("statusPath");
    401 //      File statusFile=Helper.processFilePath(user,overwrite, sc,statusp);
    402396
    403397        //FILE UNZIP MODULE: unzip the files into user specified directory
     
    414408
    415409      // -- end of file unzip module
     410     
    416411     
    417412      ///////////////////////////////////////////////////////////////////////////////////////////////////
     
    557552     
    558553     
    559       dc.commit();
     554      //dc.commit();
    560555      response.setDone("Import plugin ended successfully");
    561556    }
     
    570565    }
    571566   
    572    
    573 
    574567  }
    575568
  • branches/uk_ac_ebi_Tab2MageImporter/src/uk/ac/ebi/nugo/plugins/Tab2MageWriter.java

    r519 r521  
    315315      t2mFile.setName("tab2mage.txt");
    316316      dc.saveItem(t2mFile);
    317 
    318       if (dc == null)
    319         dc = sc.newDbControl();
    320 
    321317      Writer out = new BufferedWriter(new OutputStreamWriter(t2mFile.getUploadStream(false), "ISO-8859-1"));
    322318
     
    352348      t2mFile.setName("statusReport.txt");
    353349      dc.saveItem(t2mFile);
    354 
    355       if (dc == null)
    356         dc = sc.newDbControl();
    357 
    358350      Writer out = new BufferedWriter(new OutputStreamWriter(t2mFile.getUploadStream(false), "ISO-8859-1"));
    359351
Note: See TracChangeset for help on using the changeset viewer.