[Treebase-guts] SF.net SVN: treebase:[145] trunk/treebase-web/src/main/webapp/WEB-INF/pages /search/study/matrices.jsp

[<rv...@us...>]

Revision: 145
          http://treebase.svn.sourceforge.net/treebase/?rev=145&view=rev
Author:   rvos
Date:     2009-06-28 10:26:49 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
Refactored to remove hardcoded /PhyloWS/ strings.

Modified Paths:
--------------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp	2009-06-28 10:23:41 UTC (rev 144)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp	2009-06-28 10:26:49 UTC (rev 145)
@@ -5,6 +5,11 @@
 
 <c:set var="currentSection" scope="request" value="Matrices"/>
 <c:set var="headerPrefix" scope="request" value="${currentSection} for "/>
+
+<c:set var="serverName" scope="request" value="<%= request.getServerName() %>"/>
+<c:set var="portNumber" scope="request" value="<%= request.getServerPort() %>"/>
+<c:set var="baseURL" scope="request" value='http://${serverName}:${portNumber}/treebase-web/phylows/'/>
+
 <jsp:include page="nav.jsp"/>
 
 <c:url var="studyURL" value="summary.html">
@@ -21,11 +26,8 @@
 			   cellpadding="3">
 
 	<display:column title="ID">
-		<c:url value="matrix.html" var="matrixURL">
-			<c:param name="id">${study.id}</c:param>
-			<c:param name="matrixid">${matrix.id}</c:param>
-		</c:url>
-		<a href="${matrixURL}">M${matrix.id }</a>
+		<c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">html</c:param></c:url>
+		<a href="${url}">${matrix.treebaseIDString}</a>
 	</display:column>
 	
 	<display:column  
@@ -69,8 +71,8 @@
 		sortable="false"
 		class="iconColumn" 
 		headerClass="iconColumn">
-		<c:url value="/PhyloWS/${matrix.namespacedGUID}.xml" var="newMatrixURL"/>
-		<a href="${newMatrixURL}">
+		<c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">nexml</c:param></c:url>		
+		<a href="${url}">
 			<img 
 				class="iconButton" 
 				src="<fmt:message key="icons.xml"/>" 
@@ -83,8 +85,8 @@
 		sortable="false"
 		class="iconColumn" 
 		headerClass="iconColumn">
-		<c:url value="/PhyloWS/${matrix.namespacedGUID}.rdf" var="newMatrixURL"/>
-		<a href="${newMatrixURL}">
+		<c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">rdf</c:param></c:url>
+		<a href="${url}">
 			<img 
 				class="iconButton" 
 				src="<fmt:message key="icons.rdf"/>" 
@@ -97,8 +99,8 @@
 		sortable="false"
 		class="iconColumn" 
 		headerClass="iconColumn">
-		<c:url value="/PhyloWS/${matrix.namespacedGUID}.nex" var="newMatrixURL"/>
-		<a href="${newMatrixURL}">
+		<c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">nexus</c:param></c:url>
+		<a href="${url}">
 			<img 
 				class="iconButton" 
 				src="<fmt:message key="icons.download.reconstructed"/>" 
@@ -128,7 +130,7 @@
 		sortable="false"
 		class="iconColumn" 
 		headerClass="iconColumn">
-		<c:url var="url" value="/PhyloWS/${matrix.namespacedGUID}.html"/>
+		<c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">html</c:param></c:url>
 		<a href="${url}">		
 			<img 
 				class="iconButton" 


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