From: f.revilla <f.revilla@localhost>
Date: Wed, 14 Jul 2010 14:38:50 +0000 (+0000)
Subject: restoring the property path paramenter to service method getOrderedDistributions
X-Git-Tag: 3.0.3~956
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/5afc1134b49017fa6971342c7a0847eb05d3e081

restoring the property path paramenter to service method getOrderedDistributions
---

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
index 843db41cbc..5b1d4cf770 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
@@ -89,7 +89,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 			"$",
 			"elements.$",
 			"elements.sources.citation.",
-//			"elements.sources.citation.authorTeam.$",		
+			"elements.sources.citation.authorTeam.$",		
 //			"elements.sources.citation.authorTeam.titleCache",
 //			"elements.sources.citation.authorTeam.nomenclaturalTitleCache",
 			"elements.sources.nameUsedInSource.titleCache",
@@ -177,7 +177,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 			description = (TaxonDescription) service.load(descriptionUuid, TAXONDESCRIPTION_INIT_STRATEGY);
 			taxonDescriptions.add(description);
 		}
-		DistributionTree distTree = service.getOrderedDistributionsB(taxonDescriptions, levels);
+		DistributionTree distTree = service.getOrderedDistributionsB(taxonDescriptions, levels, TAXONDESCRIPTION_INIT_STRATEGY);
 		return distTree;
 	}
 	
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index 943f6820b0..21df2e4e24 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -518,7 +518,7 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
 			value = {"/portal/taxon/*/fromNameRelationships"},
 			method = RequestMethod.GET)
 	public List<NameRelationship> doGetFromNameRelations(HttpServletRequest request, HttpServletResponse response)throws IOException {
-		logger.info("doGetNameRelations()" + request.getServletPath());
+		logger.info("doGetNameFromNameRelations()" + request.getServletPath());
 		TaxonBase tb = getCdmBase(request, response, SIMPLE_TAXON_INIT_STRATEGY, Taxon.class);
 		List<NameRelationship> list = nameService.listFromNameRelationships(tb.getName(), null, null, null, null, NAMERELATIONSHIP_INIT_STRATEGY);
 		return list;
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
index e679e37938..7873786b9a 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
@@ -217,13 +217,14 @@ public class DescriptionServiceImpl extends IdentifiableServiceBase<DescriptionB
 	
 	public DistributionTree getOrderedDistributionsB(
 			Set<TaxonDescription> taxonDescriptions,
-			Set<NamedAreaLevel> omitLevels){
+			Set<NamedAreaLevel> omitLevels,
+			List<String> propertyPaths){
 		
 		DistributionTree tree = new DistributionTree();
 		List<Distribution> distList = new ArrayList<Distribution>();
 		
 		for (TaxonDescription taxonDescription : taxonDescriptions) {
-			taxonDescription = (TaxonDescription) dao.load(taxonDescription.getUuid());
+			taxonDescription = (TaxonDescription) dao.load(taxonDescription.getUuid(), propertyPaths);
 			Set<DescriptionElementBase> elements = taxonDescription.getElements();
 			for (DescriptionElementBase element : elements) {
 				if(element.isInstanceOf(Distribution.class)){
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
index def5858f2d..acd09de819 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
@@ -242,7 +242,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
     
     public List<DescriptionElementBase> getDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
 
-	public DistributionTree getOrderedDistributionsB(Set<TaxonDescription> taxonDescriptions, Set<NamedAreaLevel> levels);
+	public DistributionTree getOrderedDistributionsB(Set<TaxonDescription> taxonDescriptions, Set<NamedAreaLevel> levels, List<String> propertyPaths);
 
 	/**
 	  * Generate a string representation of the structured <code>description</code> supplied in natural language