From: <rv...@us...> - 2009-11-17 16:55:16
|
Revision: 275 http://treebase.svn.sourceforge.net/treebase/?rev=275&view=rev Author: rvos Date: 2009-11-17 16:55:09 +0000 (Tue, 17 Nov 2009) Log Message: ----------- Added test to skip over not just query variables that are null, but also those that are "empty", as per TreebaseUtil.isEmpty(query), i.e. those that are strings such as "", which can happen when the $QUERY_STRING is reconstituted automatically and appended to the current URL. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2009-11-17 16:47:32 UTC (rev 274) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2009-11-17 16:55:09 UTC (rev 275) @@ -19,6 +19,7 @@ import org.apache.log4j.Logger; import org.cipres.treebase.TreebaseIDString; +import org.cipres.treebase.TreebaseUtil; import org.cipres.treebase.TreebaseIDString.MalformedTreebaseIDString; import org.cipres.treebase.domain.TBPersistable; import org.cipres.treebase.domain.search.SearchResults; @@ -396,7 +397,8 @@ HttpServletResponse response, BindException bindException, Map model) throws Exception { String query = request.getParameter("query"); - if ( query != null ) { + if ( query != null && ! TreebaseUtil.isEmpty(query) ) { + LOGGER.info("query is '"+ query +"'"); return this.handleQueryRequest(request, response, bindException); } String action = request.getParameter("action"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2010-03-12 23:27:34
|
Revision: 561 http://treebase.svn.sourceforge.net/treebase/?rev=561&view=rev Author: rvos Date: 2010-03-12 23:27:28 +0000 (Fri, 12 Mar 2010) Log Message: ----------- Changed redirect view to point to .rdf extension, as opposed to .html extension. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2010-03-12 23:26:27 UTC (rev 560) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2010-03-12 23:27:28 UTC (rev 561) @@ -123,7 +123,7 @@ if ( null != root ) { request.getSession().setAttribute("normalizedCQLQuery", URLEncoder.encode(root.toCQL(),"UTF-8")); } - return new ModelAndView(new RedirectView("searchResultsAsRDF.html")); + return new ModelAndView(new RedirectView("searchResultsAsRDF.rdf")); } protected <E extends TBPersistable> SearchResults<E> intersectSearchResults( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2010-06-22 15:16:21
|
Revision: 724 http://treebase.svn.sourceforge.net/treebase/?rev=724&view=rev Author: rvos Date: 2010-06-22 15:16:15 +0000 (Tue, 22 Jun 2010) Log Message: ----------- The baseURL session attribute is now set to the PURL domain (which is obtained from the JNDI configuration) instead of trying (and failing) to compute it from the local domain address. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2010-06-22 15:02:32 UTC (rev 723) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2010-06-22 15:16:15 UTC (rev 724) @@ -156,7 +156,7 @@ baseURL.append("/treebase-web/phylows"); request.getSession().setAttribute("recordSchema", schema); request.getSession().setAttribute("format", request.getParameter("format")); - request.getSession().setAttribute("baseURL", baseURL.toString()); + request.getSession().setAttribute("baseURL", TreebaseUtil.getPurlBase()); request.getSession().setAttribute("domainAddress", domainAddress.toString()); request.getSession().setAttribute("phyloWSPath", phyloWSPath); request.getSession().setAttribute("originalSection", original); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-05-12 12:09:36
|
Revision: 843 http://treebase.svn.sourceforge.net/treebase/?rev=843&view=rev Author: rvos Date: 2011-05-12 12:09:30 +0000 (Thu, 12 May 2011) Log Message: ----------- added throws declaration for date format parsing errors Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2011-05-12 12:08:25 UTC (rev 842) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2011-05-12 12:09:30 UTC (rev 843) @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -54,7 +55,7 @@ protected String formView; private TaxonLabelService mTaxonLabelService; - protected abstract ModelAndView handleQueryRequest(HttpServletRequest request,HttpServletResponse response,BindException errors,String query) throws CQLParseException, IOException, InstantiationException; + protected abstract ModelAndView handleQueryRequest(HttpServletRequest request,HttpServletResponse response,BindException errors,String query) throws CQLParseException, IOException, InstantiationException, ParseException; /** * Recursively traverses a CQL parse tree (presumably starting from its This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hs...@us...> - 2011-10-28 15:29:42
|
Revision: 976 http://treebase.svn.sourceforge.net/treebase/?rev=976&view=rev Author: hshyket Date: 2011-10-28 15:29:36 +0000 (Fri, 28 Oct 2011) Log Message: ----------- Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2011-10-28 14:08:26 UTC (rev 975) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2011-10-28 15:29:36 UTC (rev 976) @@ -214,9 +214,13 @@ String downloadDirName = request.getSession().getServletContext().getRealPath( TreebaseUtil.FILESEP + "NexusFileDownload") - + TreebaseUtil.FILESEP + request.getRemoteUser(); + + TreebaseUtil.FILESEP + + "TreeDownload"; + File directory = new File(downloadDirName); + directory.mkdir(); + File file = new File(downloadDirName + TreebaseUtil.FILESEP + fileName); FileWriter out = new FileWriter(file); out.write(builder.toString()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |