(no commit message)
[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / sdd / SDDDescriptionIO.java
index 55cb1c6d3301e1056f36e4b22631d6f9005616ce..4702340781ae208b539645398b1a9125b6f41662 100644 (file)
@@ -1,12 +1,21 @@
+/**\r
+ * Copyright (C) 2007 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r
+\r
 package eu.etaxonomy.cdm.io.sdd;\r
 \r
 import java.io.File;\r
 import java.net.MalformedURLException;\r
+import java.net.URI;\r
 import java.net.URL;\r
 import java.text.SimpleDateFormat;\r
 import java.util.ArrayList;\r
 import java.util.Date;\r
-import java.util.GregorianCalendar;\r
 import java.util.HashMap;\r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
@@ -18,31 +27,43 @@ import org.apache.log4j.Logger;
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 import org.joda.time.DateTime;\r
+import org.springframework.stereotype.Component;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
+import eu.etaxonomy.cdm.api.service.IAgentService;\r
+import eu.etaxonomy.cdm.api.service.IVersionableService;//rajout\r
 import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
 import eu.etaxonomy.cdm.api.service.IReferenceService;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.common.MediaMetaData.ImageMetaData;\r
-import eu.etaxonomy.cdm.io.common.ICdmIO;\r
+import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;\r
+import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
+import eu.etaxonomy.cdm.io.common.ICdmImport;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
-import eu.etaxonomy.cdm.io.common.MapWrapper;\r
+import eu.etaxonomy.cdm.model.agent.Contact;\r
+import eu.etaxonomy.cdm.model.agent.Institution;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
+import eu.etaxonomy.cdm.model.agent.Address;//rajout\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
+import eu.etaxonomy.cdm.model.common.AnnotationType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
+import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
-import eu.etaxonomy.cdm.model.common.OriginalSource;\r
+import eu.etaxonomy.cdm.model.common.Marker;\r
+import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
+import eu.etaxonomy.cdm.model.description.FeatureNode;\r
+import eu.etaxonomy.cdm.model.description.FeatureTree;\r
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;\r
 import eu.etaxonomy.cdm.model.description.QuantitativeData;\r
 import eu.etaxonomy.cdm.model.description.State;\r
@@ -51,39 +72,61 @@ import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
+import eu.etaxonomy.cdm.model.description.Modifier;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;\r
+import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;\r
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;\r
 import eu.etaxonomy.cdm.model.media.Rights;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
-import eu.etaxonomy.cdm.model.reference.Article;\r
-import eu.etaxonomy.cdm.model.reference.Database;\r
-import eu.etaxonomy.cdm.model.reference.Generic;\r
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
+import eu.etaxonomy.cdm.model.reference.IArticle;\r
+import eu.etaxonomy.cdm.model.reference.IDatabase;\r
+import eu.etaxonomy.cdm.model.reference.IGeneric;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-\r
-\r
-public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigurator> {\r
+import eu.etaxonomy.cdm.model.taxon.Synonym;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+\r
+/**\r
+ * @author h.fradin\r
+ * @created 24.10.2008\r
+ * @version 1.0\r
+ */\r
+@Component("sddDescriptionIO")\r
+public class SDDDescriptionIO extends CdmImportBase<SDDImportConfigurator, SDDImportState> implements ICdmImport<SDDImportConfigurator, SDDImportState> {\r
        private static final Logger logger = Logger.getLogger(SDDDescriptionIO.class);\r
 \r
        private static int modCount = 1000;\r
 \r
-       private Map<String,List<CdmBase>> mediaObject_ListCdmBase = new HashMap<String,List<CdmBase>>();\r
-       private Map<String,String> mediaObject_Role = new HashMap<String,String>();\r
-       private Map<String,TaxonDescription> taxonDescriptions = new HashMap<String,TaxonDescription>();\r
-       private Map<String,StateData> stateDatas = new HashMap<String,StateData>();\r
-       private Map<String,MeasurementUnit> units = new HashMap<String,MeasurementUnit>();\r
+       private Map<String,Person> authors = new HashMap<String,Person>();\r
+       private Map<String,String> citations = new HashMap<String,String>();\r
        private Map<String,String> defaultUnitPrefixes = new HashMap<String,String>();\r
+       private Map<String,Person> editors = new HashMap<String,Person>();\r
+       private Map<String,FeatureNode> featureNodes = new HashMap<String,FeatureNode>();\r
        private Map<String,Feature> features = new HashMap<String,Feature>();\r
+       private Map<String,String> locations = new HashMap<String,String>();\r
+       private Map<String,List<CdmBase>> mediaObject_ListCdmBase = new HashMap<String,List<CdmBase>>();\r
+       private Map<String,String> mediaObject_Role = new HashMap<String,String>();\r
+       private Map<String,FeatureNode> nodes = new HashMap<String,FeatureNode>();\r
        private Map<String,ReferenceBase> publications = new HashMap<String,ReferenceBase>();\r
-       private Map<String,Person> authors = new HashMap<String,Person>();\r
-       private Map<String,Person> editors = new HashMap<String,Person>();\r
+       private Map<String,StateData> stateDatas = new HashMap<String,StateData>();\r
+       private Map<String,TaxonDescription> taxonDescriptions = new HashMap<String,TaxonDescription>();\r
        private Map<String,NonViralName> taxonNameBases = new HashMap<String,NonViralName>();\r
-       private Map<String,String> citations = new HashMap<String,String>();\r
-       private Map<String,String> locations = new HashMap<String,String>();\r
-\r
-       private ReferenceBase sec = Database.NewInstance();\r
+       private Map<String,MeasurementUnit> units = new HashMap<String,MeasurementUnit>();\r
+       private Map<String,TaxonNode> taxonNodes = new HashMap<String,TaxonNode>();\r
+       private Map<String,NamedArea> namedAreas = new HashMap<String,NamedArea>();\r
+       private Map<String,Specimen> specimens = new HashMap<String,Specimen>();\r
+\r
+       private Set<AnnotationType> annotationTypes = new HashSet<AnnotationType>();\r
+       private Set<Feature> featureSet = new HashSet<Feature>();\r
+       ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
+       private ReferenceBase sec = refFactory.newDatabase();\r
        private ReferenceBase sourceReference = null;\r
 \r
        private Language datasetLanguage = null;\r
@@ -95,25 +138,32 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
 \r
        private Set<StatisticalMeasure> statisticalMeasures = new HashSet<StatisticalMeasure>();\r
        private Set<VersionableEntity> featureData = new HashSet<VersionableEntity>();\r
+       private Set<FeatureTree> featureTrees = new HashSet<FeatureTree>();\r
+       private Set<TaxonomicTree> taxonomicTrees = new HashSet<TaxonomicTree>();\r
 \r
        private Rights copyright = null;\r
 \r
+       private int taxonNamesCount = 0; //XIM ajout\r
+       \r
+       \r
        public SDDDescriptionIO(){\r
                super();\r
        }\r
 \r
        @Override\r
-       public boolean doCheck(IImportConfigurator config){\r
+       public boolean doCheck(SDDImportState state){\r
                boolean result = true;\r
                logger.warn("No check implemented for SDD");\r
                return result;\r
        }\r
 \r
+       //      @Override\r
+       //      public boolean doInvoke(IImportConfigurator config, Map<String, MapWrapper<? extends CdmBase>> stores){\r
        @Override\r
-       public boolean doInvoke(IImportConfigurator config, Map<String, MapWrapper<? extends CdmBase>> stores){\r
+       public boolean doInvoke(SDDImportState state){\r
 \r
                TransactionStatus ts = startTransaction();\r
-               SDDImportConfigurator sddConfig = (SDDImportConfigurator)config;\r
+               SDDImportConfigurator sddConfig = state.getConfig();\r
 \r
                logger.info("start Datasets ...");\r
                // <Datasets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://rs.tdwg.org/UBIF/2006/" xsi:schemaLocation="http://rs.tdwg.org/UBIF/2006/ ../SDD.xsd">\r
@@ -141,7 +191,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
         */\r
-       protected boolean isIgnore(IImportConfigurator config){\r
+       protected boolean isIgnore(SDDImportState state){\r
                return false;\r
        }\r
 \r
@@ -179,6 +229,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
 \r
                if (detail != null) {\r
                        Annotation annotation = Annotation.NewInstance(detail, datasetLanguage);\r
+                       annotation.setAnnotationType(AnnotationType.EDITORIAL());\r
                        sec.addAnnotation(annotation);\r
                }\r
 \r
@@ -205,38 +256,108 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
        protected void importRepresentation(Element parent, Namespace sddNamespace, VersionableEntity ve, String id, IImportConfigurator config){\r
                Element elRepresentation = parent.getChild("Representation",sddNamespace);\r
                // <Label xml:lang="la">Viola hederacea Labill.</Label>\r
-               Element elLabel = elRepresentation.getChild("Label",sddNamespace);\r
-               Element elDetail = elRepresentation.getChild("Detail",sddNamespace);\r
-               String lang = elLabel.getAttributeValue("lang",xmlNamespace);\r
-               Language language = null;\r
-               if (lang != null) {\r
-                       if (!lang.equals("")) {\r
-                               language = getTermService().getLanguageByIso(lang.substring(0, 2));\r
+               List<Element> listLabels = elRepresentation.getChildren("Label",sddNamespace);\r
+               List<Element> listDetails = elRepresentation.getChildren("Detail",sddNamespace);\r
+               Map<Language,List<String>> langLabDet = new HashMap<Language,List<String>>();\r
+\r
+               for (Element elLabel : listLabels){\r
+                       String lang = elLabel.getAttributeValue("lang",xmlNamespace);\r
+                       Language language = null;\r
+                       if (lang != null) {\r
+                               if (!lang.equals("")) {\r
+                                       language = getTermService().getLanguageByIso(lang.substring(0, 2));\r
+                               } else {\r
+                                       language = datasetLanguage;\r
+                               }\r
                        } else {\r
                                language = datasetLanguage;\r
                        }\r
-               } else {\r
-                       language = datasetLanguage;\r
+                       String label = elLabel.getText();\r
+                       List<String> labDet = new ArrayList<String>(3);\r
+                       labDet.add(label);\r
+                       langLabDet.put(language, labDet);\r
                }\r
-               String label = (String)ImportHelper.getXmlInputValue(elRepresentation, "Label",sddNamespace);\r
-               String detail = (String)ImportHelper.getXmlInputValue(elRepresentation, "Detail",sddNamespace);\r
 \r
-               if ((lang != null) && (!lang.equals("la")) && (ve instanceof NonViralName))  {\r
-                       logger.info("TaxonName " + label + " is not specified as a latin name.");\r
+               for (Element elDetail : listDetails){\r
+                       String lang = elDetail.getAttributeValue("lang",xmlNamespace);\r
+                       String role = elDetail.getAttributeValue("role");\r
+                       Language language = null;\r
+                       if (lang != null) {\r
+                               if (!lang.equals("")) {\r
+                                       language = getTermService().getLanguageByIso(lang.substring(0, 2));\r
+                               } else {\r
+                                       language = datasetLanguage;\r
+                               }\r
+                       } else {\r
+                               language = datasetLanguage;\r
+                       }\r
+                       String detail = elDetail.getText();\r
+                       List<String> labDet = langLabDet.get(language);\r
+                       labDet.add(detail);\r
+                       labDet.add(role);\r
+                       langLabDet.put(language, labDet);\r
                }\r
 \r
+               if (ve instanceof TermBase) {\r
+                       TermBase tb = (TermBase) ve;\r
+\r
+                       for (Iterator<Language> l = langLabDet.keySet().iterator() ; l.hasNext() ;){\r
+                               Language lang = l.next();\r
+                               List<String> labDet = langLabDet.get(lang);\r
+                               if (labDet.size()>0){\r
+                                       if (labDet.size()>1) {\r
+                                               tb.addRepresentation(Representation.NewInstance(labDet.get(1), labDet.get(0), labDet.get(0), lang));\r
+                                       } else {\r
+                                               tb.addRepresentation(Representation.NewInstance(labDet.get(0), labDet.get(0), labDet.get(0), lang));\r
+                                       }\r
+                               }\r
+                               ve = tb;\r
+                       }\r
+\r
+               } else if (ve instanceof Media) {\r
+                       Media m = (Media) ve;\r
+\r
+                       for (Iterator<Language> l = langLabDet.keySet().iterator() ; l.hasNext() ;){\r
+                               Language lang = l.next();\r
+                               List<String> labDet = langLabDet.get(lang);\r
+                               if (labDet.get(0) != null){\r
+                                       m.addTitle(LanguageString.NewInstance(labDet.get(0), lang));\r
+                               }\r
+                               if (labDet.size()>1) {\r
+                                       m.addDescription(labDet.get(1), lang);\r
+                               }\r
+                               ve = m;\r
+                       }\r
+\r
+               } \r
+               //XIM else if\r
                if (ve instanceof IdentifiableEntity) {\r
                        IdentifiableEntity ie = (IdentifiableEntity) ve;\r
-                       ie.setTitleCache(label);\r
+                       List<String> labDet = null;\r
+\r
+                       if (ve instanceof TaxonNameBase) {\r
+                               if (langLabDet.keySet().contains(getTermService().getLanguageByIso("la"))) {\r
+                                       labDet = langLabDet.get(getTermService().getLanguageByIso("la"));\r
+                               } else if (langLabDet.keySet().contains(datasetLanguage)) {\r
+                                       labDet = langLabDet.get(datasetLanguage);\r
+                                       logger.info("TaxonName " + (String)ImportHelper.getXmlInputValue(elRepresentation, "Label",sddNamespace) + " is not specified as a latin name.");\r
+                               } else {\r
+                                       labDet = langLabDet.get(langLabDet.keySet().iterator().next());\r
+                                       logger.info("TaxonName " + (String)ImportHelper.getXmlInputValue(elRepresentation, "Label",sddNamespace) + " is not specified as a latin name.");\r
+                               }\r
+                       } else {\r
+                               labDet = langLabDet.get(langLabDet.keySet().iterator().next());\r
+                       }\r
+\r
+                       ie.setTitleCache(labDet.get(0));\r
 \r
-                       if (elDetail != null) {\r
-                               String role = elDetail.getAttributeValue("role");\r
+                       if (labDet.size()>1) {\r
                                Annotation annotation = null;\r
-                               if (detail != null) {\r
-                                       if (role != null) {\r
-                                               annotation = Annotation.NewInstance(role + " - " + detail, language);\r
+                               if (labDet.get(1) != null) {\r
+                                       if (labDet.get(2) != null) {\r
+                                               annotation = Annotation.NewInstance(labDet.get(2) + " - " + labDet.get(1), datasetLanguage);\r
                                        } else {\r
-                                               annotation = Annotation.NewInstance(detail, language);\r
+                                               annotation = Annotation.NewInstance(labDet.get(1), datasetLanguage);\r
                                        }\r
                                }\r
                                ie.addAnnotation(annotation);\r
@@ -244,21 +365,43 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
 \r
                        ve = ie;\r
 \r
-               } else if (ve instanceof TermBase) {\r
-                       TermBase tb = (TermBase) ve;\r
+               }\r
+               \r
+               if (ve instanceof IdentifiableMediaEntity){\r
+                       IdentifiableMediaEntity ime = (IdentifiableMediaEntity) ve;\r
+                       Element elLinks = parent.getChild("Links",sddNamespace);\r
+\r
+                       if (elLinks != null) {\r
+\r
+                               //  <Link rel="Alternate" href="http://www.diversitycampus.net/people/hagedorn"/>\r
+                               List<Element> listLinks = elLinks.getChildren("Link", sddNamespace);\r
+                               Media link = Media.NewInstance();\r
+                               MediaRepresentation mr = MediaRepresentation.NewInstance();\r
+                               int k = 0;\r
+                               //for each Link\r
+                               for (Element elLink : listLinks){\r
+\r
+                                       try {\r
+\r
+                                               String rel = elLink.getAttributeValue("rel");\r
+                                               String href = elLink.getAttributeValue("href");\r
+\r
+                                               mr.addRepresentationPart(MediaRepresentationPart.NewInstance(href, null));\r
+                                               link.addRepresentation(mr);\r
+                                               ime.addMedia(link);\r
+\r
+                                       } catch (Exception e) {\r
+                                               //FIXME\r
+                                               logger.warn("Import of Link " + k + " failed.");\r
+                                       }\r
+\r
+                                       if ((++k % modCount) == 0){ logger.info("Links handled: " + k);}\r
 \r
-                       if (label != null){\r
-                               if (detail != null) {\r
-                                       tb.addRepresentation(Representation.NewInstance(detail, label, label, language));\r
-                               } else {\r
-                                       tb.addRepresentation(Representation.NewInstance(label, label, label, language));\r
                                }\r
                        }\r
-                       ve = tb;\r
                }\r
 \r
                List <Element> listMediaObjects = elRepresentation.getChildren("MediaObject",sddNamespace);\r
-\r
                for (Element elMediaObject : listMediaObjects) {\r
                        String ref = null;\r
                        String role = null;\r
@@ -275,11 +418,12 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                        if (td.getDescriptionSources().toArray().length > 0) {\r
                                                                this.associateImageWithCdmBase(ref,(ReferenceBase) td.getDescriptionSources().toArray()[0]);\r
                                                        } else {\r
-                                                               ReferenceBase descriptionSource = Generic.NewInstance();\r
+                                                               ReferenceBase descriptionSource = refFactory.newGeneric();\r
                                                                td.addDescriptionSource(descriptionSource);\r
                                                                this.associateImageWithCdmBase(ref,descriptionSource);\r
                                                        }\r
                                                } else {\r
+                                                       //System.out.println(parent.getName());\r
                                                        this.associateImageWithCdmBase(ref,ve);\r
                                                }\r
                                        }\r
@@ -289,6 +433,24 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                }\r
 \r
        }\r
+       \r
+       protected void importGeographicAreas(Element elDataset, Namespace sddNamespace, SDDImportConfigurator sddConfig) {\r
+               Element elGeographicAreas = elDataset.getChild("GeographicAreas",sddNamespace);\r
+               if (elGeographicAreas != null) {\r
+                       List<Element> listGeographicAreas = elGeographicAreas.getChildren("GeographicArea", sddNamespace);\r
+                       int j = 0;\r
+                       \r
+                       for (Element elGeographicArea : listGeographicAreas){\r
+\r
+                               String id = elGeographicArea.getAttributeValue("id");\r
+                               NamedArea na = new NamedArea();\r
+                               importRepresentation(elGeographicArea, sddNamespace, na, id, sddConfig);\r
+                               namedAreas.put(id,na);\r
+                       }\r
+                       if ((++j % modCount) == 0){ logger.info("TaxonNames handled: " + j);}\r
+               }\r
+       }\r
+       \r
 \r
        // imports the representation (label, detail, lang) of a particular SDD element\r
        protected void importTechnicalMetadata(Element root, Namespace sddNamespace, SDDImportConfigurator sddConfig){\r
@@ -314,7 +476,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                Element elGenerator = elTechnicalMetadata.getChild("Generator", sddNamespace);\r
                generatorName = elGenerator.getAttributeValue("name");\r
                generatorVersion = elGenerator.getAttributeValue("version");\r
-               \r
+\r
                sec.addAnnotation(Annotation.NewDefaultLanguageInstance(generatorName + " - " + generatorVersion));\r
                sourceReference.addAnnotation(Annotation.NewDefaultLanguageInstance(generatorName + " - " + generatorVersion));\r
 \r
@@ -328,89 +490,146 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                importRevisionData(elDataset, sddNamespace);\r
                importIPRStatements(elDataset, sddNamespace, sddConfig);\r
                importTaxonNames(elDataset, sddNamespace, sddConfig);\r
+               importDescriptiveConcepts(elDataset, sddNamespace, sddConfig);\r
                importCharacters(elDataset, sddNamespace, sddConfig, success);\r
+               importCharacterTrees(elDataset, sddNamespace, sddConfig, success);\r
                importCodedDescriptions(elDataset, sddNamespace, sddConfig, success);\r
                importAgents(elDataset, sddNamespace, sddConfig, success);\r
                importPublications(elDataset, sddNamespace, sddConfig, success);\r
                importMediaObjects(elDataset, sddNamespace, sddConfig, success);\r
-\r
+               importTaxonHierarchies(elDataset, sddNamespace, sddConfig, success);\r
+               importGeographicAreas(elDataset, sddNamespace, sddConfig);\r
+               importSpecimens(elDataset,sddNamespace, sddConfig);\r
+                       \r
+               MarkerType editou = MarkerType.NewInstance("Editor", "editor", "edt") ;\r
                if (authors != null) {\r
                        Team team = Team.NewInstance();\r
                        for (Iterator<Person> author = authors.values().iterator() ; author.hasNext() ;){\r
                                team.addTeamMember(author.next());\r
                        }\r
+                       if (editors != null) {\r
+                               Marker marker = Marker.NewInstance();\r
+                               marker.setMarkerType(editou);\r
+                               for (Iterator<Person> editor = editors.values().iterator() ; editor.hasNext() ;){\r
+                                       Person edit = editor.next();\r
+                                       edit.addMarker(marker);\r
+                                       team.addTeamMember(edit);\r
+                               }\r
+                               }\r
                        sec.setAuthorTeam(team);\r
                        sourceReference.setAuthorTeam(team);\r
                }\r
-\r
+               \r
                if (editors != null) {\r
                        Person ed = Person.NewInstance();\r
                        for (Iterator<Person> editor = editors.values().iterator() ; editor.hasNext() ;){\r
                                ed = editor.next();\r
                        }\r
-                       sec.setUpdatedBy(ed);\r
-                       sourceReference.setUpdatedBy(ed);\r
+                       // TODO updatedBy refactored to use a user account, so setting a person is no longer applicable\r
+                       //                      sec.setUpdatedBy(ed);\r
+                       //                      sourceReference.setUpdatedBy(ed);\r
                }\r
 \r
                if (copyright != null) {\r
                        sourceReference.addRights(copyright);\r
                        sec.addRights(copyright);\r
                }\r
+               \r
+               // Returns a CdmApplicationController created by the values of this configuration.\r
+               IDescriptionService descriptionService = getDescriptionService();\r
 \r
+               for (Iterator<TaxonDescription> k = taxonDescriptions.values().iterator() ; k.hasNext() ;){\r
+                       TaxonDescription taxonDescription = k.next();\r
+                       // Persists a Description\r
+                       descriptionService.save(taxonDescription);\r
+               }\r
+\r
+               //descriptionService.saveFeatureNodeAll(featureNodes.values());\r
+               \r
                for (Iterator<String> refCD = taxonDescriptions.keySet().iterator() ; refCD.hasNext() ;){\r
                        String ref = refCD.next();\r
                        TaxonDescription td = taxonDescriptions.get(ref);\r
-                       td.addDescriptionSource(sec);\r
+                       //XIM BUG ONAFILE td.addDescriptionSource(sec);\r
                        if (citations.containsKey(ref)) {\r
-                               Article publication = (Article) publications.get(citations.get(ref));\r
+                               IArticle publication = (IArticle) publications.get(citations.get(ref));\r
                                if (locations.containsKey(ref)) {\r
-                                       publication.addAnnotation(Annotation.NewInstance(locations.get(ref), datasetLanguage));\r
+                                       Annotation location = Annotation.NewInstance(locations.get(ref), datasetLanguage);\r
+                                       AnnotationType annotationType = AnnotationType.NewInstance("", "location", "");\r
+                                       annotationTypes.add(annotationType);\r
+                                       location.setAnnotationType(annotationType);\r
+                                       ((ReferenceBase)publication).addAnnotation(location);\r
                                }\r
-                               td.addDescriptionSource(publication);\r
+                               td.addDescriptionSource((ReferenceBase)publication);\r
                        }\r
                }\r
                logger.info("end makeTaxonDescriptions ...");\r
 \r
-               sddConfig.setSourceReference(sourceReference);\r
-               \r
+               //sddConfig.setSourceReference(sourceReference);\r
+\r
                //saving of all imported data into the CDM db\r
-               ITermService termService = sddConfig.getCdmAppController().getTermService();\r
+               ITermService termService = getTermService();\r
                for (Iterator<StateData> k = stateDatas.values().iterator() ; k.hasNext() ;){\r
                        StateData sd = k.next();\r
-                       termService.saveTerm(sd.getState()); \r
+                       termService.save(sd.getState()); \r
                }\r
                for (Iterator<Feature> k = features.values().iterator() ; k.hasNext() ;){\r
                        Feature feature = k.next();\r
-                       termService.saveTerm(feature); \r
+                       termService.save(feature); \r
                }\r
+               \r
+               \r
+               termService.save(editou);\r
+               \r
+               MarkerType sddGeographicArea = MarkerType.NewInstance("", "SDDGeographicArea", "");\r
+               termService.save(sddGeographicArea);\r
+               for (Iterator<NamedArea> k = namedAreas.values().iterator() ; k.hasNext() ;) {\r
+                       Marker areamarker = Marker.NewInstance();\r
+                       areamarker.setMarkerType(sddGeographicArea);\r
+                       NamedArea area = k.next();\r
+                       area.addMarker(areamarker);\r
+                       getTermService().save(area);\r
+               }               \r
+               \r
                if (units != null) {\r
                        for (Iterator<MeasurementUnit> k = units.values().iterator() ; k.hasNext() ;){\r
                                MeasurementUnit unit = k.next();\r
                                if (unit != null) {\r
-                                       termService.saveTerm(unit); \r
+                                       termService.save(unit); \r
                                }\r
                        }\r
                }\r
                for (Iterator<StatisticalMeasure> k = statisticalMeasures.iterator() ; k.hasNext() ;) {\r
                        StatisticalMeasure sm = k.next();\r
-                       termService.saveTerm(sm); \r
+                       termService.save(sm); \r
+               }\r
+\r
+               for (Iterator<AnnotationType> at = annotationTypes.iterator() ; at.hasNext() ;) {\r
+                       AnnotationType annotationType = at.next();\r
+                       termService.save(annotationType); \r
                }\r
 \r
-               IReferenceService referenceService = sddConfig.getCdmAppController().getReferenceService();\r
+               IReferenceService referenceService = getReferenceService();\r
                // referenceService.saveReference(sourceReference); \r
                for (Iterator<ReferenceBase> k = publications.values().iterator() ; k.hasNext() ;){\r
-                       Article publication = (Article) k.next();\r
-                       referenceService.saveReference(publication); \r
+                       ReferenceBase publication = (ReferenceBase) k.next();\r
+                       referenceService.save(publication); \r
                }\r
 \r
-               // Returns a CdmApplicationController created by the values of this configuration.\r
-               IDescriptionService descriptionService = sddConfig.getCdmAppController().getDescriptionService();\r
-\r
-               for (Iterator<TaxonDescription> k = taxonDescriptions.values().iterator() ; k.hasNext() ;){\r
-                       TaxonDescription taxonDescription = k.next();\r
-                       // Persists a Description\r
-                       descriptionService.saveDescription(taxonDescription); \r
+               for (Iterator<FeatureTree> k = featureTrees.iterator() ; k.hasNext() ;) {\r
+                       FeatureTree tree = k.next();\r
+                       getFeatureTreeService().save(tree);\r
+               }\r
+               \r
+               for (Iterator<TaxonomicTree> k = taxonomicTrees.iterator() ; k.hasNext() ;) {\r
+                       TaxonomicTree tree = k.next();\r
+                       getTaxonTreeService().save(tree);\r
                }\r
+               \r
+               for (Iterator<Specimen> k = specimens.values().iterator() ; k.hasNext() ;) {\r
+                       Specimen specimen = k.next();\r
+                       getOccurrenceService().save(specimen);\r
+               }\r
+\r
        }\r
 \r
        // imports the default language of the dataset\r
@@ -419,7 +638,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
 \r
                if (!nameLang.equals("")) {\r
                        String iso = nameLang.substring(0, 2);\r
-                       datasetLanguage = sddConfig.getCdmAppController().getTermService().getLanguageByIso(iso);\r
+                       datasetLanguage = getTermService().getLanguageByIso(iso);\r
                } else {\r
                        datasetLanguage = Language.ENGLISH();\r
                }\r
@@ -427,59 +646,82 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                        datasetLanguage = Language.ENGLISH();\r
                }\r
        }\r
+       \r
+       protected void importSpecimens(Element elDataset, Namespace sddNamespace, SDDImportConfigurator sddConfig) {\r
+               logger.info("start Specimens ...");\r
+               Element elSpecimens = elDataset.getChild("Specimens",sddNamespace);\r
+               if (elSpecimens != null){\r
+                       List<Element> listSpecimens = elSpecimens.getChildren("Specimen", sddNamespace);\r
+                       int j = 0;\r
+                       for (Element elSpecimen : listSpecimens) {\r
+                               String id = elSpecimen.getAttributeValue("id");\r
+                               Specimen speci = null;\r
+                               if (!id.equals("")) {\r
+                                       speci = Specimen.NewInstance();\r
+                                       specimens.put(id,speci);\r
+                                       importRepresentation(elSpecimen, sddNamespace, speci, id, sddConfig);\r
+                               }\r
+                       }\r
+                       \r
+               }\r
+       }\r
+\r
+       \r
 \r
+       \r
+       \r
+       \r
        // imports the revision data associated with the Dataset (authors, modifications)\r
        protected void importRevisionData(Element elDataset, Namespace sddNamespace){\r
                // <RevisionData>\r
                logger.info("start RevisionData ...");\r
                Element elRevisionData = elDataset.getChild("RevisionData",sddNamespace);\r
-\r
-               // <Creators>\r
-               Element elCreators = elRevisionData.getChild("Creators",sddNamespace);\r
-\r
-               // <Agent role="aut" ref="a1"/>\r
-               List<Element> listAgents = elCreators.getChildren("Agent", sddNamespace);\r
-\r
-               int j = 0;\r
-               //for each Agent\r
-               for (Element elAgent : listAgents){\r
-\r
-                       String role = elAgent.getAttributeValue("role");\r
-                       String ref = elAgent.getAttributeValue("ref");\r
-                       if (role.equals("aut")) {\r
-                               if(!ref.equals("")) {\r
-                                       authors.put(ref, null);\r
+               if (elRevisionData != null){\r
+                       // <Creators>\r
+                       Element elCreators = elRevisionData.getChild("Creators",sddNamespace);\r
+       \r
+                       // <Agent role="aut" ref="a1"/>\r
+                       List<Element> listAgents = elCreators.getChildren("Agent", sddNamespace);\r
+       \r
+                       int j = 0;\r
+                       //for each Agent\r
+                       for (Element elAgent : listAgents){\r
+       \r
+                               String role = elAgent.getAttributeValue("role");\r
+                               String ref = elAgent.getAttributeValue("ref");\r
+                               if (role.equals("aut")) {\r
+                                       if(!ref.equals("")) {\r
+                                               authors.put(ref, null);\r
+                                       }\r
                                }\r
-                       }\r
-                       if (role.equals("edt")) {\r
-                               if(!ref.equals("")) {\r
-                                       editors.put(ref, null);\r
+                               if (role.equals("edt")) {\r
+                                       if(!ref.equals("")) {\r
+                                               editors.put(ref, null);\r
+                                       }\r
                                }\r
+                               if ((++j % modCount) == 0){ logger.info("Agents handled: " + j);}\r
+       \r
                        }\r
-\r
-                       if ((++j % modCount) == 0){ logger.info("Agents handled: " + j);}\r
-\r
-               }\r
-\r
-               // <DateModified>2006-04-08T00:00:00</DateModified>\r
-               String stringDateModified = (String)ImportHelper.getXmlInputValue(elRevisionData, "DateModified",sddNamespace);\r
-\r
-               if (stringDateModified != null) {\r
-                       SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss");\r
-                       Date d = null;\r
-                       try {\r
-                               d = sdf.parse(stringDateModified);\r
-                       } catch(Exception e) {\r
-                               System.err.println("Exception :");\r
-                               e.printStackTrace();\r
-                       }\r
-\r
-                       GregorianCalendar updated = null;\r
-                       if (d != null) {\r
-                               updated = new java.util.GregorianCalendar();\r
-                               updated.setTime(d);\r
-                               sourceReference.setUpdated(updated);\r
-                               sec.setUpdated(updated);\r
+       \r
+                       // <DateModified>2006-04-08T00:00:00</DateModified>\r
+                       String stringDateModified = (String)ImportHelper.getXmlInputValue(elRevisionData, "DateModified",sddNamespace);\r
+       \r
+                       if (stringDateModified != null) {\r
+                               SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss");\r
+                               Date d = null;\r
+                               try {\r
+                                       d = sdf.parse(stringDateModified);\r
+                               } catch(Exception e) {\r
+                                       System.err.println("Exception :");\r
+                                       e.printStackTrace();\r
+                               }\r
+       \r
+                               DateTime updated = null;\r
+                               if (d != null) {\r
+                                       updated = new DateTime(d);\r
+                                       sourceReference.setUpdated(updated);\r
+                                       sec.setUpdated(updated);\r
+                               }\r
                        }\r
                }\r
        }\r
@@ -510,7 +752,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        Language iprLanguage = null;\r
                                        if (lang != null) {\r
                                                if (!lang.equals("")) {\r
-                                                       iprLanguage = sddConfig.getCdmAppController().getTermService().getLanguageByIso(lang.substring(0, 2));\r
+                                                       iprLanguage = getTermService().getLanguageByIso(lang.substring(0, 2));\r
                                                        //iprLanguage = datasetLanguage;\r
                                                } else {\r
                                                        iprLanguage = datasetLanguage;\r
@@ -551,13 +793,13 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                NonViralName tnb = null;\r
                                if (!id.equals("")) {\r
                                        tnb = NonViralName.NewInstance(null);\r
-                                       OriginalSource source = null;\r
+                                       IdentifiableSource source = null;\r
                                        if (uri != null) {\r
                                                if (!uri.equals("")) {\r
-                                                       source = OriginalSource.NewInstance(id, "TaxonName", Generic.NewInstance(), uri);\r
+                                                       source = IdentifiableSource.NewInstance(id, "TaxonName", refFactory.newGeneric(), uri);\r
                                                }\r
                                        } else {\r
-                                               source = OriginalSource.NewInstance(id, "TaxonName");\r
+                                               source = IdentifiableSource.NewInstance(id, "TaxonName");\r
                                        }\r
                                        tnb.addSource(source);\r
                                        taxonNameBases.put(id,tnb);\r
@@ -585,7 +827,6 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                        int j = 0;\r
                        //for each CategoricalCharacter\r
                        for (Element elCategoricalCharacter : elCategoricalCharacters){\r
-\r
                                try {\r
 \r
                                        String idCC = elCategoricalCharacter.getAttributeValue("id");\r
@@ -595,10 +836,10 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        // </Representation>\r
 \r
                                        Feature categoricalCharacter = Feature.NewInstance();\r
+                                       categoricalCharacter.setKindOf(Feature.DESCRIPTION());\r
                                        importRepresentation(elCategoricalCharacter, sddNamespace, categoricalCharacter, idCC, sddConfig);\r
 \r
-                                       categoricalCharacter.setSupportsQuantitativeData(false);\r
-                                       categoricalCharacter.setSupportsTextData(true);\r
+                                       categoricalCharacter.setSupportsCategoricalData(true);\r
 \r
                                        // <States>\r
                                        Element elStates = elCategoricalCharacter.getChild("States",sddNamespace);\r
@@ -606,7 +847,6 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        // <StateDefinition id="s1">\r
                                        List<Element> elStateDefinitions = elStates.getChildren("StateDefinition",sddNamespace);\r
                                        TermVocabulary<State> termVocabularyState = new TermVocabulary<State>();\r
-\r
                                        int k = 0;\r
                                        //for each StateDefinition\r
                                        for (Element elStateDefinition : elStateDefinitions){\r
@@ -626,7 +866,6 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                termVocabularyState.addTerm(state);\r
                                                stateDatas.put(idSD,stateData);\r
                                        }\r
-\r
                                        categoricalCharacter.addSupportedCategoricalEnumeration(termVocabularyState);\r
                                        features.put(idCC, categoricalCharacter);\r
 \r
@@ -654,10 +893,10 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        //  <Label>Leaf length</Label>\r
                                        // </Representation>\r
                                        Feature quantitativeCharacter = Feature.NewInstance();\r
+                                       quantitativeCharacter.setKindOf(Feature.DESCRIPTION());\r
                                        importRepresentation(elQuantitativeCharacter, sddNamespace, quantitativeCharacter, idQC, sddConfig);\r
 \r
                                        quantitativeCharacter.setSupportsQuantitativeData(true);\r
-                                       quantitativeCharacter.setSupportsTextData(false);\r
 \r
                                        // <MeasurementUnit>\r
                                        //  <Label role="Abbrev">m</Label>\r
@@ -723,9 +962,9 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        //  <Label xml:lang="en">Leaf features not covered by other characters</Label>\r
                                        // </Representation>\r
                                        Feature textCharacter = Feature.NewInstance();\r
+                                       textCharacter.setKindOf(Feature.DESCRIPTION());\r
                                        importRepresentation(elTextCharacter, sddNamespace, textCharacter, idTC, sddConfig);\r
 \r
-                                       textCharacter.setSupportsQuantitativeData(false);\r
                                        textCharacter.setSupportsTextData(true);\r
 \r
                                        features.put(idTC, textCharacter);\r
@@ -741,6 +980,11 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                        }\r
 \r
                }\r
+\r
+               for (Iterator<Feature> f = features.values().iterator() ; f.hasNext() ;){\r
+                       featureSet.add(f.next());\r
+               }\r
+\r
        }\r
 \r
        // imports the descriptions of taxa (specimens TODO)\r
@@ -782,6 +1026,16 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                NonViralName taxonNameBase = taxonNameBases.get(ref);\r
                                                taxon = Taxon.NewInstance(taxonNameBase, sec);\r
                                        }\r
+                                       else {\r
+                                               NonViralName tnb = NonViralName.NewInstance(null);\r
+                                               String id = new String(""+taxonNamesCount);\r
+                                               IdentifiableSource source = IdentifiableSource.NewInstance(id, "TaxonName");\r
+                                               importRepresentation(elCodedDescription, sddNamespace, tnb, id, sddConfig);\r
+                                               tnb.addSource(source);\r
+                                               taxonNameBases.put(id ,tnb);\r
+                                               taxonNamesCount++;\r
+                                               taxon = Taxon.NewInstance(tnb, sec);\r
+                                       }\r
 \r
                                        String refCitation = "";\r
                                        String location = "";\r
@@ -804,7 +1058,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                int k = 0;\r
                                                //for each Categorical\r
                                                for (Element elCategorical : elCategoricals){\r
-                                                       if ((++k % modCount) == 0){ logger.info("Categorical handled: " + (k-1));}\r
+                                                       if ((++k % modCount) == 0){ logger.warn("Categorical handled: " + (k-1));}\r
                                                        ref = elCategorical.getAttributeValue("ref");\r
                                                        Feature feature = features.get(ref);\r
                                                        CategoricalData categoricalData = CategoricalData.NewInstance();\r
@@ -828,7 +1082,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                k = 0;\r
                                                //for each Quantitative\r
                                                for (Element elQuantitative : elQuantitatives){\r
-                                                       if ((++k % modCount) == 0){ logger.info("Quantitative handled: " + (k-1));}\r
+                                                       if ((++k % modCount) == 0){ logger.warn("Quantitative handled: " + (k-1));}\r
                                                        ref = elQuantitative.getAttributeValue("ref");\r
                                                        Feature feature = features.get(ref);\r
                                                        QuantitativeData quantitativeData = QuantitativeData.NewInstance();\r
@@ -848,12 +1102,17 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                        // <Measure type="Min" value="2.3"/>\r
                                                        List<Element> elMeasures = elQuantitative.getChildren("Measure", sddNamespace);\r
                                                        int l = 0;\r
+                                                       \r
                                                        //for each State\r
                                                        for (Element elMeasure : elMeasures){\r
                                                                if ((++l % modCount) == 0){ logger.info("States handled: " + (l-1));}\r
                                                                String type = elMeasure.getAttributeValue("type");\r
                                                                String value = elMeasure.getAttributeValue("value");\r
-                                                               float v = Float.parseFloat(value);\r
+                                                               if (value.contains(",")) {\r
+                                                                       value = value.replace(',', '.');\r
+                                                               }\r
+                                                               Float v = Float.parseFloat(value);\r
+                                                               //Float v = new Float(0);\r
                                                                StatisticalMeasure t = null;\r
                                                                if (type.equals("Min")) {\r
                                                                        t = StatisticalMeasure.MIN();\r
@@ -862,10 +1121,15 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                                } else if (type.equals("Max")) {\r
                                                                        t = StatisticalMeasure.MAX();\r
                                                                } else if (type.equals("SD")) {\r
-                                                                       // Create a new StatisticalMeasure for standard deviation\r
                                                                        t = StatisticalMeasure.STANDARD_DEVIATION();\r
                                                                } else if (type.equals("N")) {\r
                                                                        t = StatisticalMeasure.SAMPLE_SIZE();\r
+                                                               } else if (type.equals("UMethLower")) {\r
+                                                                       t = StatisticalMeasure.TYPICAL_LOWER_BOUNDARY();\r
+                                                               } else if (type.equals("UMethUpper")) {\r
+                                                                       t = StatisticalMeasure.TYPICAL_UPPER_BOUNDARY();\r
+                                                               } else if (type.equals("Var")) {\r
+                                                                       t = StatisticalMeasure.VARIANCE();\r
                                                                } else {\r
                                                                        t = StatisticalMeasure.NewInstance(type,type,type);\r
                                                                        statisticalMeasures.add(t);\r
@@ -910,8 +1174,10 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        if (!location.equals("")){\r
                                                locations.put(idCD, location);\r
                                        }\r
+                                       \r
+                                       taxonDescription.setDescriptiveSystem(featureSet);\r
 \r
-                                       taxonDescriptions.put(idCD, taxonDescription);\r
+                                       taxonDescriptions.put(idCD, taxonDescription);//XIM PB ici\r
 \r
                                } catch (Exception e) {\r
                                        //FIXME\r
@@ -931,73 +1197,75 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                // <Agents>\r
                logger.info("start Agents ...");\r
                Element elAgents = elDataset.getChild("Agents",sddNamespace);\r
+               if (elAgents != null) {\r
+                       // <Agent id="a1">\r
+                       List <Element> listAgents = elAgents.getChildren("Agent", sddNamespace);\r
+                       int j = 0;\r
+                       //for each Agent\r
+                       for (Element elAgent : listAgents){\r
 \r
-               // <Agent id="a1">\r
-               List <Element> listAgents = elAgents.getChildren("Agent", sddNamespace);\r
-               int j = 0;\r
-               //for each Agent\r
-               for (Element elAgent : listAgents){\r
+                               try {\r
 \r
-                       try {\r
+                                       String idA = elAgent.getAttributeValue("id");\r
 \r
-                               String idA = elAgent.getAttributeValue("id");\r
+                                       //  <Representation>\r
+                                       //   <Label>Kevin Thiele</Label>\r
+                                       //   <Detail role="Description">Ali Baba is also known as r.a.m.</Detail>\r
+                                       //  </Representation>\r
+                                       Person person = Person.NewInstance();\r
+                                       importRepresentation(elAgent, sddNamespace, person, idA, sddConfig);\r
+                                       person.addSource(IdentifiableSource.NewInstance(idA, "Agent"));\r
 \r
-                               //  <Representation>\r
-                               //   <Label>Kevin Thiele</Label>\r
-                               //   <Detail role="Description">Ali Baba is also known as r.a.m.</Detail>\r
-                               //  </Representation>\r
-                               Person person = Person.NewInstance();\r
-                               importRepresentation(elAgent, sddNamespace, person, idA, sddConfig);\r
-                               person.addSource(OriginalSource.NewInstance(idA, "Agent"));\r
+                                       /*XIM <Links>\r
+                                       Element elLinks = elAgent.getChild("Links",sddNamespace);\r
 \r
-                               // <Links>\r
-                               Element elLinks = elAgent.getChild("Links",sddNamespace);\r
+                                       if (elLinks != null) {\r
 \r
-                               if (elLinks != null) {\r
+                                               //  <Link rel="Alternate" href="http://www.diversitycampus.net/people/hagedorn"/>\r
+                                               List<Element> listLinks = elLinks.getChildren("Link", sddNamespace);\r
+                                               int k = 0;\r
+                                               //for each Link\r
+                                               for (Element elLink : listLinks){\r
 \r
-                                       //  <Link rel="Alternate" href="http://www.diversitycampus.net/people/hagedorn"/>\r
-                                       List<Element> listLinks = elLinks.getChildren("Link", sddNamespace);\r
-                                       int k = 0;\r
-                                       //for each Link\r
-                                       for (Element elLink : listLinks){\r
+                                                       try {\r
 \r
-                                               try {\r
+                                                               String rel = elLink.getAttributeValue("rel");\r
+                                                               String href = elLink.getAttributeValue("href");\r
 \r
-                                                       String rel = elLink.getAttributeValue("rel");\r
-                                                       String href = elLink.getAttributeValue("href");\r
+                                                               Media link = Media.NewInstance();\r
+                                                               MediaRepresentation mr = MediaRepresentation.NewInstance();\r
+                                                               mr.addRepresentationPart(MediaRepresentationPart.NewInstance(href, null));\r
+                                                               link.addRepresentation(mr);\r
+                                                               person.addMedia(link);\r
 \r
-                                                       Media link = Media.NewInstance();\r
-                                                       MediaRepresentation mr = MediaRepresentation.NewInstance();\r
-                                                       mr.addRepresentationPart(MediaRepresentationPart.NewInstance(href, null));\r
-                                                       link.addRepresentation(mr);\r
-                                                       person.addMedia(link);\r
+                                                       } catch (Exception e) {\r
+                                                               //FIXME\r
+                                                               logger.warn("Import of Link " + k + " failed.");\r
+                                                               success = false; \r
+                                                       }\r
 \r
-                                               } catch (Exception e) {\r
-                                                       //FIXME\r
-                                                       logger.warn("Import of Link " + k + " failed.");\r
-                                                       success = false; \r
-                                               }\r
+                                                       if ((++k % modCount) == 0){ logger.info("Links handled: " + k);}\r
 \r
-                                               if ((++k % modCount) == 0){ logger.info("Links handled: " + k);}\r
+                                               }\r
+                                       }\r
+                                       */\r
+                                       if (authors.containsKey(idA)) {\r
+                                               authors.put(idA,person);\r
+                                       }\r
 \r
+                                       if (editors.containsKey(idA)) {\r
+                                               editors.put(idA, person);\r
                                        }\r
-                               }\r
-                               if (authors.containsKey(idA)) {\r
-                                       authors.put(idA,person);\r
-                               }\r
 \r
-                               if (editors.containsKey(idA)) {\r
-                                       editors.put(idA, person);\r
+                               } catch (Exception e) {\r
+                                       //FIXME\r
+                                       logger.warn("Import of Agent " + j + " failed.");\r
+                                       success = false; \r
                                }\r
 \r
-                       } catch (Exception e) {\r
-                               //FIXME\r
-                               logger.warn("Import of Agent " + j + " failed.");\r
-                               success = false; \r
-                       }\r
-\r
-                       if ((++j % modCount) == 0){ logger.info("Agents handled: " + j);}\r
+                               if ((++j % modCount) == 0){ logger.info("Agents handled: " + j);}\r
 \r
+                       }\r
                }\r
        }\r
 \r
@@ -1021,7 +1289,7 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                        //  <Representation>\r
                                        //   <Label>Sample Citation</Label>\r
                                        //  </Representation>\r
-                                       Article publication = Article.NewInstance();\r
+                                       ReferenceBase publication = refFactory.newArticle();\r
                                        importRepresentation(elPublication, sddNamespace, publication, idP, sddConfig);\r
 \r
                                        publications.put(idP,publication);\r
@@ -1051,9 +1319,11 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                        //for each Publication\r
                        for (Element elMO : listMediaObjects){\r
 \r
-                               try {\r
+                               String id = "";\r
 \r
+                               try {\r
                                        String idMO = elMO.getAttributeValue("id");\r
+                                       id = idMO;\r
 \r
                                        //  <Representation>\r
                                        //   <Label>Image description, e.g. to be used for alt-attribute in html.</Label>\r
@@ -1069,13 +1339,13 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                Element elSource = elMO.getChild("Source",sddNamespace);\r
                                                String href = elSource.getAttributeValue("href");\r
 \r
-                                               ImageMetaData imageMetaData = new ImageMetaData();\r
+                                               ImageMetaData imageMetaData = ImageMetaData.newInstance();\r
                                                ImageFile image = null;\r
-\r
                                                if (href.substring(0,7).equals("http://")) {\r
                                                        try{\r
                                                                URL url = new URL(href);\r
-                                                               imageMetaData.readFrom(url);\r
+                                                               \r
+                                                               imageMetaData.readMetaData(url.toURI(), 0);\r
                                                                image = ImageFile.NewInstance(url.toString(), null, imageMetaData);\r
                                                        } catch (MalformedURLException e) {\r
                                                                logger.error("Malformed URL", e);\r
@@ -1084,12 +1354,12 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                        String sns = sddConfig.getSourceNameString();\r
                                                        File f = new File(sns);\r
                                                        File parent = f.getParentFile();\r
-                                                       String fi = parent.toString() + File.separator + href;\r
+                                                       String fi = href;\r
+                                                       //XIMString fi = parent.toString() + File.separator + href; enlever le file:/ ou truc du genre\r
                                                        File file = new File(fi);\r
-                                                       imageMetaData.readFrom(file);\r
+                                                       imageMetaData.readMetaData(file.toURI(), 0);\r
                                                        image = ImageFile.NewInstance(file.toString(), null, imageMetaData);\r
                                                }\r
-\r
                                                MediaRepresentation representation = MediaRepresentation.NewInstance(imageMetaData.getMimeType(), null);\r
                                                representation.addRepresentationPart(image);\r
 \r
@@ -1102,41 +1372,384 @@ public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigu
                                                                        DefinedTermBase dtb = (DefinedTermBase) lcb.get(k);\r
                                                                        // if (lcb.get(0) instanceof DefinedTermBase) {\r
                                                                        // DefinedTermBase dtb = (DefinedTermBase) lcb.get(0);\r
-                                                                       if (dtb!=null) {\r
-                                                                               if (k == 0) {\r
-                                                                                       dtb.addMedia(media);\r
-                                                                               } else {\r
-                                                                                       Media me = (Media) media.clone();\r
-                                                                                       dtb.addMedia(me);\r
-                                                                               }\r
-                                                                       }\r
+                                                                       //                                                                      if (dtb!=null) {\r
+                                                                       //                                                                              if (k == 0) {\r
+                                                                       dtb.addMedia(media);\r
+                                                                       //System.out.println(dtb.getLabel());\r
+                                                                       //                                                                              } else {\r
+                                                                       //                                                                                      Media me = (Media) media.clone();\r
+                                                                       //                                                                                      dtb.addMedia(me);\r
+                                                                       //                                                                              }\r
+                                                                       //                                                                      }\r
                                                                } else if (lcb.get(k) instanceof ReferenceBase) {\r
                                                                        ReferenceBase rb = (ReferenceBase) lcb.get(k);\r
                                                                        //} else if (lcb.get(0) instanceof ReferenceBase) {\r
                                                                        //ReferenceBase rb = (ReferenceBase) lcb.get(0);\r
                                                                        // rb.setTitleCache(label);\r
-                                                                       if (rb!=null) {\r
-                                                                               if (k == 0) {\r
-                                                                                       rb.addMedia(media);\r
-                                                                               } else {\r
-                                                                                       Media me = (Media) media.clone();\r
-                                                                                       rb.addMedia(me);\r
+                                                                       //                                                                      if (rb!=null) {\r
+                                                                       //                                                                              if (k == 0) {\r
+                                                                       rb.addMedia(media);\r
+                                                                       //System.out.println(rb.getTitle());\r
+                                                                       //                                                                              } else {\r
+                                                                       //                                                                                      Media me = (Media) media.clone();\r
+                                                                       //                                                                                      rb.addMedia(me);\r
+                                                                       //                                                                              }\r
+                                                                       //                                                                      }\r
+                                                               }/* else if (lcb.get(k) instanceof TaxonNameBase){\r
+                                                                       TaxonNameBase tb = (TaxonNameBase) lcb.get(k);\r
+                                                                       tb.addMedia(media);\r
+                                                       }*/\r
+                                                       }\r
+                                               }\r
+                                       }\r
+\r
+                               } catch (Exception e) {\r
+                                       //FIXME\r
+                                       logger.warn("Could not attach MediaObject " + j + "(SDD: " + id + ") to several objects.");\r
+                                       success = false; \r
+                               }\r
+\r
+                               if ((++j % modCount) == 0){ logger.info("MediaObjects handled: " + j);\r
+\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       // imports the <DescriptiveConcepts> block\r
+       protected void importDescriptiveConcepts(Element elDataset, Namespace sddNamespace, SDDImportConfigurator sddConfig){\r
+               // <DescriptiveConcepts>\r
+               logger.info("start DescriptiveConcepts ...");\r
+               Element elDescriptiveConcepts = elDataset.getChild("DescriptiveConcepts",sddNamespace);\r
+               // <DescriptiveConcept id="b">\r
+               if (elDescriptiveConcepts != null) {\r
+                       List<Element> listDescriptiveConcepts = elDescriptiveConcepts.getChildren("DescriptiveConcept", sddNamespace);\r
+                       int j = 0;\r
+                       //for each DescriptiveConcept\r
+                       int g = 1;\r
+\r
+                       for (Element elDescriptiveConcept : listDescriptiveConcepts){\r
+\r
+                               String id = elDescriptiveConcept.getAttributeValue("id");\r
+                               String uri = elDescriptiveConcept.getAttributeValue("uri");\r
+\r
+                               FeatureNode fn = null;\r
+\r
+                               if (!id.equals("")) {\r
+                                       fn = FeatureNode.NewInstance();\r
+                                       Feature feature = Feature.NewInstance();\r
+                                       feature.setKindOf(Feature.DESCRIPTION());\r
+                                       //       <Representation>\r
+                                       //       <Label>Body</Label>\r
+                                       importRepresentation(elDescriptiveConcept, sddNamespace, feature, id, sddConfig);\r
+                                       //System.out.println(feature.getLabel()+id);\r
+                                       features.put("g" + g, feature);\r
+                                       g++;\r
+                                       /*Element elModifiers = elDescriptiveConcept.getChild("Modifiers", sddNamespace);\r
+                                       if (elModifiers !=null){\r
+                                               List<Element> listModifiers = elModifiers.getChildren("Modifier", sddNamespace);\r
+                                               for (Element elModifier : listModifiers) {\r
+                                                               TermVocabulary<Modifier> termVocabularyState = new TermVocabulary<Modifier>("test","test","test","test");\r
+                                                               Modifier modif = Modifier.NewInstance();\r
+                                                               String idmod = elModifier.getAttributeValue("id");\r
+                                                               importRepresentation(elModifier, sddNamespace, modif, idmod, sddConfig);\r
+                                                               termVocabularyState.addTerm(modif);\r
+                                                               //XIMfeature.addRecommendedModifierEnumeration(termVocabularyState);\r
+                                               }\r
+                                       }*/\r
+                                       \r
+                                       fn.setFeature(feature);\r
+\r
+                                       //      TODO if an OriginalSource can be attached to a FeatureNode or a Feature         \r
+                                       //                                      OriginalSource source = null;\r
+                                       //                                      if (uri != null) {\r
+                                       //                                              if (!uri.equals("")) {\r
+                                       //                                                      source = OriginalSource.NewInstance(id, "DescriptiveConcept", Generic.NewInstance(), uri);\r
+                                       //                                              }\r
+                                       //                                      } else {\r
+                                       //                                              source = OriginalSource.NewInstance(id, "DescriptiveConcept");\r
+                                       //                                      }\r
+                                       //                                      f.addSource(source);\r
+\r
+                                       featureNodes.put(id,fn);\r
+                               }\r
+\r
+                               if ((++j % modCount) == 0){ logger.info("DescriptiveConcepts handled: " + j);}\r
+\r
+                       }\r
+               }\r
+       }\r
+       \r
+       protected void importCharacterTrees(Element elDataset, Namespace sddNamespace, SDDImportConfigurator sddConfig, boolean success){\r
+               // <CharacterTrees>\r
+               logger.info("start CharacterTrees ...");\r
+               Element elCharacterTrees = elDataset.getChild("CharacterTrees",sddNamespace);\r
+\r
+               // <CharacterTree>\r
+\r
+               if (elCharacterTrees != null) {\r
+                       List<Element> listCharacterTrees = elCharacterTrees.getChildren("CharacterTree", sddNamespace);\r
+                       int j = 0;\r
+                       //for each CharacterTree\r
+                       for (Element elCharacterTree : listCharacterTrees){\r
+                               try {\r
+                                       Element elRepresentation = elCharacterTree.getChild("Representation",sddNamespace);\r
+                                       String label = (String)ImportHelper.getXmlInputValue(elRepresentation,"Label",sddNamespace);\r
+                                       Element elDesignedFor = elCharacterTree.getChild("DesignedFor",sddNamespace);\r
+                                       /*XIMList<Element> listRoles = elDesignedFor.getChildren("Role",sddNamespace);\r
+                                       boolean isgroups = false;\r
+\r
+                                       for (Element elRole : listRoles){\r
+                                               if (elRole.getText().equals("Filtering")) {\r
+                                                       isgroups = true;\r
+                                               }\r
+                                       }*/\r
+\r
+                                       // only treats the case of flat groups containing characters\r
+                                       // should also be added: dependencies between characters, \r
+                                       //XIM\r
+\r
+                                               FeatureTree feattree =  FeatureTree.NewInstance();\r
+                                               importRepresentation(elCharacterTree, sddNamespace, feattree, "", sddConfig);\r
+                                               FeatureNode root = feattree.getRoot();\r
+                                               //XIM several <Nodes> found in some files, is it correct ?\r
+                                               List<Element> listelNodes = elCharacterTree.getChildren("Nodes", sddNamespace);\r
+                                               for (Element elNodes : listelNodes) {\r
+                                                       List<Element> listNodes = elNodes.getChildren("Node", sddNamespace);\r
+                                                       if (listNodes != null) {\r
+                                                               for (Element elNode : listNodes){\r
+                                                                       String idN = elNode.getAttributeValue("id");\r
+                                                                       FeatureNode fn = null;\r
+                                                                       if (!idN.equals("")) {\r
+                                                                               Element elDescriptiveConcept = elNode.getChild("DescriptiveConcept", sddNamespace);\r
+                                                                               if (elDescriptiveConcept != null){\r
+                                                                                       String refDC = elDescriptiveConcept.getAttributeValue("ref");\r
+                                                                                       //System.out.println(refDC);\r
+                                                                                       fn = featureNodes.get(refDC);\r
+                                                                               }\r
+                                                                               else {\r
+                                                                                       fn = FeatureNode.NewInstance();\r
+                                                                                       featureNodes.put(idN,fn);\r
+                                                                               }\r
+                                                                               Element elParent = elNode.getChild("Parent", sddNamespace);\r
+                                                                               if (elParent!=null){\r
+                                                                                       String refP = elParent.getAttributeValue("ref");\r
+                                                                                       if (!refP.equals("")) {\r
+                                                                                               FeatureNode parent = nodes.get(refP);\r
+                                                                                               parent.addChild(fn);\r
+                                                                                       }\r
+                                                                               }\r
+                                                                               else {\r
+                                                                                       fn = FeatureNode.NewInstance();\r
+                                                                                       root.addChild(fn);\r
+                                                                               }\r
+                                                                       }\r
+                                                                       nodes.put(idN, fn);\r
+                                                               }\r
+                                                               //System.out.println("zic");\r
+                                                               List<Element> listCharNodes = elNodes.getChildren("CharNode", sddNamespace);\r
+                                                               for (Element elCharNode : listCharNodes){\r
+                                                                       Element elParent = elCharNode.getChild("Parent", sddNamespace);\r
+                                                                       Element elCharacter = elCharNode.getChild("Character", sddNamespace);                                                   \r
+                                                                       FeatureNode fn = FeatureNode.NewInstance();\r
+                                                                       if (elParent!=null){\r
+                                                                               String refP = elParent.getAttributeValue("ref");\r
+                                                                               if ((refP!=null)&&(!refP.equals(""))) {\r
+                                                                                       FeatureNode parent = nodes.get(refP);\r
+                                                                                       if (parent==null){\r
+                                                                                               parent = root; // because of Delta example\r
+                                                                                       }\r
+                                                                                       parent.addChild(fn);\r
                                                                                }\r
                                                                        }\r
+                                                                       String refC = elCharacter.getAttributeValue("ref");\r
+                                                                       if ((refC!=null)&&(!refC.equals(""))){\r
+                                                                               Feature character = features.get(refC);\r
+                                                                               fn.setFeature(character);\r
+                                                                               // if method setParent() in FeatureNode becomes visible\r
+                                                                               // fn.setParent(parent);\r
+                                                                       }\r
+                                                                       else {\r
+                                                                               refC = String.valueOf(taxonNamesCount);\r
+                                                                               taxonNamesCount++;\r
+                                                                       }\r
+                                                                       nodes.put(refC, fn);\r
+                                                               }\r
+                                                       }\r
+                                               }\r
+                                               featureTrees.add(feattree);\r
+                                       }\r
+\r
+                               catch (Exception e) {\r
+                                       //FIXME\r
+                                       logger.warn("Import of Character tree " + j + " failed.");\r
+                                       success = false; \r
+                               }\r
+\r
+                               if ((++j % modCount) == 0){ logger.info("CharacterTrees handled: " + j);}\r
+\r
+                       }\r
+\r
+               }\r
+       }\r
+\r
+       \r
+       \r
+       \r
+       \r
+       protected void importTaxonHierarchies(Element elDataset, Namespace sddNamespace, SDDImportConfigurator sddConfig, boolean success){\r
+\r
+               logger.info("start TaxonHierarchies ...");\r
+               Element elTaxonHierarchies = elDataset.getChild("TaxonHierarchies",sddNamespace);\r
+\r
+               if (elTaxonHierarchies != null) {\r
+                       List<Element> listTaxonHierarchies = elTaxonHierarchies.getChildren("TaxonHierarchy", sddNamespace);\r
+                       int j = 0;\r
+                       for (Element elTaxonHierarchy : listTaxonHierarchies){\r
+                               try {\r
+                                       Element elRepresentation = elTaxonHierarchy.getChild("Representation",sddNamespace);\r
+                                       String label = (String)ImportHelper.getXmlInputValue(elRepresentation,"Label",sddNamespace);\r
+\r
+                                               TaxonomicTree taxonomicTree =  TaxonomicTree.NewInstance(label);\r
+                                               importRepresentation(elTaxonHierarchy, sddNamespace, taxonomicTree, "", sddConfig);\r
+                                               Set<TaxonNode> root = taxonomicTree.getRootNodes();\r
+                                               Element elNodes = elTaxonHierarchy.getChild("Nodes", sddNamespace);\r
+                                               List<Element> listNodes = elNodes.getChildren("Node", sddNamespace);\r
+                                               for (Element elNode : listNodes){\r
+                                                       String idN = elNode.getAttributeValue("id");\r
+                                                       TaxonNameBase tnb = null;\r
+                                                       if (!idN.equals("")) {\r
+                                                               Element elTaxonName = elNode.getChild("TaxonName", sddNamespace);\r
+                                                               String refTN = elTaxonName.getAttributeValue("ref");\r
+                                                               tnb = taxonNameBases.get(refTN);\r
+                                                               Taxon taxonou = (Taxon) tnb.getTaxa().iterator().next() ;\r
+                                                               Element elParent = elNode.getChild("Parent", sddNamespace);\r
+                                                               if (elParent!=null){\r
+                                                                       String refP = elParent.getAttributeValue("ref");\r
+                                                                       if (!refP.equals("")) {\r
+                                                                               TaxonNode parent = taxonNodes.get(refP);\r
+                                                                               //TaxonNode child = parent.addChildTaxon(Taxon.NewInstance(tnb, sec), sec, "", Synonym.NewInstance(tnb, sec));\r
+                                                                               TaxonNode child = parent.addChildTaxon(taxonou, sec, "", Synonym.NewInstance(tnb, sec));\r
+                                                                               taxonNodes.put(idN,child);\r
+                                                                       }\r
+                                                               }\r
+                                                               else {\r
+                                                                       //XIM addChildtaxon (taxon, referencebase ???\r
+                                                                       //TaxonNode tn = taxonomicTree.addChildTaxon(Taxon.NewInstance(tnb, sec), sec, "", Synonym.NewInstance(tnb, sec));\r
+                                                                       TaxonNode tn = taxonomicTree.addChildTaxon(taxonou, sec, "", Synonym.NewInstance(tnb, sec));\r
+                                                                       taxonNodes.put(idN,tn);\r
                                                                }\r
                                                        }\r
                                                }\r
+\r
+                                               taxonomicTrees.add(taxonomicTree);\r
+                                       }\r
+\r
+                               catch (Exception e) {\r
+                                       //FIXME\r
+                                       logger.warn("Import of Taxon Hierarchy " + j + " failed.");\r
+                                       success = false; \r
+                               }\r
+\r
+                               if ((++j % modCount) == 0){ logger.info("TaxonHierarchies handled: " + j);}\r
+\r
+                       }\r
+\r
+               }\r
+       }\r
+       \r
+       \r
+       \r
+       \r
+       \r
+       \r
+       \r
+       \r
+       \r
+       // imports the descriptions of taxa (specimens TODO)\r
+       protected void importCharacterTrees2(Element elDataset, Namespace sddNamespace, SDDImportConfigurator sddConfig, boolean success){\r
+               // <CharacterTrees>\r
+               logger.info("start CharacterTrees ...");\r
+               Element elCharacterTrees = elDataset.getChild("CharacterTrees",sddNamespace);\r
+\r
+               // <CharacterTree>\r
+\r
+               if (elCharacterTrees != null) {\r
+                       List<Element> listCharacterTrees = elCharacterTrees.getChildren("CharacterTree", sddNamespace);\r
+                       int j = 0;\r
+                       //for each CharacterTree\r
+                       for (Element elCharacterTree : listCharacterTrees){\r
+\r
+                               try {\r
+                                       Element elRepresentation = elCharacterTree.getChild("Representation",sddNamespace);\r
+                                       String label = (String)ImportHelper.getXmlInputValue(elRepresentation,"Label",sddNamespace);\r
+                                       Element elDesignedFor = elCharacterTree.getChild("DesignedFor",sddNamespace);\r
+                                       List<Element> listRoles = elDesignedFor.getChildren("Role",sddNamespace);\r
+                                       boolean isgroups = false;\r
+\r
+                                       for (Element elRole : listRoles){\r
+                                               if (elRole.getText().equals("Filtering")) {\r
+                                                       isgroups = true;\r
+                                               }\r
+                                       }\r
+\r
+                                       // only treats the case of flat groups containing characters\r
+                                       // should also be added: dependencies between characters, \r
+                                       //XIM\r
+                                       if ((label.contains("group")) || (isgroups) || (1==1)) {\r
+\r
+                                               FeatureTree groups =  FeatureTree.NewInstance();\r
+                                               importRepresentation(elCharacterTree, sddNamespace, groups, "", sddConfig);\r
+                                               FeatureNode root = groups.getRoot();\r
+                                               \r
+                                               Element elNodes = elCharacterTree.getChild("Nodes", sddNamespace);\r
+                                               List<Element> listNodes = elNodes.getChildren("Node", sddNamespace);\r
+                                               for (Element elNode : listNodes){\r
+                                                       String idN = elNode.getAttributeValue("id");\r
+                                                       FeatureNode fn = null;\r
+                                                       if (!idN.equals("")) {\r
+                                                               Element elDescriptiveConcept = elNode.getChild("DescriptiveConcept", sddNamespace);\r
+                                                               String refDC = elDescriptiveConcept.getAttributeValue("ref");\r
+                                                               fn = featureNodes.get(refDC);\r
+                                                               root.addChild(fn);\r
+                                                       }\r
+                                                       nodes.put(idN, fn);\r
+                                               }\r
+\r
+                                               List<Element> listCharNodes = elNodes.getChildren("CharNode", sddNamespace);\r
+                                               for (Element elCharNode : listCharNodes){\r
+                                                       Element elParent = elCharNode.getChild("Parent", sddNamespace);\r
+                                                       Element elCharacter = elCharNode.getChild("Character", sddNamespace);                                                   \r
+                                                       FeatureNode fn = FeatureNode.NewInstance();\r
+                                                       if (elParent!=null){\r
+                                                               String refP = elParent.getAttributeValue("ref");\r
+                                                               if (!refP.equals("")) {\r
+                                                                       FeatureNode parent = nodes.get(refP);\r
+                                                                       parent.addChild(fn);\r
+                                                               }\r
+                                                       }\r
+                                                       String refC = elCharacter.getAttributeValue("ref");\r
+                                                       if (!refC.equals("")){\r
+                                                               Feature character = features.get(refC);\r
+                                                               fn.setFeature(character);\r
+                                                               // if method setParent() in FeatureNode becomes visible\r
+                                                               // fn.setParent(parent);\r
+                                                       }\r
+                                                       nodes.put(refC, fn);\r
+                                               }\r
+                                               featureTrees.add(groups);\r
                                        }\r
 \r
                                } catch (Exception e) {\r
                                        //FIXME\r
-                                       logger.warn("Import of MediaObject " + j + " failed.");\r
+                                       logger.warn("Import of Character tree " + j + " failed.");\r
                                        success = false; \r
                                }\r
 \r
-                               if ((++j % modCount) == 0){ logger.info("MediaObjects handled: " + j);}\r
+                               if ((++j % modCount) == 0){ logger.info("CharacterTrees handled: " + j);}\r
 \r
                        }\r
+\r
                }\r
        }\r
 }\r