[Treebase-guts] SF.net SVN: treebase:[105] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/DownloadATreeBlockController.java

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

Revision: 105
          http://treebase.svn.sourceforge.net/treebase/?rev=105&view=rev
Author:   rvos
Date:     2009-06-25 02:40:12 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Added NeXML->RDF serialization, removed old, commented out code.

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java

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	2009-06-25 02:39:28 UTC (rev 104)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java	2009-06-25 02:40:12 UTC (rev 105)
@@ -20,21 +20,15 @@
 
 package org.cipres.treebase.web.controllers;
 
-//import java.io.File;
-//import java.io.FileWriter;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-//import org.apache.log4j.Logger;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
-//import org.cipres.treebase.TreebaseUtil;
 import org.cipres.treebase.domain.nexus.NexusDataSet;
 import org.cipres.treebase.domain.tree.PhyloTreeHome;
 import org.cipres.treebase.domain.tree.TreeBlock;
-//import org.cipres.treebase.web.util.WebUtil;
 
 /**
  * 
@@ -43,7 +37,6 @@
  */
 
 public class DownloadATreeBlockController extends AbstractDownloadController implements Controller {
-//	private static final Logger LOGGER = Logger.getLogger(DownloadATreeBlockController.class);
 
 	private PhyloTreeHome mPhyloTreeHome;
 
@@ -68,46 +61,12 @@
 	 */
 	public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
 		throws Exception {
-
-//		String sep = System.getProperty("file.separator");
 		if (request.getParameter("treeblockid") == null) {
 			return null;
 		}
 		long blockid = Long.parseLong(request.getParameter("treeblockid"));
 		generateAFileDynamically(request, response, blockid);
 		return null;
-		//String fileName = getFileName(blockid,request);
-
-//		String downloadDir = request.getSession().getServletContext().getRealPath(
-//			"/NexusFileDownload")
-//			+ sep + request.getRemoteUser();
-//		String downloadDir = getDownloadDir(request);
-//
-//		long start = System.currentTimeMillis();
-//
-//		TreeBlock treeBlock = getPhyloTreeHome().findTreeBlockById(blockid);
-//
-//		File dirPath = new File(downloadDir);
-//		if (!dirPath.exists()) {
-//			dirPath.mkdirs();
-//		}
-//		File file = new File(downloadDir + System.getProperty("file.separator")
-//			+ getFileName(blockid,request));
-//		FileWriter fwriter = new FileWriter(file);
-//		StringBuilder bldr = new StringBuilder("#NEXUS\n\n");
-//		treeBlock.generateAFileDynamically(bldr);
-//		fwriter.write(bldr.toString());
-//		fwriter.close();
-//		generateAFileDynamically(request, blockid);
-//		WebUtil.downloadFile(response, downloadDir, getFileName(blockid,request));
-//
-//		long end = System.currentTimeMillis();
-//
-//		if (LOGGER.isDebugEnabled()) {
-//			LOGGER.debug("TIME DIFFERENCE FOR A SINGAL FILE: " + (end - start));
-//		}
-//
-//		return null;
 	}
 
 	@Override
@@ -124,6 +83,12 @@
 			nexusDataSet.getTreeBlocks().add(treeBlock);
 			return getNexmlService().serialize(nexusDataSet);
 		}
+		else if ( getFormat(request) == FORMAT_RDF ) {
+			NexusDataSet nexusDataSet = new NexusDataSet();
+			nexusDataSet.getTaxonLabelSets().add(treeBlock.getTaxonLabelSet());
+			nexusDataSet.getTreeBlocks().add(treeBlock);			
+			return getRdfaService().serialize(nexusDataSet);			
+		}		
 		else {
 			StringBuilder bldr = new StringBuilder("#NEXUS\n\n");
 			treeBlock.generateAFileDynamically(bldr);


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