Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[985] trunk/treebase-web/src/main
|
From: <hs...@us...> - 2011-11-18 22:22:58
|
Revision: 985
http://treebase.svn.sourceforge.net/treebase/?rev=985&view=rev
Author: hshyket
Date: 2011-11-18 22:22:51 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Removing RDF download functionality and links to RDF
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAMatrixController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAStudyController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java
trunk/treebase-web/src/main/webapp/WEB-INF/pages/anyObjectAsRDF.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAMatrixController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAMatrixController.java 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAMatrixController.java 2011-11-18 22:22:51 UTC (rev 985)
@@ -90,18 +90,18 @@
Study pStudy = ControllerUtil.findStudy(request, getStudyService());
Matrix matrix = getMatrixService().findByID(objectId);
TaxonLabelSet taxa = matrix.getTaxa();
- if ( getFormat(request) == FORMAT_NEXML ) {
+ if ( getFormat(request) == FORMAT_NEXML || getFormat(request) == FORMAT_RDF ) {
NexusDataSet pNexusDataSet = new NexusDataSet();
pNexusDataSet.getTaxonLabelSets().add(taxa);
pNexusDataSet.getMatrices().add(matrix);
return getNexmlService().serialize(pNexusDataSet,getDefaultProperties(request),matrix.getStudy());
}
- else if ( getFormat(request) == FORMAT_RDF ) {
+ /*else if ( getFormat(request) == FORMAT_RDF ) {
NexusDataSet pNexusDataSet = new NexusDataSet();
pNexusDataSet.getTaxonLabelSets().add(taxa);
pNexusDataSet.getMatrices().add(matrix);
return getRdfaService().serialize(pNexusDataSet,getDefaultProperties(request),matrix.getStudy());
- }
+ }*/
else { // FORMAT_NEXUS or none
StringBuilder matrixContent = new StringBuilder();
matrixContent.append("#NEXUS\n");
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAStudyController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAStudyController.java 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAStudyController.java 2011-11-18 22:22:51 UTC (rev 985)
@@ -35,12 +35,12 @@
@Override
protected String getFileContent(long pStudyID, HttpServletRequest request) {
Study study = getStudyService().findByID(pStudyID);
- if ( getFormat(request) == FORMAT_NEXML ) {
+ if ( getFormat(request) == FORMAT_NEXML || getFormat(request) == FORMAT_RDF ) {
return getNexmlService().serialize(study,getDefaultProperties(request));
}
- else if ( getFormat(request) == FORMAT_RDF ) {
+ /*else if ( getFormat(request) == FORMAT_RDF ) {
return getRdfaService().serialize(study,getDefaultProperties(request));
- }
+ }*/
else {
StringBuilder builder = new StringBuilder();
builder.append("#NEXUS\n\n");
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java 2011-11-18 22:22:51 UTC (rev 985)
@@ -98,18 +98,18 @@
@Override
protected String getFileContent(long blockid, HttpServletRequest request) {
TreeBlock treeBlock = getPhyloTreeHome().findTreeBlockById(blockid);
- if ( getFormat(request) == FORMAT_NEXML ) {
+ if ( getFormat(request) == FORMAT_NEXML || getFormat(request) == FORMAT_RDF ) {
NexusDataSet nexusDataSet = new NexusDataSet();
nexusDataSet.getTaxonLabelSets().add(treeBlock.getTaxonLabelSet());
nexusDataSet.getTreeBlocks().add(treeBlock);
return getNexmlService().serialize(nexusDataSet,getDefaultProperties(request));
}
- else if ( getFormat(request) == FORMAT_RDF ) {
+ /*else if ( getFormat(request) == FORMAT_RDF ) {
NexusDataSet nexusDataSet = new NexusDataSet();
nexusDataSet.getTaxonLabelSets().add(treeBlock.getTaxonLabelSet());
nexusDataSet.getTreeBlocks().add(treeBlock);
return getRdfaService().serialize(nexusDataSet,getDefaultProperties(request));
- }
+ }*/
else {
StringBuilder bldr = new StringBuilder("#NEXUS\n\n");
treeBlock.generateAFileDynamically(bldr);
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java 2011-11-18 22:22:51 UTC (rev 985)
@@ -89,7 +89,7 @@
tree = getPhyloTreeService().resurrect(tree);
TreeBlock enclosingTreeBlock = getPhyloTreeService().resurrect(tree.getTreeBlock());
TaxonLabelSet tls = getPhyloTreeService().resurrect(enclosingTreeBlock.getTaxonLabelSet());
- if ( getFormat(request) == FORMAT_NEXML ) {
+ if ( getFormat(request) == FORMAT_NEXML || getFormat(request) == FORMAT_RDF ) {
NexusDataSet nds = new NexusDataSet();
nds.getTaxonLabelSets().add(tls);
TreeBlock treeBlock = new TreeBlock();
@@ -98,7 +98,7 @@
nds.getTreeBlocks().add(treeBlock);
return getNexmlService().serialize(nds,getDefaultProperties(request),tree.getStudy());
}
- else if ( getFormat(request) == FORMAT_RDF ) {
+ /*else if ( getFormat(request) == FORMAT_RDF ) {
NexusDataSet nds = new NexusDataSet();
nds.getTaxonLabelSets().add(tls);
TreeBlock treeBlock = new TreeBlock();
@@ -106,7 +106,7 @@
treeBlock.addPhyloTree(tree);
nds.getTreeBlocks().add(treeBlock);
return getRdfaService().serialize(nds,getDefaultProperties(request),tree.getStudy());
- }
+ } */
else {
StringBuilder builder = new StringBuilder();
builder.append("#NEXUS\n\n");
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/anyObjectAsRDF.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/anyObjectAsRDF.jsp 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/anyObjectAsRDF.jsp 2011-11-18 22:22:51 UTC (rev 985)
@@ -58,12 +58,12 @@
<dc:format>text/plain</dc:format>
</item>
</c:if>
- <c:if test="${hasRdf}">
+<%-- <c:if test="${hasRdf}">
<item rdf:about="${baseURL}${phyloWSPath}?format=rdf">
<title>RDF file</title>
<link>${baseURL}${phyloWSPath}?format=rdf</link>
<description>An RDF/XML serialization of the resource</description>
<dc:format>application/rdf+xml</dc:format>
</item>
- </c:if>
+ </c:if> --%>
</rdf:RDF>
\ No newline at end of file
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 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp 2011-11-18 22:22:51 UTC (rev 985)
@@ -77,7 +77,7 @@
</a>
</display:column>
- <display:column
+ <%--<display:column
sortable="false"
class="iconColumn"
headerClass="iconColumn">
@@ -89,7 +89,7 @@
title="<fmt:message key="download.rdf"/>"
alt="<fmt:message key="download.rdf"/>"/>
</a>
- </display:column>
+ </display:column> --%>
<display:column
sortable="false"
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp 2011-11-18 22:22:51 UTC (rev 985)
@@ -103,14 +103,15 @@
alt="<fmt:message key="download.nexml"/>"/>
NeXML
</a>
- <a href="${baseLink}?format=rdf">
+ <%
+ /* <a href="${baseLink}?format=rdf">
<img
class="iconButton"
src="<fmt:message key="icons.rdf"/>"
title="<fmt:message key="download.rdf"/>"
alt="<fmt:message key="download.rdf"/>"/>
RDF
- </a>
+ </a> */ %>
</li>
</ul>
<h3>BibTeX reference</h3>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp 2011-11-18 18:18:06 UTC (rev 984)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp 2011-11-18 22:22:51 UTC (rev 985)
@@ -77,7 +77,7 @@
</a>
</display:column>
- <display:column
+ <%--<display:column
sortable="false"
class="iconColumn"
headerClass="iconColumn">
@@ -89,7 +89,7 @@
title="<fmt:message key="download.rdf"/>"
alt="<fmt:message key="download.rdf"/>"/>
</a>
- </display:column>
+ </display:column> --%>
<display:column
sortable="false"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
