[Treebase-guts] SF.net SVN: treebase:[682] trunk/treebase-core/src/main/java/org/cipres/ treebase/dao/taxon/TaxonLabelDAO.java

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

Revision: 682
          http://treebase.svn.sourceforge.net/treebase/?rev=682&view=rev
Author:   youjun
Date:     2010-04-11 14:40:20 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
clean sub_taxonlabel table before delete a taxonlabel

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/dao/taxon/TaxonLabelDAO.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/taxon/TaxonLabelDAO.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/taxon/TaxonLabelDAO.java	2010-04-09 03:30:14 UTC (rev 681)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/taxon/TaxonLabelDAO.java	2010-04-11 14:40:20 UTC (rev 682)
@@ -489,7 +489,11 @@
 			q.setParameter("tl", tl);
 		    count += ((Long)q.iterate().next()).intValue();
 		    
-		    if(count==0)deletePersist(tl);
+		    if(count==0){
+		    	Submission sub=tl.getSubmission();
+		    	if(sub!=null)sub.removeTaxonLabel(tl);
+		    	deletePersist(tl);
+		    }
 		}
 	}
 }


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