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

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

Revision: 342
          http://treebase.svn.sourceforge.net/treebase/?rev=342&view=rev
Author:   rvos
Date:     2009-12-09 17:06:57 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
Added findBySubmissionNumber() logic

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

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java	2009-12-09 16:56:02 UTC (rev 341)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java	2009-12-09 17:06:57 UTC (rev 342)
@@ -53,10 +53,10 @@
 		BindException bindExp) throws Exception {
 
 		String studyAccession = request.getParameter("submissionaccession").trim();
+		String identifierType = request.getParameter("identifierType").trim();
 		Submission sub;
 
-		if (TreebaseUtil.isEmpty(studyAccession)) {
-			
+		if (TreebaseUtil.isEmpty(studyAccession)) {			
 			return setAttributeAndShowForm(
 				request,
 				response,
@@ -64,17 +64,13 @@
 				"errors",
 				"Please provide a study accession number.");
 		}
-
-//		if (!ControllerUtil.checkForLongNumber(submissionID)) {
-//			return setAttributeAndShowForm(
-//				request,
-//				response,
-//				bindExp,
-//				"errors",
-//				"Submission ID has to be a number.");
-//		}
-
-		sub = getSubmissionHome().findByStudyAccessionNumber(studyAccession);
+		if ( identifierType.equals("TB1") ) {
+			sub = getSubmissionHome().findByStudyAccessionNumber(studyAccession);
+		}
+		else {
+			sub = getSubmissionHome().findBySubmissionNumber(studyAccession);
+		}
+		
 		if (sub == null) {
 			return setAttributeAndShowForm(request, response, bindExp, "errors", "Submission accession: '"
 				+ studyAccession + "' does not exist.");


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