Project

General

Profile

« Previous | Next » 

Revision 3801822d

Added by Andreas Müller over 10 years ago

change DescriptionBase.descriptionElements to DescriptionBase.elements #3841

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/statistics/StatisticsDaoHibernateImpl.java
65 65

  
66 66
		// query = getSession().createQuery(
67 67
		// "select count(distinct(r.id, desc.id)) from DescriptionBase as d "
68
		// + "join d.descriptionElements as de "
68
		// + "join d.elements as de "
69 69
		// + "join de.sources as des "
70 70
		// + "join des.citation as desc "
71 71
		// + "join d.descriptionSources as r "
......
116 116
	// queryStrings
117 117
	// .add("select distinct des.citation.id from TaxonNode as tn "
118 118
	// + "join tn.taxon.descriptions as d "
119
	// + "join d.descriptionElements as de "
119
	// + "join d.elements as de "
120 120
	// + "join de.sources as des "
121 121
	// + "where tn.classification=:classification "
122 122
	// + "and des.citation is not null ");
......
126 126
	// // TaxonNameBase description elements for taxa:
127 127
	// queryStrings.add("select distinct des.citation.id from TaxonNode tn "
128 128
	// + "join tn.taxon.name.descriptions as d "
129
	// + "join d.descriptionElements as de "
129
	// + "join d.elements as de "
130 130
	// + "join de.sources as des "
131 131
	// + "where tn.classification=:classification "
132 132
	// + "and tn.taxon is not null "
......
138 138
	// + "join tn.taxon.synonymRelations as syr "
139 139
	// + "join syr.relatedFrom as sy "
140 140
	// + "join sy.name.descriptions as d "
141
	// + "join d.descriptionElements as de "
141
	// + "join d.elements as de "
142 142
	// + "join de.sources as des "
143 143
	// + "where tn.classification=:classification "
144 144
	// + "and des.citation is not null " + "and sy is not null " // TODO:
......
155 155
	// .add("select distinct des.citation.id from DescriptionBase db, TaxonNode tn "
156 156
	// + "join db.describedSpecimenOrObservation as so "
157 157
	// + "join so.determinations as det "
158
	// + "join db.descriptionElements as de "
158
	// + "join db.elements as de "
159 159
	// + "join de.sources as des "
160 160
	// + "where tn.classification=:classification "
161 161
	// + "and tn.taxon=det.taxon ");
......
168 168
	// queryStrings.add("select distinct des.citation.id from TaxonNode tn "
169 169
	// + " join tn.taxon.name.typeDesignations as tdes "
170 170
	// + "join tdes.typeSpecimen.descriptions as d "
171
	// + "join d.descriptionElements as de "
171
	// + "join d.elements as de "
172 172
	// + "join de.sources as des "
173 173
	// + "where tn.classification=:classification "
174 174
	// + "and tdes.class=:type " + "and tn.taxon is not null "
......
184 184
	// + "join syr.relatedFrom as sy "
185 185
	// + " join sy.name.typeDesignations as tdes "
186 186
	// + "join tdes.typeSpecimen.descriptions as d "
187
	// + "join d.descriptionElements as de "
187
	// + "join d.elements as de "
188 188
	// + "join de.sources as des "
189 189
	// + "where tn.classification=:classification "
190 190
	// + "and tdes.class=:type " + "and tn.taxon is not null "
......
206 206
		String selection = "d.id ";
207 207

  
208 208
		if (sourceReferences) {
209
			sourceRefJoins = "join d.descriptionElements as de "
209
			sourceRefJoins = "join d.elements as de "
210 210
					+ "join de.sources as des ";
211 211
			sourceRefWhere = "and des.citation is not null ";
212 212
			selection = "des.citation.id ";
......
584 584
		queryStrings
585 585
				.add("select distinct cit.id from TaxonNode tn "
586 586
						+ "join tn.taxon.descriptions as db "
587
						+ "join db.descriptionElements as ia "
587
						+ "join db.elements as ia "
588 588
						+ "join ia.associatedSpecimenOrObservation as so "
589 589
						+ "join so.sequences as seq "
590 590
						+ "join seq.citations as cit "
......
619 619
//
620 620
//		queryStrings.add("select distinct me.citation.id from TaxonNode tn "
621 621
//				+ "join tn.taxon.descriptions as db "
622
//				+ "join db.descriptionElements as ia "
622
//				+ "join db.elements as ia "
623 623
//				+ "join ia.associatedSpecimenOrObservation as so "
624 624
//				+ "join so.sequences as seq " 
625 625
//				+ "join seq.chromatograms as me "
......
635 635
//		// Taxa:
636 636
//		queryStrings.add("select distinct me.citation.id from TaxonNode tn "
637 637
//				+ "join tn.taxon.name.descriptions as d "
638
//				+ "join d.descriptionElements as de "
638
//				+ "join d.elements as de "
639 639
//				+ "join de.media as me "
640 640
//				+ "where tn.classification=:classification "
641 641
//				+ "and tn.taxon.name is not null "
......
648 648
//				+ "join tn.taxon.synonymRelations as syr "
649 649
//				+ "join syr.relatedFrom as sy "
650 650
//				+ "join sy.name.descriptions as d "
651
//				+ "join d.descriptionElements as de "
651
//				+ "join d.elements as de "
652 652
//				+ "join de.media as me "
653 653
//				+ "where tn.classification=:classification "
654 654
//				+ "and sy.name is not null "
......
666 666
//		// from description element
667 667
//		queryStrings.add("select distinct me.citation.id from TaxonNode as tn "
668 668
//				+ "join tn.taxon.descriptions as d "
669
//				+ "join d.descriptionElements as de " 
669
//				+ "join d.elements as de " 
670 670
//				+ "join de.media as me "
671 671
//				+ "where tn.classification=:classification "
672 672
//				+ "and me.class=:referencedMediaBase "
......
682 682
//				.add("select distinct de.area.shape.citation.id, me1.citation.id, "
683 683
//						+ "me2.citation.id, me3.citation.id from TaxonNode as tn "
684 684
//						+ "join tn.taxon.descriptions as d "
685
//						+ "join d.descriptionElements as de "
685
//						+ "join d.elements as de "
686 686
//						+ "join de.area.media as me1 "
687 687
//						+ "join de.area.waterbodiesOrCountries as wboc "
688 688
//						+ "join wboc.media as me2 "
......
747 747
//				.add("select fo.gatheringEvent.country.shape.citation.id, ca.shape.citation.id "
748 748
//						+ "from TaxonNode tn "
749 749
//						+ "join tn.taxon.descriptions as db "
750
//						+ "join db.descriptionElements as ia "
750
//						+ "join db.elements as ia "
751 751
//						+ "join ia.associatedSpecimenOrObservation as fo "
752 752
//						+ "join fo.gatheringEvent.collectingAreas as ca "
753 753
//						+ "where fo.class=:fieldObservation "

Also available in: Unified diff