Project

General

Profile

« Previous | Next » 

Revision af91f565

Added by Patrick Plitzner over 7 years ago

ref #5458 Fix grouping and add ordering of taxon node table

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java
73 73 
        		"LEFT OUTER JOIN DefinedTermBase dtb2 on tnb.rank_id = dtb2.id " +
74 74 
        		"WHERE tn.id IN ("+ idString +") AND tb.DTYPE = 'Taxon'" ;
75 75 

  		




  76
  
  
    
        String GROUP_BY = " GROUP BY tb.id ";


  		




  
  76
  
    
        String GROUP_BY = " GROUP BY tn.id ";


  		




  
  77
  
    

  		




  
  78
  
    
        String ORDER_BY = " ORDER BY tb.titleCache ";


  		




  77
  79
  
    

  		




  78
  80
  
    
        String SELECT_QUERY=


  		




  79
  81
  
    
        		"SELECT tb.DTYPE," +


  		




  ......




  94
  96
  
    
        	}


  		




  95
  97
  
    
        	count--;


  		




  96
  98
  
    
        }


  		




  97
  
  
    
        SELECT_QUERY= SELECT_QUERY + FROM_QUERY + GROUP_BY;


  		




  
  99
  
    
        SELECT_QUERY= SELECT_QUERY + FROM_QUERY + GROUP_BY + ORDER_BY;


  		




  98
  100
  
    
        String COUNT_QUERY = "SELECT count(DISTINCT tb.id)" + FROM_QUERY;


  		




  99
  101
  
    
//        String CONTAINS_QUERY = "SELECT * FROM TaxonNode tn WHERE tn.id = ?";


  		




  100
  102
  
    
        String CONTAINS_QUERY = "SELECT * FROM TaxonBase tb WHERE tb.uuid = ?";


  		












Also available in:  Unified diff