/ - Diff - EDIT - EDIT Project Management

     	 */
     	@Override
     	public Long countNomenclaturalReferences() {
     		Query query = getSession()
     				.createQuery(
     						"select count(distinct nomenclaturalReference) from TaxonNameBase");
     		return countNomenclaturalReferences("");
+    	}
     		return (Long) query.uniqueResult();
     	private Long countNomenclaturalReferences(String where) {
     		Query query = getSession().createQuery(
     				"select count(distinct nomenclaturalReference) from TaxonNameBase"
     						+ where);
     		return (Long) query.uniqueResult();
+    	}
     	@Override
     	public Long countNomenclaturalReferences(Class clazz){
     		return countNomenclaturalReferences("where" + clazz.getSimpleName());
+    	}
     	/**
-...
     				"select distinct descriptionSources from DescriptionBase");
     		// org.hibernate.type.Type[] types= query.getReturnTypes();
     		List<DescriptionElementSource> queryList = query.list();
     		Set <DescriptionElementSource> sourcesSet = new HashSet<DescriptionElementSource>();
     		Set<DescriptionElementSource> sourcesSet = new HashSet<DescriptionElementSource>();
     		sourcesSet.addAll(query.list());
     		if (queryList == null/* || queryList.isEmpty() */) {
     			return null;
-...
     		// eliminate doubles
     		query = getSession().createQuery(
     //				"select count(distinct citation) from (select distinct sources from DescriptionElementBase)");
     		// "select count(distinct citation) from (select distinct sources from DescriptionElementBase)");
     				"select distinct sources from DescriptionElementBase");
     		// count=(Long)query.uniqueResult();
     		org.hibernate.type.Type[] types = query.getReturnTypes();
     		// Object object =query.uniqueResult();
-...
     			// count += queryList.size();
     			// ////
+    		}
     //		Set<DescriptionElementSource> sourceSet = new HashSet<DescriptionElementSource>();
     		// Set<DescriptionElementSource> sourceSet = new
     		// HashSet<DescriptionElementSource>();
     		Set<Reference> referenceSet = new HashSet<Reference>();
     		for (DescriptionElementSource descriptionElementSource : queryList) {
     			if(descriptionElementSource.getCitation()!=null){
     			if (descriptionElementSource.getCitation() != null) {
     				referenceSet.add(descriptionElementSource.getCitation());
+    			}
+    		}
     //		sourceSet.addAll(queryList);
     //		count += sourceSet.size();
     		count+=referenceSet.size();
     		// sourceSet.addAll(queryList);
     		// count += sourceSet.size();
     		count += referenceSet.size();
     		return count;
+    	}
+    }

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/statistics/IStatisticsDao.java
7	7
8	8
9	9	public Long countDescriptiveSourceReferences();
	10
	11
	12	Long countNomenclaturalReferences(Class clazz);
10	13	}

     package eu.etaxonomy.cdm.remote.controller;
     import java.io.IOException;
     import java.util.ArrayList;
     import java.util.List;
     import javax.servlet.http.HttpServletRequest;
-...
+     *
      */
     @Controller
     @RequestMapping(value = { "/statistic" })
     @RequestMapping(value = { "/statistics" })
     public class StatisticsController {
     	private static final Logger logger = Logger
-...
     		ModelAndView mv = new ModelAndView();
     		createConfigurator(part, type);
     		//TODO:
     		// service.getStatistics(configurator);
     		Statistics statistics = service.getCountStatistics(configurator);
     		List<StatisticsConfigurator> configuratorList =new ArrayList<StatisticsConfigurator>();
     		configuratorList.add(configurator);
     		List<Statistics> statistics = service.getCountStatistics(configuratorList);
     		logger.info("doStatistics() - " + request.getServletPath());
     		mv.addObject(statistics);

     package eu.etaxonomy.cdm.api.service;
     import java.util.List;
     import eu.etaxonomy.cdm.api.service.statistics.Statistics;
     import eu.etaxonomy.cdm.api.service.statistics.StatisticsConfigurator;
-...
     public interface IStatisticsService {
     	Statistics getCountStatistics(StatisticsConfigurator configurator);
     //	List<Statistics> getCountStatistics(StatisticsConfigurator configurator);
     	List<Statistics> getCountStatistics(
     			List<StatisticsConfigurator> configurator);
+    }

     package eu.etaxonomy.cdm.api.service;
     import java.util.ArrayList;
     import java.util.Arrays;
     import java.util.HashSet;
     import java.util.List;
-...
     	private static final List<String> DESCR_ELEMENT_REF_STRATEGIE = Arrays
     			.asList(new String[] { "sources.citation", });;
     	private StatisticsConfigurator configurator;
     	private List<StatisticsConfigurator> configurators;
     	private Statistics statistics;
     	private ArrayList<Statistics> statisticsList;
     	@Autowired
     	private ITaxonDao taxonDao;
-...
     	@Autowired
     	private IDescriptionElementDao descrElementDao;
     	@Autowired
     	@Autowired
     	private IStatisticsDao statisticsDao;
     	/**
     	 * counts all the elements referenced in the configurator from the part of
     	 * the database referenced in the configurator
     	 * @param configurator
     	 * @return the Statistics countMap might contain null Numbers
+    	 *
     	 * @param configurators
     	 * @return be aware that a Statistics.countMap might contain "null" for {@link Number} value,
     	 * if the count failed (, if the value is "0" the count succeeded and sum is 0)
     	 */
     	@Override
     	@Transactional
     	public Statistics getCountStatistics(StatisticsConfigurator configurator) {
     		this.configurator = configurator;
     		this.statistics = new Statistics(configurator);
     	public List<Statistics> getCountStatistics(
     			List<StatisticsConfigurator> configurators) {
     		statisticsList = new ArrayList<Statistics>();
     		for (StatisticsConfigurator statisticsConfigurator : configurators) {
     // create a Statistics element for each configurator
     			countStatisticsPart(statisticsConfigurator);
+    		}
     		// TODO use "about" parameter of Statistics element
     		calculateParts();
     		return this.statistics;
     //		calculateParts();
     		return this.statisticsList;
+    	}
     	private void calculateParts() {
     		for (StatisticsPartEnum part : configurator.getPart()) {
     			switch (part) {
     			case ALL:
     				countAll();
     				break;
     			case CLASSIFICATION:
     				// TODO
     				break;
+    			}
+    		}
+    	}
     	@Transactional
     	private void countAll() {
     	private void countStatisticsPart(StatisticsConfigurator configurator) {
     //TODO use about
     		Statistics statistics = new Statistics(configurator);
     		//TODO add about
     		for (StatisticsTypeEnum type : configurator.getType()) {
     			Long number = null;
     			switch (type) {
-...
     				number = Long.valueOf(taxonDao.count(Taxon.class));
     				break;
     			case ALL_REFERENCES:
     				number = Long.valueOf(referenceDao
     						.count(eu.etaxonomy.cdm.model.reference.Reference.class));
     				number = Long
     						.valueOf(referenceDao
     								.count(eu.etaxonomy.cdm.model.reference.Reference.class));
     				break;
     			case NOMECLATURAL_REFERENCES:
     //				number += (referenceDao.getAllNomenclaturalReferences()).size(); // to slow!!!
     				// number +=
     				// (referenceDao.getAllNomenclaturalReferences()).size(); // to
     				// slow!!!
     				number = statisticsDao.countNomenclaturalReferences();
     				break;
     			case CLASSIFICATION:
     				number = Long.valueOf(classificationDao.count(Classification.class));
     				number = Long.valueOf(classificationDao
     						.count(Classification.class));
     				break;
-...
     				break;
     			case DESCRIPTIVE_SOURCE_REFERENCES:
     				 number = statisticsDao.countDescriptiveSourceReferences();
     //				number = taxonDao.count
     				number = statisticsDao.countDescriptiveSourceReferences();
     				break;
+    			}
     			statistics.addCount(type, number);
+    		}
     		statisticsList.add(statistics);
+    	}
     	//-------------------------------------------------
     //	private void countStatistic(StatisticsConfigurator configurator){
     //
     //		Statistics statistics = new Statistics(configurator);
     //		for (StatisticsPartEnum part : configurator.getPart()) {
     //			switch (part) {
     //			case ALL:
     //				countAll(configurator);
     //				break;
     //
     //			case CLASSIFICATION:
     //				// get classifications
     //				// foreach classification:
     //				countPart();
     //				break;
     //			}
     //		}
     //	}
     //	private void calculatePart() {
     //		//TODO
     //		for (StatisticsPartEnum part : configurator.getPart()) {
     //			switch (part) {
     //			case ALL:
     //				countAll();
     //				break;
     //
     //			case CLASSIFICATION:
     //				// get classifications
     //				// foreach classification:
     //				countPart();
     //				break;
     //			}
     //		}
     //
     //	}
     	@Transactional
     	private void countPart() {
+    	}

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/statistics/Statistics.java
38	38
39	39	private List<IdentifiableEntity> about;
40	40
	41
41	42	// it's a pitty, but for JSON Map keys must be Strings
42	43	// see also: JSONObject _fromMap( Map map, JsonConfig jsonConfig )
43	44	// --> TODO: modify MapJSONValueProcessor.processArrayValue(Object value,

     	@Test
     	public void testGetCountStatistics_partAll() {
     		createConfigurator();
     		boolean check = true;
     		Statistics resultStat = service.getCountStatistics(configurator);
     		Map<String, Number> resultCountMap = resultStat.getCountMap();
     		for (Map.Entry<StatisticsTypeEnum, Number> protoEntry : prototype
     				.entrySet()) {
     			logger.info(protoEntry.getKey().getLabel()+":\texpected count: "
     					+ "\t\t" + protoEntry.getValue() + "\tactual count: "
     					+ resultCountMap.get(protoEntry.getKey().getLabel()));
     			if (!((resultCountMap.get(protoEntry.getKey().getLabel()))
     					.equals((Number) 0))) {
     				check = false;
+    			}
+    		}
     //		Assert.assertFalse("everything was counted right!!!", check);
     		Assert.assertTrue("some count did not match!!!", check);
     //		fail("Not yet implemented");
     //		createConfigurator();
     //		boolean check = true;
     //		Statistics resultStat = service.getCountStatistics(configurator);
     //		Map<String, Number> resultCountMap = resultStat.getCountMap();
     //
     //		for (Map.Entry<StatisticsTypeEnum, Number> protoEntry : prototype
     //				.entrySet()) {
     //
     //			logger.info(protoEntry.getKey().getLabel()+":\texpected count: "
     //					+ "\t\t" + protoEntry.getValue() + "\tactual count: "
     //					+ resultCountMap.get(protoEntry.getKey().getLabel()));
     //
     //			if (!((resultCountMap.get(protoEntry.getKey().getLabel()))
     //					.equals((Number) 0))) {
     //				check = false;
     //			}
     //		}
     ////		Assert.assertFalse("everything was counted right!!!", check);
     //		Assert.assertTrue("some count did not match!!!", check);
     ////		fail("Not yet implemented");
+    	}

Project

General

Profile

EDIT

Revision e7211ef5

Added by Sybille Bürs over 11 years ago