X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/fe37657fea4e618f26e4ff68742470ca56854d43..f90c6f2e98d2df0f73e6dbc96a2538de0424d4d3:/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java

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 f1b7ce8ccd..09d60e78a4 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
@@ -58,7 +58,7 @@ import eu.etaxonomy.cdm.remote.editor.UuidList;
  */
 
 @Controller
-@RequestMapping(value = {"/portal/description/{uuid}", "/portal/description/{uuid_list}", "/portal/descriptionelement/{descriptionelement_uuid}", "/portal/featuretree/{featuretree_uuid}"})
+@RequestMapping(value = {"/portal/description/{uuid}", "/portal/description/{uuid_list}", "/portal/descriptionElement/{descriptionelement_uuid}", "/portal/featureTree/{featuretree_uuid}"})
 public class DescriptionPortalController extends AnnotatableController<DescriptionBase, IDescriptionService>
 {
 	@Autowired
@@ -71,25 +71,14 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 				"root.children.feature.representations",
 			});
 	private static final List<String> DESCRIPTIONS_DISTRIBUTION_INIT_STRATEGY = Arrays.asList(new String []{
-			// taxon descriptions
-			//"$",
-			//"elements.$",
-			"elements.sources.citation",
 			"elements.sources.citation.$",
-			"elements.area",
 			"elements.area.$",
-			//"elements.area.level",
 			});
 	protected static final List<String> TAXONDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{
 			"$",
 			"elements.$",
-			"elements.sources.citation.",
-			"elements.sources.citation.authorTeam.$",		
-//			"elements.sources.citation.authorTeam.titleCache",
-//			"elements.sources.citation.authorTeam.nomenclaturalTitleCache",
-			"elements.sources.nameUsedInSource.titleCache",
+			"elements.sources.citation.authorTeam.$",
 			"elements.sources.nameUsedInSource.originalNameString",
-//			"elements.area",
 			"elements.area.level",
 			"elements.modifyingText",
 	});
@@ -98,6 +87,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 	public void initBinder(WebDataBinder binder) {
 		binder.registerCustomEditor(UuidList.class, new UUIDListPropertyEditor());
 		binder.registerCustomEditor(NamedAreaLevel.class, new NamedAreaLevelPropertyEditor());
+		super.initBinder(binder);
 	}
 	
 	/* (non-Javadoc)
@@ -118,7 +108,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 	 * @throws IOException
 	 */
 	
-	@RequestMapping(value = {"/portal/featuretree/{featuretree_uuid}"}, method = RequestMethod.GET)
+	@RequestMapping(value = {"/portal/featureTree/{featuretree_uuid}"}, method = RequestMethod.GET)
 	public FeatureTree doGetFeatureTree(
 			@PathVariable("featuretree_uuid") UUID featureUuid,
 			HttpServletRequest request, 
@@ -131,7 +121,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 		return featureTree;
 	}
 	
-	@RequestMapping(value = "/portal/descriptionelement/{descriptionelement_uuid}/annotation", method = RequestMethod.GET)
+	@RequestMapping(value = "/portal/descriptionElement/{descriptionelement_uuid}/annotation", method = RequestMethod.GET)
 	public Pager<Annotation> getAnnotations(
 			@PathVariable("descriptionelement_uuid") UUID uuid,
 			HttpServletRequest request,
@@ -142,23 +132,6 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 		return annotations;
 	}
 	
-	@RequestMapping(value = "/portal/description/{uuid_list}/namedAreaTree", method = RequestMethod.GET)
-	public NamedAreaTree doGetOrderedDistributions(
-			@PathVariable("uuid_list") UuidList descriptionUuidList,
-			@RequestParam(value = "omitLevels", required = false) Set<NamedAreaLevel> levels,
-			//@ModelAttribute("omitLevels") HashSet<NamedAreaLevel> levels,
-			HttpServletRequest request, HttpServletResponse response) {
-		logger.info("getOrderedDistributions(" + ObjectUtils.toString(levels) + ") - " + request.getServletPath());
-		Set<TaxonDescription> taxonDescriptions = new HashSet<TaxonDescription>();
-		TaxonDescription description;
-		for (UUID descriptionUuid : descriptionUuidList) {
-			description = (TaxonDescription) service.load(descriptionUuid);
-			taxonDescriptions.add(description);
-		}
-		NamedAreaTree areaTree = service.getOrderedDistributions(taxonDescriptions, levels);
-		return areaTree;
-	}
-	
 	@RequestMapping(value = "/portal/description/{uuid_list}/DistributionTree", method = RequestMethod.GET)
 	public DistributionTree doGetOrderedDistributionsB(
 			@PathVariable("uuid_list") UuidList descriptionUuidList,
@@ -171,7 +144,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
 			description = (TaxonDescription) service.load(descriptionUuid, TAXONDESCRIPTION_INIT_STRATEGY);
 			taxonDescriptions.add(description);
 		}
-		DistributionTree distTree = service.getOrderedDistributionsB(taxonDescriptions, levels, TAXONDESCRIPTION_INIT_STRATEGY);
+		DistributionTree distTree = service.getOrderedDistributions(taxonDescriptions, levels, TAXONDESCRIPTION_INIT_STRATEGY);
 		return distTree;
 	}