[gbif-cvs] portal-index/src/main/java/org/gbif/portal/dao/impl/jdbc TaxonConceptDAOImpl.java, 1.22, 1.23

[Donald H. <dh...@us...>]

Update of /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/dao/impl/jdbc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27864/src/main/java/org/gbif/portal/dao/impl/jdbc

Modified Files:
	TaxonConceptDAOImpl.java 
Log Message:
Taxonomy merge

Index: TaxonConceptDAOImpl.java
===================================================================
RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/dao/impl/jdbc/TaxonConceptDAOImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TaxonConceptDAOImpl.java	30 Apr 2007 08:29:26 -0000	1.22
--- TaxonConceptDAOImpl.java	30 Apr 2007 15:00:29 -0000	1.23
***************
*** 93,97 ****
  		"select tc.id as id " +
  		"from taxon_concept tc inner join taxon_name tn on tn.id=tc.taxon_name_id " +
! 		"where tn.canonical=? and tc.rank=? and tc.data_resource_id=?";
  		
  	/**
--- 93,98 ----
  		"select tc.id as id " +
  		"from taxon_concept tc inner join taxon_name tn on tn.id=tc.taxon_name_id " +
! 		"where tn.canonical=? and tc.rank=? and tc.data_resource_id=? " +
! 		"and tc.priority<" + DISAMBIGUATION_PRIORITY;
  		
  	/**
***************
*** 384,388 ****
  	/**
  	 * Could be slightly more efficient, but let's see...
! 	 * @see org.gbif.portal.dao.TaxonConceptDAO#getClassificationsWithinResourceOf(java.lang.String, java.lang.String, int, long)
  	 */
  	@SuppressWarnings("unchecked")
--- 385,389 ----
  	/**
  	 * Could be slightly more efficient, but let's see...
! 	 * @see org.gbif.portal.dao.TaxonConceptDAO#getClassificationsOf(java.lang.String, java.lang.String, int, long)
  	 */
  	@SuppressWarnings("unchecked")
***************
*** 756,760 ****
  				});
  	}
- 
  	
  	/* (non-Javadoc)
--- 757,760 ----