Changeset 16270

Show
Ignore:
Timestamp:
21/07/08 16:56:40 (1 month ago)
Author:
kmr
Message:

Minor fixes for new export system. Refs #1673.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tickets/ticket-1673/bio/webapp/src/org/intermine/bio/web/export/SequenceHttpExporter.java

    r16265 r16270  
    5757    /** 
    5858     * Method called to export a PagedTable object using the BioJava sequence and feature writers. 
    59      * @param pt exported PagedTable 
    60      * @param request The HTTP request we are processing 
    61      * @param response The HTTP response we are creating 
     59     * {@inheritDoc} 
    6260     */ 
    6361    public void export(PagedTable pt, HttpServletRequest request, HttpServletResponse response, 

  • tickets/ticket-1673/flymine/webapp/src/model.properties

    r14467 r16270  
    2323templateQuery.Gene_Synonyms.category=Genomics 
    2424 
    25 exporter.sequenceExporter.description=Export first visible column in FASTA format 
    26 exporter.gff3Exporter.description=Export in GFF3 format 
    27 exporter.proteinInteractionExporter.description=Export in cytoscape SIF format 
    28 exporter.proteinInteractionViewExporter.description=Open network in cytoscape 
     25exporter.sequence.description=Export first visible column in FASTA format 
     26exporter.gff3.description=Export in GFF3 format 
     27exporter.proteinInteraction.description=Export in cytoscape SIF format 
     28exporter.proteinInteractionView.description=Open network in cytoscape 
    2929 
    3030locatedSequenceFeature.GBrowse.message=Genome browser view (GBrowse) 

  • tickets/ticket-1673/intermine/webapp/main/resources/webapp/WEB-INF/classes/InterMineWebApp.properties

    r16264 r16270  
    329329export.title = Results export page 
    330330export.description = Choose an export format for the results table 
    331 export.tab = customQuery 
     331exportOptions.tab = customQuery 
    332332export.export = Export results 
    333333export.noFollow = true 

  • tickets/ticket-1673/intermine/webapp/main/resources/webapp/WEB-INF/struts-config.xml

    r16265 r16270  
    3232    <form-bean name="widgetForm" type="org.intermine.web.struts.WidgetForm"/> 
    3333    <form-bean name="tabExportForm" type="org.intermine.web.struts.TableExportForm"/> 
    34     <form-bean name="cvsExportForm" type="org.intermine.web.struts.TableExportForm"/> 
     34    <form-bean name="csvExportForm" type="org.intermine.web.struts.TableExportForm"/> 
    3535    <form-bean name="excelExportForm" type="org.intermine.web.struts.TableExportForm"/> 
    3636    <!-- don't (re)move this - it's used for importing any model-specific forms --> 
    …… 
    171171    </action> 
    172172    <action path="/tabExportAction" name="tabExportForm" type="org.intermine.web.struts.TableExportAction" parameter="method"/> 
    173     <action path="/cvsExportAction" name="cvsExportForm" type="org.intermine.web.struts.TableExportAction" parameter="method"/> 
     173    <action path="/csvExportAction" name="csvExportForm" type="org.intermine.web.struts.TableExportAction" parameter="method"/> 
    174174    <action path="/excelExportAction" name="excelExportForm" type="org.intermine.web.struts.TableExportAction" parameter="method"/> 
    175175    <action path="/changeTable" type="org.intermine.web.struts.ChangeTableAction" parameter="method"> 

  • tickets/ticket-1673/intermine/webapp/main/resources/webapp/export.jsp

    r16264 r16270  
    2929 
    3030<c:forEach var="entry" items="${exporters}" varStatus="status"> 
     31  <c:set var="exporterId" value="${entry.key}"/> 
    3132  <c:choose> 
    3233    <c:when test="${empty entry.value}"> 
    33       <span class="nullStrike"><fmt:message key="exporter.${entry.key}.description"/></span><br> 
     34      <span class="nullStrike"><fmt:message key="exporter.${exporterId}.description"/></span><br> 
    3435    </c:when> 
    3536    <c:otherwise> 
    36       <html:link action="/exportOptions?table=${tableName}"> 
    37     <fmt:message key="exporter.${entry.key}.description"/> 
     37      <html:link action="/exportOptions?table=${tableName};type=${exporterId}"> 
     38    <fmt:message key="exporter.${exporterId}.description"/> 
    3839      </html:link><br> 
    3940    </c:otherwise> 

  • tickets/ticket-1673/intermine/webapp/main/resources/webapp/exportOptions.jsp

    r16264 r16270  
    2323  <html:hidden property="table" value="${table}"/> 
    2424  <html:hidden property="type" value="${type}"/> 
     25  <br/> 
    2526  <html:submit property="submit"><fmt:message key="export.submit"/></html:submit> 
    2627</html:form>