[Treebase-guts] SF.net SVN: treebase:[515] trunk

[<yo...@us...>]

Revision: 515
          http://treebase.svn.sourceforge.net/treebase/?rev=515&view=rev
Author:   youjun
Date:     2010-02-19 20:31:56 +0000 (Fri, 19 Feb 2010)

Log Message:
-----------
add search by studyID option @ /admin/searchbysubmissionID

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/searchBySubmissionID.jsp

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java	2010-02-19 20:13:59 UTC (rev 514)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java	2010-02-19 20:31:56 UTC (rev 515)
@@ -193,4 +193,19 @@
 		return q.list();
 	}
 
+	public Submission findByStudyID(Long pID) {
+		// TODO Auto-generated method stub
+		Submission returnVal = null;
+			Query q = getSession()
+				.createQuery(
+					"select sub from Submission as sub where sub.id = :mID");
+
+			q.setLong("mID", pID);
+			Object o = q.uniqueResult();
+
+			returnVal = (Submission) o;
+		
+		return returnVal;
+	}
+
 }

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java	2010-02-19 20:13:59 UTC (rev 514)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java	2010-02-19 20:31:56 UTC (rev 515)
@@ -36,7 +36,7 @@
 	 * @return Submission
 	 */
 	Submission findByStudyAccessionNumber(String pAccNumber);
-
+	Submission findByStudyID(Long pID);
 	/**
 	 * Find by the associated matrix. Returns null if no match is found.
 	 * 

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	2010-02-19 20:13:59 UTC (rev 514)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java	2010-02-19 20:31:56 UTC (rev 515)
@@ -70,9 +70,19 @@
 			}
 			sub = getSubmissionHome().findByStudyAccessionNumber(studyAccession);
 		}
-		else {
+		else if( identifierType.equals("TB2") ){
 			sub = getSubmissionHome().findBySubmissionNumber(studyAccession);
 		}
+		else{
+			Long pID;
+			try{
+				pID=Long.parseLong(studyAccession);
+				sub = getSubmissionHome().findByStudyID(pID);
+			}catch(NumberFormatException nfe){
+				sub=null;
+			}
+				
+		}
 		
 		if (sub == null) {
 			return setAttributeAndShowForm(request, response, bindExp, "errors", "Submission accession: '"

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/searchBySubmissionID.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/searchBySubmissionID.jsp	2010-02-19 20:13:59 UTC (rev 514)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/searchBySubmissionID.jsp	2010-02-19 20:31:56 UTC (rev 515)
@@ -17,7 +17,8 @@
         <th><fmt:message key="submission.accession"/>:</th>
         <td>  	
         	<input type="radio" name="identifierType" value="TB2" checked="checked"/>TreeBASE2 Id   
-        	<input type="radio" name="identifierType" value="TB1"/>Legacy accession        	
+        	<input type="radio" name="identifierType" value="TB1"/>Legacy accession 
+        	<input type="radio" name="identifierType" value="TB0"/>TreeBase2 Study ID        	       	
         	<input type="text" name="submissionaccession"  maxlength = "25"/>       
         </td>
     </tr>


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