import java.util.Arrays;\r
import java.util.HashSet;\r
import java.util.Hashtable;\r
+import java.util.Iterator;\r
import java.util.List;\r
import java.util.Map;\r
-import java.util.NoSuchElementException;\r
import java.util.Set;\r
-import java.util.SortedMap;\r
-import java.util.TreeMap;\r
import java.util.UUID;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
import org.springframework.stereotype.Controller;\r
import org.springframework.web.bind.WebDataBinder;\r
import org.springframework.web.bind.annotation.InitBinder;\r
+import org.springframework.web.bind.annotation.PathVariable;\r
import org.springframework.web.bind.annotation.RequestMapping;\r
import org.springframework.web.bind.annotation.RequestMethod;\r
import org.springframework.web.bind.annotation.RequestParam;\r
import eu.etaxonomy.cdm.model.description.TaxonNameDescription;\r
import eu.etaxonomy.cdm.model.location.NamedArea;\r
import eu.etaxonomy.cdm.model.media.Media;\r
-import eu.etaxonomy.cdm.model.media.MediaRepresentation;\r
+import eu.etaxonomy.cdm.model.media.MediaUtils;\r
import eu.etaxonomy.cdm.model.name.NameRelationship;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
import eu.etaxonomy.cdm.model.taxon.Synonym;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
+import eu.etaxonomy.cdm.remote.editor.MatchModePropertyEditor;\r
import eu.etaxonomy.cdm.remote.editor.NamedAreaPropertyEditor;\r
import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;\r
\r
*\r
*/\r
@Controller\r
-@RequestMapping(value = {"/*/portal/taxon/*", "/*/portal/taxon/*/*", "/*/portal/name/*/*", "/*/portal/taxon/*/media/*/*"})\r
+@RequestMapping(value = {"/portal/taxon/{uuid}"})\r
public class TaxonPortalController extends BaseController<TaxonBase, ITaxonService>\r
{\r
public static final Logger logger = Logger.getLogger(TaxonPortalController.class);\r
\r
@Autowired\r
private INameService nameService;\r
+ \r
@Autowired\r
private IDescriptionService descriptionService;\r
- @Autowired\r
- private IReferenceService referenceService;\r
\r
@Autowired\r
private ITaxonTreeService taxonTreeService;\r
\r
+ @Autowired\r
+ private ITaxonService taxonService;\r
+ \r
private static final List<String> TAXON_INIT_STRATEGY = Arrays.asList(new String []{\r
"*",\r
// taxon relations \r
- "relationsToThisName.fromTaxon.name.taggedName",\r
+ "relationsToThisName.fromTaxon.name",\r
// the name\r
"name.$",\r
- "name.taggedName",\r
"name.rank.representations",\r
"name.status.type.representations",\r
\r
// taxon descriptions\r
- "descriptions.elements.$",\r
- "descriptions.elements.area",\r
"descriptions.elements.area.$",\r
"descriptions.elements.multilanguageText",\r
"descriptions.elements.media.representations.parts",\r
- \r
-// // typeDesignations\r
-// "name.typeDesignations.$",\r
-// "name.typeDesignations.citation.authorTeam",\r
-// "name.typeDesignations.typeName.$",\r
-// "name.typeDesignations.typeStatus.representations",\r
-// "name.typeDesignations.typeSpecimen.media.representations.parts"\r
+ "descriptions.elements.media.title",\r
\r
});\r
\r
+ private static final List<String> TAXON_WITH_NODES_INIT_STRATEGY = Arrays.asList(new String []{\r
+ "taxonNodes.$",\r
+ "taxonNodes.taxonomicTree.$",\r
+ "taxonNodes.childNodes.$"\r
+ });\r
+ \r
private static final List<String> SIMPLE_TAXON_INIT_STRATEGY = Arrays.asList(new String []{\r
"*",\r
// taxon relations \r
- "relationsToThisName.fromTaxon.name.taggedName",\r
+ "relationsToThisName.fromTaxon.name",\r
// the name\r
"name.$",\r
- "name.taggedName",\r
"name.rank.representations",\r
- "name.status.type.representations"\r
+ "name.status.type.representations",\r
+ "name.nomenclaturalReference"\r
});\r
\r
private static final List<String> SYNONYMY_INIT_STRATEGY = Arrays.asList(new String []{\r
// initialize homotypical and heterotypical groups; needs synonyms\r
"synonymRelations.$",\r
"synonymRelations.synonym.$",\r
- "synonymRelations.synonym.name.taggedName",\r
- "synonymRelations.synonym.name.nomenclaturalReference.inBook.authorTeam",\r
- "synonymRelations.synonym.name.nomenclaturalReference.inJournal",\r
- "synonymRelations.synonym.name.nomenclaturalReference.inProceedings",\r
+ "synonymRelations.synonym.name.status.type.representation",\r
+ "synonymRelations.synonym.name.nomenclaturalReference.inReference",\r
"synonymRelations.synonym.name.homotypicalGroup.typifiedNames.$",\r
- "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.name.taggedName",\r
"synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.$",\r
- "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.name.taggedName",\r
+ "synonymRelations.synonym.name.combinationAuthorTeam.$",\r
\r
"name.homotypicalGroup.$",\r
"name.homotypicalGroup.typifiedNames.$",\r
- "name.homotypicalGroup.typifiedNames.name.taggedName",\r
- \r
- "name.homotypicalGroup.typifiedNames.taxonBases.$",\r
- "name.homotypicalGroup.typifiedNames.taxonBases.name.taggedName"\r
\r
+ "name.homotypicalGroup.typifiedNames.taxonBases.$"\r
});\r
\r
private static final List<String> TAXONRELATIONSHIP_INIT_STRATEGY = Arrays.asList(new String []{\r
"$",\r
"type.inverseRepresentations",\r
- "fromTaxon.sec.authorTeam",\r
- "fromTaxon.name.taggedName"\r
+ "fromTaxon.sec",\r
+ "fromTaxon.name"\r
});\r
\r
private static final List<String> NAMERELATIONSHIP_INIT_STRATEGY = Arrays.asList(new String []{\r
"$",\r
"type.inverseRepresentations",\r
- "fromName.taggedName",\r
+ "fromName",\r
+ "toName.$",\r
});\r
\r
\r
"$",\r
"elements.$",\r
"elements.sources.citation.",\r
- "elements.sources.citation.authorTeam",\r
- "elements.sources.citation.authorTeam.teamMembers",\r
+ "elements.sources.nameUsedInSource.originalNameString",\r
"elements.multilanguageText",\r
"elements.media.representations.parts",\r
+ "elements.media.title",\r
});\r
\r
+ \r
private static final List<String> NAMEDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{\r
"uuid",\r
"feature",\r
"elements.$",\r
"elements.multilanguageText",\r
"elements.media.representations.parts",\r
+ "elements.media.title",\r
});\r
\r
+ protected static final List<String> TAXONDESCRIPTION_MEDIA_INIT_STRATEGY = Arrays.asList(new String []{\r
+ "elements.media.representations.parts",\r
+ "elements.media.title"\r
+ \r
+ });\r
+\r
private static final List<String> TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{\r
//"$",\r
"typeSpecimen.$",\r
- "typeStatus.representations",\r
- "citation.authorTeam",\r
- "typeName.taggedName"\r
+ "citation", \r
+ "typeName",\r
+ });\r
+ \r
+ protected static final List<String> TAXONNODE_WITHTAXON_INIT_STRATEGY = Arrays.asList(new String []{\r
+ "childNodes.taxon",\r
+ });\r
+ \r
+ protected static final List<String> TAXONNODE_INIT_STRATEGY = Arrays.asList(new String []{\r
+ "taxonNodes.taxonomicTree"\r
});\r
\r
\r
\r
- private static final String featureTreeUuidPattern = "^/(?:[^/]+)/taxon(?:(?:/)([^/?#&\\.]+))+.*";\r
+ private static final String featureTreeUuidPattern = "^/taxon(?:(?:/)([^/?#&\\.]+))+.*";\r
\r
public TaxonPortalController(){\r
super();\r
setInitializationStrategy(TAXON_INIT_STRATEGY);\r
- setUuidParameterPattern("^/(?:[^/]+)/portal/(?:[^/]+)/([^/?#&\\.]+).*");\r
}\r
\r
/* (non-Javadoc)\r
public void initBinder(WebDataBinder binder) {\r
binder.registerCustomEditor(UUID.class, new UUIDPropertyEditor());\r
binder.registerCustomEditor(NamedArea.class, new NamedAreaPropertyEditor());\r
+ binder.registerCustomEditor(MatchMode.class, new MatchModePropertyEditor());\r
}\r
\r
\r
* the number of the page to be returned, the first page has the\r
* pageNumber = 1 - <i>optional parameter</i>\r
* @param pageSize\r
- * the maximum number of entities returned per page (can be null\r
+ * the maximum number of entities returned per page (can be -1 \r
* to return all entities in a single page) - <i>optional parameter</i>\r
* @param doTaxa\r
* weather to search for instances of {@link Taxon} - <i>optional parameter</i>\r
* weather to search for instances of {@link Synonym} - <i>optional parameter</i>\r
* @param doTaxaByCommonNames\r
* for instances of {@link Taxon} by a common name used - <i>optional parameter</i>\r
+ * @param matchMode\r
+ * valid values are "EXACT", "BEGINNING", "ANYWHERE", "END" (case sensitive !!!)\r
* @return a Pager on a list of {@link IdentifiableEntity}s initialized by\r
* the following strategy {@link #SIMPLE_TAXON_INIT_STRATEGY}\r
* @throws IOException\r
*/\r
@RequestMapping(method = RequestMethod.GET,\r
- value = {"/*/portal/taxon/find"}) //TODO map to path /*/portal/taxon/\r
+ value = {"/portal/taxon/find"}) //TODO map to path /*/portal/taxon/\r
public Pager<IdentifiableEntity> doFind(\r
@RequestParam(value = "query", required = false) String query,\r
@RequestParam(value = "tree", required = false) UUID treeUuid,\r
@RequestParam(value = "pageSize", required = false) Integer pageSize,\r
@RequestParam(value = "doTaxa", required = false) Boolean doTaxa,\r
@RequestParam(value = "doSynonyms", required = false) Boolean doSynonyms,\r
- @RequestParam(value = "doTaxaByCommonNames", required = false) Boolean doTaxaByCommonNames)\r
+ @RequestParam(value = "doTaxaByCommonNames", required = false) Boolean doTaxaByCommonNames,\r
+ @RequestParam(value = "matchMode", required = false) MatchMode matchMode\r
+ )\r
throws IOException {\r
\r
logger.info("doFind( " +\r
"query=\"" + ObjectUtils.toString(query) + "\", treeUuid=" + ObjectUtils.toString(treeUuid) + \r
", area=" + ObjectUtils.toString(areas) +\r
", pageSize=" + ObjectUtils.toString(pageSize) + ", page=" + ObjectUtils.toString(page) + \r
- ", doTaxa=" + ObjectUtils.toString(doTaxa) + ", doSynonyms=" + ObjectUtils.toString(doSynonyms) +")" );\r
+ ", doTaxa=" + ObjectUtils.toString(doTaxa) + ", doSynonyms=" + ObjectUtils.toString(doSynonyms) \r
+ +", doTaxaByCommonNames=" + ObjectUtils.toString(doTaxaByCommonNames) +")" );\r
\r
if(page == null){ page = BaseListController.DEFAULT_PAGE_NUMBER;}\r
if(pageSize == null){ pageSize = BaseListController.DEFAULT_PAGESIZE;}\r
+ if(pageSize == -1){ \r
+ pageSize = null;\r
+ }\r
\r
ITaxonServiceConfigurator config = new TaxonServiceConfiguratorImpl();\r
config.setPageNumber(page);\r
config.setDoTaxa(doTaxa!= null ? doTaxa : Boolean.FALSE );\r
config.setDoSynonyms(doSynonyms != null ? doSynonyms : Boolean.FALSE );\r
config.setDoTaxaByCommonNames(doTaxaByCommonNames != null ? doTaxaByCommonNames : Boolean.FALSE );\r
- config.setMatchMode(MatchMode.BEGINNING);\r
+ config.setMatchMode(matchMode != null ? matchMode : MatchMode.BEGINNING);\r
config.setTaxonPropertyPath(SIMPLE_TAXON_INIT_STRATEGY);\r
config.setNamedAreas(areas);\r
if(treeUuid != null){\r
* @throws IOException\r
*/\r
@RequestMapping(\r
- value = {"/*/portal/taxon/*/synonymy"},\r
+ value = {"synonymy"},\r
method = RequestMethod.GET)\r
- public ModelAndView doGetSynonymy(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ public ModelAndView doGetSynonymy(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
\r
logger.info("doGetSynonymy() " + request.getServletPath());\r
ModelAndView mv = new ModelAndView();\r
- TaxonBase tb = getCdmBase(request, response, null, Taxon.class);\r
- Taxon taxon = (Taxon)tb;\r
+ Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
Map<String, List<?>> synonymy = new Hashtable<String, List<?>>();\r
synonymy.put("homotypicSynonymsByHomotypicGroup", service.getHomotypicSynonymsByHomotypicGroup(taxon, SYNONYMY_INIT_STRATEGY));\r
synonymy.put("heterotypicSynonymyGroups", service.getHeterotypicSynonymyGroups(taxon, SYNONYMY_INIT_STRATEGY));\r
* {@link #SYNONYMY_INIT_STRATEGY}\r
* @throws IOException\r
*/\r
- @RequestMapping(value = "/*/portal/taxon/*/accepted", method = RequestMethod.GET)\r
- public Set<TaxonBase> getAccepted(HttpServletRequest request, HttpServletResponse response) throws IOException {\r
+ @RequestMapping(value = "accepted", method = RequestMethod.GET)\r
+ public Set<TaxonBase> getAccepted(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response) throws IOException {\r
\r
logger.info("getAccepted() " + request.getServletPath());\r
\r
- UUID uuid = readValueUuid(request, null);\r
TaxonBase tb = service.load(uuid, SYNONYMY_INIT_STRATEGY);\r
if(tb == null){\r
response.sendError(HttpServletResponse.SC_NOT_FOUND, "A taxon with the uuid " + uuid + " does not exist");\r
* @throws IOException\r
*/\r
@RequestMapping(\r
- value = {"/*/portal/taxon/*/taxonRelationships"},\r
+ value = {"taxonRelationships"},\r
method = RequestMethod.GET)\r
- public List<TaxonRelationship> doGetTaxonRelations(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ public List<TaxonRelationship> doGetTaxonRelations(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
\r
logger.info("doGetTaxonRelations()" + request.getServletPath());\r
- TaxonBase tb = getCdmBase(request, response, null, Taxon.class);\r
- Taxon taxon = (Taxon)tb;\r
+ Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
List<TaxonRelationship> relations = new ArrayList<TaxonRelationship>();\r
List<TaxonRelationship> results = service.listToTaxonRelationships(taxon, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null, null, TAXONRELATIONSHIP_INIT_STRATEGY);\r
relations.addAll(results);\r
* @throws IOException\r
*/\r
@RequestMapping(\r
- value = {"/*/portal/taxon/*/nameRelationships"},\r
+ value = {"toNameRelationships"},\r
method = RequestMethod.GET)\r
- public List<NameRelationship> doGetNameRelations(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ public List<NameRelationship> doGetToNameRelations(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
logger.info("doGetNameRelations()" + request.getServletPath());\r
- TaxonBase tb = getCdmBase(request, response, SIMPLE_TAXON_INIT_STRATEGY, Taxon.class);\r
- List<NameRelationship> list = nameService.listToNameRelationships(tb.getName(), null, null, null, null, NAMERELATIONSHIP_INIT_STRATEGY);\r
+ Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
+ List<NameRelationship> list = nameService.listToNameRelationships(taxon.getName(), null, null, null, null, NAMERELATIONSHIP_INIT_STRATEGY);\r
return list;\r
}\r
\r
/**\r
- * Get the list of {@link TaxonNameDescription}s of the Name associated with the \r
- * {@link TaxonNameBase} instance identified by the <code>{name-uuid}</code>.\r
+ * Get the list of {@link NameRelationship}s of the Name associated with the \r
+ * {@link TaxonBase} instance identified by the <code>{taxon-uuid}</code>.\r
* <p>\r
- * URI: <b>/{datasource-name}/portal/name/{name-uuid}/descriptions</b>\r
+ * URI: <b>/{datasource-name}/portal/taxon/{taxon-uuid}/nameRelationships</b>\r
* \r
* @param request\r
* @param response\r
- * @return a List of {@link TaxonNameDescription} entities which are initialized\r
+ * @return a List of {@link NameRelationship} entities which are initialized\r
* using the following initialization strategy:\r
- * {@link #NAMEDESCRIPTION_INIT_STRATEGY}\r
+ * {@link #NAMERELATIONSHIP_INIT_STRATEGY}\r
* @throws IOException\r
*/\r
@RequestMapping(\r
- value = {"/*/portal/name/*/descriptions"},\r
+ value = {"fromNameRelationships"},\r
method = RequestMethod.GET)\r
- public List<TaxonNameDescription> doGetNameDescriptions(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
- logger.info("doGetNameDescriptions()" + request.getServletPath());\r
- UUID nameUuuid = readValueUuid(request, null);\r
- TaxonNameBase tnb = nameService.load(nameUuuid, null);\r
- Pager<TaxonNameDescription> p = descriptionService.getTaxonNameDescriptions(tnb, null, null, NAMEDESCRIPTION_INIT_STRATEGY);\r
- return p.getRecords();\r
+ public List<NameRelationship> doGetFromNameRelations(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ logger.info("doGetNameFromNameRelations()" + request.getServletPath());\r
+\r
+ TaxonBase taxonbase = getCdmBaseInstance(TaxonBase.class, uuid, response, SIMPLE_TAXON_INIT_STRATEGY);\r
+ List<NameRelationship> list = nameService.listFromNameRelationships(taxonbase.getName(), null, null, null, null, NAMERELATIONSHIP_INIT_STRATEGY);\r
+ return list;\r
}\r
\r
/**\r
* using the following initialization strategy:\r
* {@link #TYPEDESIGNATION_INIT_STRATEGY}\r
* @throws IOException\r
+ * @Deprecated use /name/{uuid}/typeDesignations & /derivedunitfacade/{uuid} instead\r
*/\r
+ @Deprecated\r
@RequestMapping(\r
- value = {"/*/portal/taxon/*/nameTypeDesignations"},\r
+ value = {"nameTypeDesignations"},\r
method = RequestMethod.GET)\r
- public List<TypeDesignationBase> doGetNameTypeDesignations(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ public List<TypeDesignationBase> doGetNameTypeDesignations(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
logger.info("doGetNameTypeDesignations()" + request.getServletPath());\r
- TaxonBase tb = getCdmBase(request, response, SIMPLE_TAXON_INIT_STRATEGY, Taxon.class);\r
- Pager<TypeDesignationBase> p = nameService.getTypeDesignations(tb.getName(), null, null, null, TYPEDESIGNATION_INIT_STRATEGY);\r
+ Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, SIMPLE_TAXON_INIT_STRATEGY);\r
+ Pager<TypeDesignationBase> p = nameService.getTypeDesignations(taxon.getName(), null, null, null, TYPEDESIGNATION_INIT_STRATEGY);\r
return p.getRecords();\r
}\r
\r
+ @RequestMapping(value = "taxonNodes", method = RequestMethod.GET)\r
+ public Set<TaxonNode> doGetTaxonNodes(\r
+ @PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, \r
+ HttpServletResponse response) throws IOException {\r
+ TaxonBase tb = service.load(uuid, TAXONNODE_INIT_STRATEGY);\r
+ if(tb instanceof Taxon){\r
+ return ((Taxon)tb).getTaxonNodes();\r
+ } else {\r
+ HttpStatusMessage.UUID_REFERENCES_WRONG_TYPE.send(response);\r
+ return null;\r
+ }\r
+ }\r
+ \r
/**\r
* Get the list of {@link TaxonDescription}s of the \r
* {@link Taxon} instance identified by the <code>{taxon-uuid}</code>.\r
* @throws IOException\r
*/\r
@RequestMapping(\r
- value = {"/*/portal/taxon/*/descriptions"},\r
+ value = {"descriptions"},\r
method = RequestMethod.GET)\r
- public List<TaxonDescription> doGetDescriptions(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ public List<TaxonDescription> doGetDescriptions(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
logger.info("doGetDescriptions()" + request.getServletPath());\r
- Taxon t = getCdmBase(request, response, null, Taxon.class);\r
- Pager<TaxonDescription> p = descriptionService.getTaxonDescriptions(t, null, null, null, null, \r
- TAXONDESCRIPTION_INIT_STRATEGY);\r
+ Taxon t = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
+ Pager<TaxonDescription> p = descriptionService.getTaxonDescriptions(t, null, null, null, null, TAXONDESCRIPTION_INIT_STRATEGY);\r
return p.getRecords();\r
}\r
\r
* @throws IOException\r
*/\r
@RequestMapping(\r
- value = {"/*/portal/taxon/*/media/*/*"},\r
+ value = {"media/*/*"},\r
method = RequestMethod.GET)\r
- public List<Media> doGetMedia(HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ public List<Media> doGetMedia(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response) throws IOException {\r
logger.info("doGetMedia()" + request.getServletPath());\r
- Taxon t = getCdmBase(request, response, null, Taxon.class);\r
+ Taxon t = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
+ String path = request.getServletPath();\r
+ List<Media> returnMedia = getMediaForTaxon(t, path, 5);\r
+ return returnMedia;\r
+ }\r
+ \r
+ @RequestMapping(\r
+ value = {"subtree/media/*/*"},\r
+ method = RequestMethod.GET)\r
+ public List<Media> doGetSubtreeMedia(@PathVariable("uuid") UUID uuid,\r
+ HttpServletRequest request, HttpServletResponse response)throws IOException {\r
+ logger.info("doGetMedia()" + request.getServletPath());\r
+ Taxon t = getCdmBaseInstance(Taxon.class, uuid, response, TAXON_WITH_NODES_INIT_STRATEGY);\r
+ String path = request.getServletPath();\r
+ List<Media> returnMedia = getMediaForTaxon(t, path, 6);\r
+ TaxonNode node;\r
+ //looking for all medias of genus\r
+ if (t.getTaxonNodes().size()>0){\r
+ Set<TaxonNode> nodes = t.getTaxonNodes();\r
+ Iterator<TaxonNode> iterator = nodes.iterator();\r
+ //TaxonNode holen\r
+ node = iterator.next();\r
+ //überprüfen, ob der TaxonNode zum aktuellen Baum gehört.\r
+ \r
+ node = taxonTreeService.loadTaxonNode(node, TAXONNODE_WITHTAXON_INIT_STRATEGY);\r
+ Set<TaxonNode> children = node.getChildNodes();\r
+ Taxon childTaxon;\r
+ for (TaxonNode child : children){\r
+ childTaxon = child.getTaxon();\r
+ childTaxon = (Taxon)taxonService.load(childTaxon.getUuid(), null);\r
+ returnMedia.addAll(getMediaForTaxon(childTaxon, path, 6));\r
+ }\r
+ }\r
+ return returnMedia;\r
+ }\r
+\r
+ \r
+ private List<Media> getMediaForTaxon(Taxon taxon, String path, int mimeTypeTokenPosition){\r
+ \r
Pager<TaxonDescription> p = \r
- descriptionService.getTaxonDescriptions(t, null, null, null, null, TAXONDESCRIPTION_INIT_STRATEGY);\r
+ descriptionService.getTaxonDescriptions(taxon, null, null, null, null, TAXONDESCRIPTION_MEDIA_INIT_STRATEGY);\r
\r
// pars the media and quality parameters\r
\r
}\r
}\r
}\r
- \r
- // move into media ...\r
- \r
- // find best matching representations of each media\r
- String path = request.getServletPath();\r
+ \r
String[] pathTokens = path.split("/");\r
- String[] mimeTypes = pathTokens[6].split(",");\r
- String[] sizeTokens = pathTokens[7].split(",");\r
+ \r
+ String[] mimeTypes = pathTokens[mimeTypeTokenPosition].split(",");\r
+ String[] sizeTokens = pathTokens[mimeTypeTokenPosition + 1].split(",");\r
Integer widthOrDuration = null;\r
Integer height = null;\r
Integer size = null;\r
\r
- for(int i=0; i<mimeTypes.length; i++){\r
- mimeTypes[i] = mimeTypes[i].replace(':', '/');\r
- }\r
- \r
- if(sizeTokens.length > 0){\r
- try {\r
- size = Integer.valueOf(sizeTokens[0]);\r
- } catch (NumberFormatException nfe) {\r
- /* IGNORE */\r
- }\r
- }\r
- if(sizeTokens.length > 1){\r
- try {\r
- widthOrDuration = Integer.valueOf(sizeTokens[1]);\r
- } catch (NumberFormatException nfe) {\r
- /* IGNORE */\r
- }\r
- }\r
- if(sizeTokens.length > 2){\r
- try {\r
- height = Integer.valueOf(sizeTokens[2]);\r
- } catch (NumberFormatException nfe) {\r
- /* IGNORE */\r
- }\r
- }\r
- \r
- List<Media> returnMedia = new ArrayList<Media>(taxonMedia.size());\r
- for(Media media : taxonMedia){\r
- SortedMap<String, MediaRepresentation> prefRepresentations \r
- = orderMediaRepresentations(media, mimeTypes, size, widthOrDuration, height);\r
- try {\r
- // take first one and remove all other representations\r
- MediaRepresentation prefOne = prefRepresentations.get(prefRepresentations.firstKey());\r
- for (MediaRepresentation representation : media.getRepresentations()) {\r
- if (representation != prefOne) {\r
- media.removeRepresentation(representation);\r
- }\r
- }\r
- returnMedia.add(media);\r
- } catch (NoSuchElementException nse) {\r
- /* IGNORE */\r
- }\r
- }\r
+ List<Media> returnMedia = MediaUtils.findPreferredMedia(taxonMedia, mimeTypes,\r
+ sizeTokens, widthOrDuration, height, size);\r
\r
return returnMedia;\r
}\r
-\r
- /**\r
- * @param media\r
- * @param mimeTypeRegexes\r
- * @param size\r
- * @param widthOrDuration\r
- * @param height\r
- * @return\r
- * \r
- * TODO move into a media utils class\r
- * TODO implement the quality filter \r
- */\r
- private SortedMap<String, MediaRepresentation> orderMediaRepresentations(Media media, String[] mimeTypeRegexes,\r
- Integer size, Integer widthOrDuration, Integer height) {\r
- SortedMap<String, MediaRepresentation> prefRepr = new TreeMap<String, MediaRepresentation>();\r
- for (String mimeTypeRegex : mimeTypeRegexes) {\r
- // getRepresentationByMimeType\r
- Pattern mimeTypePattern = Pattern.compile(mimeTypeRegex);\r
- int representationCnt = 0;\r
- for (MediaRepresentation representation : media.getRepresentations()) {\r
- Matcher mather = mimeTypePattern.matcher(representation.getMimeType());\r
- if (mather.matches()) {\r
- int dwa = 0;\r
-\r
- /* TODO the quality filter part is being skipped \r
- * // look for representation with the best matching parts\r
- for (MediaRepresentationPart part : representation.getParts()) {\r
- if (part instanceof ImageFile) {\r
- ImageFile image = (ImageFile) part;\r
- int dw = image.getWidth() * image.getHeight() - height * widthOrDuration;\r
- if (dw < 0) {\r
- dw *= -1;\r
- }\r
- dwa += dw;\r
- }\r
- dwa = (representation.getParts().size() > 0 ? dwa / representation.getParts().size() : 0);\r
- }*/\r
- prefRepr.put((dwa + representationCnt++) + '_' + representation.getMimeType(), representation);\r
- \r
- // preferred mime type found => end loop\r
- break;\r
- }\r
- }\r
- }\r
- return prefRepr;\r
- }\r
+ \r
\r
// ---------------------- code snippet preserved for possible later use --------------------\r
// @RequestMapping(\r
BGBM BDI Projects / cdmlib.git / blobdiff