[Treebase-guts] SF.net SVN: treebase:[693] trunk/treebase-web/src/main

[<yo...@us...>]

Revision: 693
          http://treebase.svn.sourceforge.net/treebase/?rev=693&view=rev
Author:   youjun
Date:     2010-04-22 18:29:32 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
fix: Analysis download scrambles taxon labels - ID: 2970700

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAnAnalysisStepController.java
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/algorithm.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAnAnalysisStepController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAnAnalysisStepController.java	2010-04-22 18:28:28 UTC (rev 692)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAnAnalysisStepController.java	2010-04-22 18:29:32 UTC (rev 693)
@@ -140,7 +140,7 @@
 				PhyloTree tree = data.getTreeData();
 				Matrix matrix  = data.getMatrixData();
 				if ( tree != null ) {
-					tree.getTreeBlock().setTaxonLabelSet(inputLabelSet);
+					tree.getTreeBlock().setTaxonLabelSet(inputLabelSet);					
 					tree.buildNexusBlock(stepContent);
 				}
 				if ( matrix != null ) {
@@ -152,7 +152,7 @@
 		
 		stepContent.append("[ The following blocks are output data for analysis step " + analysisId + " ]\n");
 		TaxonLabelSet outputLabelSet = step.getOutputTaxonLabelSet();
-		outputLabelSet.buildNexusBlockTaxa(stepContent, true, false);
+		//outputLabelSet.buildNexusBlockTaxa(stepContent, true, false);
 		for ( AnalyzedData data : step.getDataSetReadOnly() ) {
 			if ( ! data.isInputData() ) {
 				PhyloTree tree = data.getTreeData();

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/algorithm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/algorithm.jsp	2010-04-22 18:28:28 UTC (rev 692)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/algorithm.jsp	2010-04-22 18:29:32 UTC (rev 693)
@@ -45,7 +45,7 @@
 				alt="<fmt:message key="analysis.notvalidated"/>"/>			
 		</span>
 <!-- VG 2010-03-17 Disabled analysis download as requested in #2972107, to mitigate #2970700 and #2970457   -->		
-<!-- 		<a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStepCommand.id}&id=${analysisStepCommand.analysis.study.id}">  -->
+		<a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStepCommand.id}&id=${analysisStepCommand.analysis.study.id}">  
 			<img 
 				class="iconButton" 
 				src="<fmt:message key="icons.download.reconstructed"/>" 
@@ -56,7 +56,7 @@
 				title="<fmt:message key="download.unavailable"/>" 
 				alt="<fmt:message key="download.unavailable"/>"	
 				/>	
-<!-- 		</a>	  -->	
+		</a>	  	
 		<c:if test="${not empty analysisStepCommand.displayName}">
 			<c:out value="${analysisStepCommand.displayName}"/>
 		</c:if>	

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp	2010-04-22 18:28:28 UTC (rev 692)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp	2010-04-22 18:29:32 UTC (rev 693)
@@ -48,13 +48,13 @@
 						border="0"
 						onClick="CollapseExpand('${AnalysisStepId}')"/> 
                                         <!-- commented out due to issue# 2970700 and issue# 2970457 -->
-					<!-- <a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStep.id}"> -->
+					<a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStep.id}"> 
 						<img 
 							class="iconButton" 
 							src="<fmt:message key="icons.download.reconstructed"/>" 
 							title="<fmt:message key="download.reconstructedfile"/>" 
 							alt="<fmt:message key="download.reconstructedfile"/>"/>	
-					<!-- </a> -->					
+					</a>					
 					<strong>Analysis Step ${status_analysisStep.count}:</strong>
 					<c:out value="${analysisStepCommand.name}" />
 				</li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.