(no commit message)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteRecordsImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteRecordsImport.java
index 544624c700fc1fbf5fd81d53f9fdb3eb2aa9cc8b..978cbdda6a6f4f2137fe1a27011eebeff747751b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteRecordsImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteRecordsImport.java
@@ -5,24 +5,22 @@
 *\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
 * 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

 \r
 \r

-*//**\r
+/**\r

  * This is EndNote import format\r
  * \r
  * EndNote is a commercial reference management software package, \r
  * used to manage bibliographies and references when writing essays and articles.\r
  * This is EndNote import format\r
  * \r
  * EndNote is a commercial reference management software package, \r
  * used to manage bibliographies and references when writing essays and articles.\r

- *//*\r
+ */\r

 package eu.etaxonomy.cdm.io.reference.endnote.in;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 package eu.etaxonomy.cdm.io.reference.endnote.in;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r

-import java.util.Iterator;\r

 import java.util.List;\r
 import java.util.Map;\r
 \r
 import org.apache.log4j.Logger;\r
 import java.util.List;\r
 import java.util.Map;\r
 \r
 import org.apache.log4j.Logger;\r

-import org.hibernate.ejb.packaging.XmlHelper;\r

 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 import org.springframework.stereotype.Component;\r
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 import org.springframework.stereotype.Component;\r


@@ -36,8 +34,6 @@ import eu.etaxonomy.cdm.io.common.MapWrapper;
 import eu.etaxonomy.cdm.model.agent.Address;\r
 import eu.etaxonomy.cdm.model.agent.Contact;\r
 import eu.etaxonomy.cdm.model.agent.Institution;\r
 import eu.etaxonomy.cdm.model.agent.Address;\r
 import eu.etaxonomy.cdm.model.agent.Contact;\r
 import eu.etaxonomy.cdm.model.agent.Institution;\r

-import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;\r
-import eu.etaxonomy.cdm.model.agent.Person;\r

 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r


@@ -62,10 +58,10 @@ import eu.etaxonomy.cdm.model.reference.IReport;
 import eu.etaxonomy.cdm.model.reference.IThesis;\r
 import eu.etaxonomy.cdm.model.reference.IWebPage;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 import eu.etaxonomy.cdm.model.reference.IThesis;\r
 import eu.etaxonomy.cdm.model.reference.IWebPage;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r

-*//**\r
+/**\r

  * @author a.bukhman\r
  *\r
  * @author a.bukhman\r
  *\r

- *//*\r
+ */\r

 @Component\r
 public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<EndnoteImportState> {\r
        private static final Logger logger = Logger.getLogger(EndnoteRecordsImport.class);\r
 @Component\r
 public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<EndnoteImportState> {\r
        private static final Logger logger = Logger.getLogger(EndnoteRecordsImport.class);\r


@@ -128,7 +124,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
            String tcsElementName = "record";\r
                String idNamespace = "record";\r
                List<Element> elRecordList = (List<Element>)elRecords.getChildren(tcsElementName, tcsNamespace);\r
            String tcsElementName = "record";\r
                String idNamespace = "record";\r
                List<Element> elRecordList = (List<Element>)elRecords.getChildren(tcsElementName, tcsNamespace);\r

-               ReferenceBase reference ;       \r
+               ReferenceBase reference = null; \r

                TeamOrPersonBase<?> author = null;\r
                IPrintedUnitBase printedUnitBase = null;\r
                \r
                TeamOrPersonBase<?> author = null;\r
                IPrintedUnitBase printedUnitBase = null;\r
                \r


@@ -140,7 +136,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                        List<String> elementList = new ArrayList<String>();\r
                        //create Record element\r
                        IPublicationBase publicationBase = null;                        \r
                        List<String> elementList = new ArrayList<String>();\r
                        //create Record element\r
                        IPublicationBase publicationBase = null;                        \r

-                       //CdmBase cdmBase = null;   \r
+                       CdmBase cdmBase = null;   \r

                        \r
                        ReferenceBase article = refFactory.newArticle();                                \r
                        ReferenceBase book = refFactory.newBook();\r
                        \r
                        ReferenceBase article = refFactory.newArticle();                                \r
                        ReferenceBase book = refFactory.newBook();\r


@@ -156,7 +152,6 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                        ReferenceBase database = refFactory.newDatabase();\r
                        ReferenceBase report = refFactory.newReport();\r
                        ReferenceBase webPage = refFactory.newWebPage();\r
                        ReferenceBase database = refFactory.newDatabase();\r
                        ReferenceBase report = refFactory.newReport();\r
                        ReferenceBase webPage = refFactory.newWebPage();\r

-                       \r

                        Institution school = Institution.NewInstance();\r
                        Team authorTeam = Team.NewInstance();            \r
                        \r
                        Institution school = Institution.NewInstance();\r
                        Team authorTeam = Team.NewInstance();            \r
                        \r


@@ -165,7 +160,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                        obligatory = false;\r
                        doubleResult = XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r
                        success &= doubleResult.getSecondResult();\r
                        obligatory = false;\r
                        doubleResult = XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r
                        success &= doubleResult.getSecondResult();\r

-                       Element elDatabase = doubleResult.getFirstResult();\r
+                       Element elDatabase = new Element ("database");\r

                                                \r
                        if (elDatabase != null) {\r
                        \r
                                                \r
                        if (elDatabase != null) {\r
                        \r


@@ -185,7 +180,22 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strVersion = elSource_app.getAttributeValue("version");\r
                        }\r
                \r
                                String strVersion = elSource_app.getAttributeValue("version");\r
                        }\r
                \r

+                       logger.info("start make rec-number ...");\r
+                       childName = "rec-number";\r
+                       obligatory = false;\r
+                       doubleResult =  XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r
+                       success &= doubleResult.getSecondResult();\r
+                       Element elRec_number = doubleResult.getFirstResult();\r
+                       String nummer = elRec_number.getTextNormalize(); \r
+                       int num = Integer.parseInt(nummer);\r

                \r
                \r

+                       if (cdmBase != null) {  \r
+                               reference.setId(num);\r
+                               cdmBase.setId(num);\r
+                       } else {\r
+                               logger.warn("The type was not found...");\r
+                               success = false;\r
+                       }\r

                                \r
                        logger.info("start make foreign-keys ...");\r
                        childName = "foreign-keys";\r
                                \r
                        logger.info("start make foreign-keys ...");\r
                        childName = "foreign-keys";\r


@@ -212,54 +222,44 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                        success &= doubleResult.getSecondResult();\r
                        Element elRef_type = doubleResult.getFirstResult();\r
                        \r
                        success &= doubleResult.getSecondResult();\r
                        Element elRef_type = doubleResult.getFirstResult();\r
                        \r

-                       \r
-                       //depending on ref_type a new reference object is created\r

                        if (elRef_type != null) {       \r
                                String strName_reftype = elRef_type.getAttributeValue("name");                  \r
                                if (strName_reftype.equals("Article")) {\r
                        if (elRef_type != null) {       \r
                                String strName_reftype = elRef_type.getAttributeValue("name");                  \r
                                if (strName_reftype.equals("Article")) {\r

-                                       reference =  refFactory.newArticle();\r
+                                       reference =  article;\r

                                }else if (strName_reftype.equals("Book")){\r
                                }else if (strName_reftype.equals("Book")){\r

-                                       reference =  refFactory.newBook();\r
+                                       reference =  book;\r

                                }else if (strName_reftype.equals("Book Section")){\r
                                }else if (strName_reftype.equals("Book Section")){\r

-                                       reference =  refFactory.newBookSection();\r
+                                       reference =  bookSection;\r

                                }else if (strName_reftype.equalsIgnoreCase("Patent")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("Patent")) {\r

-                                       reference =  refFactory.newPatent();\r
+                                       reference =  patent;\r

                                }else if (strName_reftype.equalsIgnoreCase("Personal Communication")){\r
                                }else if (strName_reftype.equalsIgnoreCase("Personal Communication")){\r

-                                       reference = refFactory.newPersonalCommunication();\r
+                                       reference = personalCommunication;\r

                                }else if (strName_reftype.equalsIgnoreCase("Journal")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("Journal")) {\r

-                                       reference = refFactory.newJournal();\r
+                                       reference = journal;\r

                                }else if (strName_reftype.equalsIgnoreCase("CdDvd")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("CdDvd")) {\r

-                                       reference = refFactory.newCdDvd();\r
+                                       reference = cdDvd;\r

                                }else if (strName_reftype.equalsIgnoreCase("Database")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("Database")) {\r

-                                       reference = refFactory.newDatabase();\r
+                                       reference = database;\r

                                }else if (strName_reftype.equalsIgnoreCase("WebPage")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("WebPage")) {\r

-                                       reference = refFactory.newWebPage();\r
+                                       reference = webPage;\r

                                }else if (strName_reftype.equalsIgnoreCase("Report")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("Report")) {\r

-                                       reference = refFactory.newReport();\r
+                                       reference = report;\r

                                }else if (strName_reftype.equalsIgnoreCase("Thesis")) {\r
                                }else if (strName_reftype.equalsIgnoreCase("Thesis")) {\r

-                                       reference = refFactory.newThesis();\r
+                                       reference = thesis;\r

                                }else if (strName_reftype.equalsIgnoreCase("Print Series")){\r
                                }else if (strName_reftype.equalsIgnoreCase("Print Series")){\r

-                                       reference = refFactory.newPrintSeries();\r
+                                       reference = printSeries;\r

                                }else if (strName_reftype.equals("Journal Article")){\r
                                }else if (strName_reftype.equals("Journal Article")){\r

-                                       reference = refFactory.newArticle();\r
+                                       reference = article;\r

                                }else if (strName_reftype.equalsIgnoreCase("Conference Proceedings")){\r
                                }else if (strName_reftype.equalsIgnoreCase("Conference Proceedings")){\r

-                                       reference = refFactory.newProceedings();\r
+                                       reference = proceedings;\r
+                               }else if (strName_reftype.equalsIgnoreCase("Web Page")){\r
+                                       reference = webPage;\r

                                }else {\r
                                        logger.warn("The type was not found...");\r
                                }else {\r
                                        logger.warn("The type was not found...");\r

-                                       reference = (ReferenceBase) refFactory.newGeneric();\r
+                                       reference = (ReferenceBase) generic;\r

                                        success = false;\r
                                }                                       \r
                        }\r
                                        success = false;\r
                                }                                       \r
                        }\r

-                       logger.info("start make rec-number ...");\r
-                       childName = "rec-number";\r
-                       obligatory = false;\r
-                       doubleResult =  XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r
-                       success &= doubleResult.getSecondResult();\r
-                       Element elRec_number = doubleResult.getFirstResult();\r
-                       String nummer = elRec_number.getTextNormalize(); \r
-                       int num = Integer.parseInt(nummer);\r
-                       reference.setId(num);\r
-                       \r

                        \r
                        logger.info("start make contributors ...");\r
                        childName = "contributors";\r
                        \r
                        logger.info("start make contributors ...");\r
                        childName = "contributors";\r


@@ -274,38 +274,23 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r
                                success &= doubleResult.getSecondResult();\r
                                Element elAuthors = doubleResult.getFirstResult();\r
                                doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r
                                success &= doubleResult.getSecondResult();\r
                                Element elAuthors = doubleResult.getFirstResult();\r

-                               //maybe there are several authors, so there should be a loop to find all authors??\r
+                       \r

                                if (elAuthors !=null){\r
                                        childName = "author";\r
                                        obligatory = false;\r
                                        doubleResult =  XmlHelp.getSingleChildElement(elAuthors, childName, tcsNamespace, obligatory);\r
                                        success &= doubleResult.getSecondResult();\r
                                if (elAuthors !=null){\r
                                        childName = "author";\r
                                        obligatory = false;\r
                                        doubleResult =  XmlHelp.getSingleChildElement(elAuthors, childName, tcsNamespace, obligatory);\r
                                        success &= doubleResult.getSecondResult();\r

-                                       List<Element> authors;\r
-                                       if (!success && doubleResult.getFirstResult()!= null){\r
-                                               authors = elAuthors.getChildren(childName);\r
-                                       }else{\r
-                                               authors = new ArrayList<Element>();\r
-                                               authors.add(doubleResult.getFirstResult());\r
-                                       }\r
-                                       Person author1;\r
-                                       for (Element elAuthor:authors){\r
-                                               \r
-                                               author1 = Person.NewInstance();\r
-                                               String strCorp_name = elAuthor.getAttributeValue("corp-name");\r
-                                               Institution corp = Institution.NewInstance();\r
-                                               corp.setName(strCorp_name);\r
-                                                                                       \r
-                                               author1.addInstitutionalMembership(corp, null, null, elAuthor.getAttributeValue("role"));\r
-                                               author1.setFirstname(elAuthor.getAttributeValue("first-name"));\r
-                                               // there is no corresponding attribute in cdm\r
+                                       Element elAuthor = doubleResult.getFirstResult();\r
+                                       if (elAuthor!=null) {\r
+                                               String strCorp_name = elAuthor.getAttributeValue("corp-name");                  \r
+                                               String strFirst_name = elAuthor.getAttributeValue("first-name");\r

                                                String strInitials = elAuthor.getAttributeValue("initials");\r
                                                String strInitials = elAuthor.getAttributeValue("initials");\r

-                                               author1.setLastname(elAuthor.getAttributeValue("last-name"));\r
-                                               // there is no corresponding attribute in cdm\r
+                                               String strLast_name = elAuthor.getAttributeValue("last-name");\r

                                                String strMiddle_initial = elAuthor.getAttributeValue("middle-initial");\r
                                                String strMiddle_initial = elAuthor.getAttributeValue("middle-initial");\r

-                                               \r
+                                               String strRole = elAuthor.getAttributeValue("role");\r

                                                String strSalutation = elAuthor.getAttributeValue("salutation");\r
                                                String strSalutation = elAuthor.getAttributeValue("salutation");\r

-                                               author1.setSuffix(elAuthor.getAttributeValue("suffix"));\r
-                                               author1.setTitleCache(elAuthor.getAttributeValue("title"));\r
+                                               String strSuffix = elAuthor.getAttributeValue("suffix");\r
+                                               String strTitle = elAuthor.getAttributeValue("title");\r

                                                \r
                                                childName = "style";\r
                                                obligatory = false;\r
                                                \r
                                                childName = "style";\r
                                                obligatory = false;\r


@@ -319,14 +304,13 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                                        String strFont = elStyle.getAttributeValue("font");\r
                                                        String strSize = elStyle.getAttributeValue("size");\r
                                                        String author_style =  elStyle.getTextNormalize();\r
                                                        String strFont = elStyle.getAttributeValue("font");\r
                                                        String strSize = elStyle.getAttributeValue("size");\r
                                                        String author_style =  elStyle.getTextNormalize();\r

-                                               }\r
-                                               authorTeam.addTeamMember(author1);\r
-                                               \r
+\r
+                                                       reference.setAuthorTeam(authorTeam);\r
+                                                   authorTeam.setNomenclaturalTitle(author_style);                                               \r

                                        }\r
                                        }\r

-                                       reference.setAuthorTeam(authorTeam);\r

                                }\r
                                }\r

-                               \r
-                               logger.info("start make secondary-authors ... there are no secondary authors in cdm, so they will be added to the author team");\r
+                       }       \r
+                               logger.info("start make secondary-authors ...");\r

                                childName = "secondary-authors";\r
                                obligatory = false;\r
                                doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r
                                childName = "secondary-authors";\r
                                obligatory = false;\r
                                doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r


@@ -337,54 +321,148 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        obligatory = false;\r
                                        doubleResult =  XmlHelp.getSingleChildElement(elSecondary_Authors, childName, tcsNamespace, obligatory);\r
                                        success &= doubleResult.getSecondResult();\r
                                        obligatory = false;\r
                                        doubleResult =  XmlHelp.getSingleChildElement(elSecondary_Authors, childName, tcsNamespace, obligatory);\r
                                        success &= doubleResult.getSecondResult();\r

-                                       List<Element> authors;\r
-                                       if (!success && doubleResult.getFirstResult()!= null){\r
-                                               authors = elSecondary_Authors.getChildren(childName);\r
-                                       }else{\r
-                                               authors = new ArrayList<Element>();\r
-                                               authors.add(doubleResult.getFirstResult());\r
+                                       Element elSecondary_Author = doubleResult.getFirstResult();\r
+                                       if (elSecondary_Author != null) {\r
+                                               String strsecondaryCorp_name = elSecondary_Author.getAttributeValue("corp-name");\r
+                                               String strsecondaryFirst_name = elSecondary_Author.getAttributeValue("first-name");\r
+                                               String strsecondaryInitials = elSecondary_Author.getAttributeValue("initials");\r
+                                               String strsecondaryLast_name = elSecondary_Author.getAttributeValue("last-name");\r
+                                               String strsecondaryMiddle_initial = elSecondary_Author.getAttributeValue("middle-initial");\r
+                                               String strsecondaryRole = elSecondary_Author.getAttributeValue("role");\r
+                                               String strsecondarySalutation = elSecondary_Author.getAttributeValue("salutation");\r
+                                               String strsecondarySuffix = elSecondary_Author.getAttributeValue("suffix");\r
+                                               String strsecondaryTitle = elSecondary_Author.getAttributeValue("title");\r
+                       \r
+                                               childName = "style";\r
+                                               obligatory = false;\r
+                                               doubleResult =  XmlHelp.getSingleChildElement(elSecondary_Author, childName, tcsNamespace, obligatory);\r
+                                               success &= doubleResult.getSecondResult();\r
+                                               Element elStyle_secondary = doubleResult.getFirstResult();\r
+                                               if (elStyle_secondary!= null) {\r
+                                                       String strColor_secondary = elStyle_secondary.getAttributeValue("color");\r
+                                                       String strFace_secondary = elStyle_secondary.getAttributeValue("face");\r
+                                                       String strFont_secondary = elStyle_secondary.getAttributeValue("font");\r
+                                                       String strSize_secondary = elStyle_secondary.getAttributeValue("size");\r
+                                                       String  secondary_author=  elStyle_secondary.getTextNormalize();\r
+                                        \r
+                                                       reference.setAuthorTeam(authorTeam);\r
+                                                       authorTeam.setTitleCache(secondary_author);\r
+                                               }\r

                                        }\r
                                        }\r

-                                       Person author1;\r
-                                       for (Element elAuthor:authors){\r
-                                               \r
-                                               author1 = Person.NewInstance();\r
-                                               String strCorp_name = elAuthor.getAttributeValue("corp-name");\r
-                                               Institution corp = Institution.NewInstance();\r
-                                               corp.setName(strCorp_name);\r
-                                                                                       \r
-                                               author1.addInstitutionalMembership(corp, null, null, elAuthor.getAttributeValue("role"));\r
-                                               author1.setFirstname(elAuthor.getAttributeValue("first-name"));\r
-                                               // there is no corresponding attribute in cdm\r
-                                               String strInitials = elAuthor.getAttributeValue("initials");\r
-                                               author1.setLastname(elAuthor.getAttributeValue("last-name"));\r
-                                               // there is no corresponding attribute in cdm\r
-                                               String strMiddle_initial = elAuthor.getAttributeValue("middle-initial");\r
-                                               \r
-                                               String strSalutation = elAuthor.getAttributeValue("salutation");\r
-                                               author1.setSuffix(elAuthor.getAttributeValue("suffix"));\r
-                                               author1.setTitleCache(elAuthor.getAttributeValue("title"));\r
-                                               \r
+                               }\r
+                               /** It was not used in this Implementation\r
+                               logger.info("start make tertiary-authors ...");\r
+                               childName = "tertiary-authors";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elTertiary_Authors = doubleResult.getFirstResult();\r
+                               if (elTertiary_Authors != null) {\r
+                       \r
+                                       childName = "author";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elTertiary_Authors, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elTertiary_Author = doubleResult.getFirstResult();\r
+                                       if (elTertiary_Author != null) {\r
+                                               String strtertiaryCorp_name = elTertiary_Author.getAttributeValue("corp-name");\r
+                                               String strtertiaryFirst_name = elTertiary_Author.getAttributeValue("first-name");\r
+                                               String strtertiaryInitials = elTertiary_Author.getAttributeValue("initials");\r
+                                               String strtertiaryLast_name = elTertiary_Author.getAttributeValue("last-name");\r
+                                               String strtertiaryMiddle_initial = elTertiary_Author.getAttributeValue("middle-initial");\r
+                                               String strtertiaryRole = elTertiary_Author.getAttributeValue("role");\r
+                                               String strtertiarySalutation = elTertiary_Author.getAttributeValue("salutation");\r
+                                               String strtertiarySuffix = elTertiary_Author.getAttributeValue("suffix");\r
+                                               String strtertiaryTitle = elTertiary_Author.getAttributeValue("title");\r
+                       \r

                                                childName = "style";\r
                                                obligatory = false;\r
                                                childName = "style";\r
                                                obligatory = false;\r

-                                               doubleResult =  XmlHelp.getSingleChildElement(elAuthor, childName, tcsNamespace, obligatory);\r
+                                               doubleResult =  XmlHelp.getSingleChildElement(elTertiary_Author, childName, tcsNamespace, obligatory);\r

                                                success &= doubleResult.getSecondResult();\r
                                                success &= doubleResult.getSecondResult();\r

-                                               Element elStyle = doubleResult.getFirstResult();\r
-                                       //there is no corresponding attribute in cdm for the style... if there is only style, then the tag entry should be the titlecache??\r
-                                               if (elStyle != null) {\r
-                                                       String strColor = elStyle.getAttributeValue("color");\r
-                                                       String strFace = elStyle.getAttributeValue("face");\r
-                                                       String strFont = elStyle.getAttributeValue("font");\r
-                                                       String strSize = elStyle.getAttributeValue("size");\r
-                                                       String author_style =  elStyle.getTextNormalize();\r
+                                               Element elStyle_tertiary = doubleResult.getFirstResult();\r
+                                               if (elStyle_tertiary != null) { \r
+                                                       String strColor_tertiary = elStyle_tertiary.getAttributeValue("color");\r
+                                                       String strFace_tertiary = elStyle_tertiary.getAttributeValue("face");\r
+                                                       String strFont_tertiary = elStyle_tertiary.getAttributeValue("font");\r
+                                                       String strSize_tertiary = elStyle_tertiary.getAttributeValue("size");\r

                                                }\r
                                                }\r

-                                               authorTeam.addTeamMember(author1);\r
-                                               \r

                                        }\r
                                        }\r

-                                       reference.setAuthorTeam(authorTeam);\r

                                }\r
                                }\r

-                               \r
+                               logger.info("start make subsidiary-authors ...");\r
+                               childName = "subsidiary-authors";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elSubsidiary_Authors = doubleResult.getFirstResult();\r
+                               if (elSubsidiary_Authors != null) {\r
+                                       childName = "author";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elSubsidiary_Authors, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elSubsidiary_Author = doubleResult.getFirstResult();\r
+                                       if (elSubsidiary_Author !=null){\r
+                                               String strSubsidiaryCorp_name = elSubsidiary_Author.getAttributeValue("corp-name");\r
+                                               String strSubsidiaryFirst_name = elSubsidiary_Author.getAttributeValue("first-name");\r
+                                               String strSubsidiaryInitials = elSubsidiary_Author.getAttributeValue("initials");\r
+                                               String strSubsidiaryLast_name = elSubsidiary_Author.getAttributeValue("last-name");\r
+                                               String strSubsidiaryMiddle_initial = elSubsidiary_Author.getAttributeValue("middle-initial");\r
+                                               String strSubsidiaryRole = elSubsidiary_Author.getAttributeValue("role");\r
+                                               String strSubsidiarySalutation = elSubsidiary_Author.getAttributeValue("salutation");\r
+                                               String strSubsidiarySuffix = elSubsidiary_Author.getAttributeValue("suffix");\r
+                                               String strSubsidiaryTitle = elSubsidiary_Author.getAttributeValue("title");\r
+                       \r
+                                               childName = "style";\r
+                                               obligatory = false;\r
+                                               doubleResult =  XmlHelp.getSingleChildElement(elSubsidiary_Author, childName, tcsNamespace, obligatory);\r
+                                               success &= doubleResult.getSecondResult();\r
+                                               Element elStyle_Subsidiary = doubleResult.getFirstResult();\r
+                                               if (elStyle_Subsidiary != null) {\r
+                                                       String strColor_Subsidiary = elStyle_Subsidiary.getAttributeValue("color");\r
+                                                       String strFace_Subsidiary = elStyle_Subsidiary.getAttributeValue("face");\r
+                                                       String strFont_Subsidiary = elStyle_Subsidiary.getAttributeValue("font");\r
+                                                       String strSize_Subsidiary = elStyle_Subsidiary.getAttributeValue("size");\r
+                                               }\r
+                                       }\r
+                               }\r
+                               logger.info("start make translated-authors ...");\r
+                               childName = "translated-authors";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elContributors, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elTranslated_Authors = doubleResult.getFirstResult();\r
+                               if (elTranslated_Authors != null) {\r
+                                       childName = "author";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elTranslated_Authors, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elTranslated_Author = doubleResult.getFirstResult();\r
+                                       if (elTranslated_Author !=null){\r
+                                               String strTranslatedCorp_name = elTranslated_Author.getAttributeValue("corp-name");\r
+                                               String strTranslatedFirst_name = elTranslated_Author.getAttributeValue("first-name");\r
+                                               String strTranslatedInitials = elTranslated_Author.getAttributeValue("initials");\r
+                                               String strTranslatedLast_name = elTranslated_Author.getAttributeValue("last-name");\r
+                                               String strTranslatedMiddle_initial = elTranslated_Author.getAttributeValue("middle-initial");\r
+                                               String strTranslatedRole = elTranslated_Author.getAttributeValue("role");\r
+                                               String strTranslatedSalutation = elTranslated_Author.getAttributeValue("salutation");\r
+                                               String strTranslatedSuffix = elTranslated_Author.getAttributeValue("suffix");\r
+                                               String strTranslatedTitle = elTranslated_Author.getAttributeValue("title");\r
+                       \r
+                                               childName = "style";\r
+                                               obligatory = false;\r
+                                               doubleResult =  XmlHelp.getSingleChildElement(elTranslated_Author, childName, tcsNamespace, obligatory);\r
+                                               success &= doubleResult.getSecondResult();\r
+                                               Element elStyle_Translated = doubleResult.getFirstResult();\r
+                                               if (elStyle_Translated!= null) {\r
+                                                       String strColor_Translated = elStyle_Translated.getAttributeValue("color");\r
+                                                       String strFace_Translated = elStyle_Translated.getAttributeValue("face");\r
+                                                       String strFont_Translated = elStyle_Translated.getAttributeValue("font");\r
+                                                       String strSize_Translated = elStyle_Translated.getAttributeValue("size");\r
+                                               }\r
+                                       }\r
+                               }\r
+                               */\r

                        }\r
                        }\r

-               \r
+                        \r

                        logger.info("start make auth-address ...");\r
                        childName = "auth-address";\r
                        obligatory = false;\r
                        logger.info("start make auth-address ...");\r
                        childName = "auth-address";\r
                        obligatory = false;\r


@@ -407,10 +485,9 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                \r
                                Contact contact =  new Contact();\r
                                Address address = Address.NewInstance();\r
                                \r
                                Contact contact =  new Contact();\r
                                Address address = Address.NewInstance();\r

-                               \r
+                               reference.setAuthorTeam(authorTeam);\r

                                authorTeam.setContact(contact);          \r
                                contact.addAddress(address);\r
                                authorTeam.setContact(contact);          \r
                                contact.addAddress(address);\r

-                               //TODO:stimmt das so ??? \r

                                address.setLocality(address_style);\r
                        }\r
                        \r
                                address.setLocality(address_style);\r
                        }\r
                        \r


@@ -474,41 +551,80 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                                        String strSize_Title = elStyle_Title.getAttributeValue("size");\r
                                                        String strName_reftype = elRef_type.getAttributeValue("name");\r
                                                        title_new.toString();\r
                                                        String strSize_Title = elStyle_Title.getAttributeValue("size");\r
                                                        String strName_reftype = elRef_type.getAttributeValue("name");\r
                                                        title_new.toString();\r

-                                                       reference.setTitle(title_new.toString());\r
+                                                       \r

                                                        if (strName_reftype.equals("Article")) {\r
                                                        if (strName_reftype.equals("Article")) {\r

-                                                               map_article.put(title_new.toString(), reference);\r
+                                                               map_article.put(title_new.toString(), (ReferenceBase) article);\r
+                                                               ReferenceBase give_article = map_article.get(title_new.toString());\r
+                                                               give_article.setTitle(title_new.toString());\r
+                                                               reference=give_article;\r

                                                        }else if (strName_reftype.equals("Book")) {\r
                                                        }else if (strName_reftype.equals("Book")) {\r

-                                                               map_book.put(title_new.toString(), reference);\r
-                                                               \r
+                                                               map_book.put(title_new.toString(), book);\r
+                                                               ReferenceBase give_book = map_book.get(title_new.toString());\r
+                                                               give_book.setTitle(title_new.toString());\r
+                                                               reference=give_book;\r

                                                        }else if (strName_reftype.equals("Book Section")){\r
                                                        }else if (strName_reftype.equals("Book Section")){\r

-                                                               map_book_section.put(title_new.toString(), reference);\r
+                                                               map_book_section.put(title_new.toString(), bookSection);\r
+                                                               ReferenceBase give_book_section = map_book_section.get(title_new.toString());\r
+                                                               give_book_section.setTitle(title_new.toString());\r
+                                                               reference=give_book_section;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Patent")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Patent")) {\r

-                                                               map_patent.put(title_new.toString(), reference);\r
+                                                               map_patent.put(title_new.toString(), patent);\r
+                                                               ReferenceBase give_patent = map_patent.get(title_new.toString());\r
+                                                               give_patent.setTitle(title_new.toString());\r
+                                                               reference=give_patent;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Personal Communication")){\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Personal Communication")){\r

-                                                               map_personalCommunication.put(title_new.toString(), reference);\r
+                                                               personalCommunication.setTitle(title_new.toString());\r
+                                                               reference=personalCommunication;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Journal")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Journal")) {\r

-                                                               map_journal.put(title_new.toString(), reference);\r
+                                                               map_journal.put(title_new.toString(), journal);\r
+                                                               ReferenceBase give_journal = map_journal.get(title_new.toString());\r
+                                                               give_journal.setTitle(title_new.toString());\r
+                                                               reference=give_journal;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("CdDvd")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("CdDvd")) {\r

-                                                               map_cdDvd.put(title_new.toString(), reference);\r
+                                                               map_cdDvd.put(title_new.toString(), cdDvd);\r
+                                                               ReferenceBase give_cdDvd = map_cdDvd.get(title_new.toString());\r
+                                                               give_cdDvd.setTitle(title_new.toString());\r
+                                                               reference=give_cdDvd;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Database")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Database")) {\r

-                                                               map_database.put(title_new.toString(), reference);\r
+                                                               map_database.put(title_new.toString(), database);\r
+                                                               ReferenceBase give_database = map_database.get(title_new.toString());\r
+                                                               give_database.setTitle(title_new.toString());\r
+                                                               reference=give_database;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("WebPage")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("WebPage")) {\r

-                                                               map_webPage.put(title_new.toString(), reference);\r
+                                                               map_webPage.put(title_new.toString(), webPage);\r
+                                                               ReferenceBase give_webPage = map_webPage.get(title_new.toString());\r
+                                                               give_webPage.setTitle(title_new.toString());\r
+                                                               reference=give_webPage;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Report")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Report")) {\r

-                                                               map_report.put(title_new.toString(), reference);\r
+                                                               map_report.put(title_new.toString(), report);\r
+                                                               ReferenceBase give_report = map_report.get(title_new.toString());\r
+                                                               give_report.setTitle(title_new.toString());\r
+                                                               reference=give_report;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Thesis")) {\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Thesis")) {\r

-                                                               map_thesis.put(title_new.toString(), reference);\r
+                                                               map_thesis.put(title_new.toString(), thesis);\r
+                                                               ReferenceBase give_thesis = map_thesis.get(title_new.toString());\r
+                                                               give_thesis.setTitle(title_new.toString());\r
+                                                               reference=give_thesis;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Print Series")){\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Print Series")){\r

-                                                               map_printSeries.put(title_new.toString(), reference);\r
+                                                               map_printSeries.put(title_new.toString(), printSeries);\r

                                                                ReferenceBase give_printSeries = map_printSeries.get(title_new.toString());\r
                                                                give_printSeries.setTitle(title_new.toString());\r
                                                        }else if (strName_reftype.equals("Journal Article")){\r
                                                                ReferenceBase give_printSeries = map_printSeries.get(title_new.toString());\r
                                                                give_printSeries.setTitle(title_new.toString());\r
                                                        }else if (strName_reftype.equals("Journal Article")){\r

-                                                               map_article.put(title_new.toString(), reference);\r
+                                                               map_article.put(title_new.toString(), article);\r
+                                                               ReferenceBase give_article = map_article.get(title_new.toString());\r
+                                                               give_article.setTitle(title_new.toString());\r
+                                                               reference=give_article;\r

                                                        }else if (strName_reftype.equalsIgnoreCase("Conference Proceedings")){\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Conference Proceedings")){\r

-                                                               map_proceedings.put(title_new.toString(), reference);\r
+                                                               map_proceedings.put(title_new.toString(), proceedings);\r
+                                                               ReferenceBase give_proceedings = map_proceedings.get(title_new.toString());\r
+                                                               give_proceedings.setTitle(title_new.toString());\r
+                                                               reference=give_proceedings;\r

                                                        }else {\r
                                                                logger.warn("The type was not found...");\r
                                                        }else {\r
                                                                logger.warn("The type was not found...");\r

-                                                               map_generic.put(title_new.toString(), reference);\r
+                                                               map_generic.put(title_new.toString(), generic);\r
+                                                               ReferenceBase give_generic = map_generic.get(title_new.toString());\r
+                                                               give_generic.setTitle(title_new.toString());\r
+                                                               reference=give_generic;\r

                                                                success = false; \r
                                                        }                \r
                                                }\r
                                                                success = false; \r
                                                        }                \r
                                                }\r


@@ -538,23 +654,18 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                                if (secondary_title != null) {\r
                                                        ReferenceBase give_book =map_book.get(secondary_title);\r
                                                        if (give_book!= null) {\r
                                                if (secondary_title != null) {\r
                                                        ReferenceBase give_book =map_book.get(secondary_title);\r
                                                        if (give_book!= null) {\r

-                                                               reference.setInBook(give_book);\r
+                                                               bookSection.setInBook(give_book);\r

                                                                give_book.setTitle(secondary_title);\r
                                                        } else {\r
                                                                give_book.setTitle(secondary_title);\r
                                                        } else {\r

-                                                               ReferenceBase book = refFactory.newBook();\r
-                                                               book.setTitle(secondary_title);\r
-                                                               reference.setInBook(book);\r
+                                                               bookSection.setInBook(book);\r

                                                                map_book.put(secondary_title, book);\r
                                                                map_book.put(secondary_title, book);\r

-                                                               \r
+                                                               book.setTitle(secondary_title);\r

                                                        }\r
                                                        }\r

-                                                       \r
+                                                       reference=bookSection;\r

                                                }\r
                                        }else {\r
                                                }\r
                                        }else {\r

-                                               \r

                                                        logger.warn("The type was not found...");\r
                                                        logger.warn("The type was not found...");\r

-                                                       //TODO:that's wrong isn't it???\r
-                                                       // this should be inReference...\r
-                                                       map_generic.put(secondary_title, reference);\r
+                                                       map_generic.put(secondary_title, generic);\r

                                                        ReferenceBase give_generic = map_generic.get(secondary_title);\r
                                                        give_generic.setTitle(secondary_title);\r
                                                        reference=give_generic;\r
                                                        ReferenceBase give_generic = map_generic.get(secondary_title);\r
                                                        give_generic.setTitle(secondary_title);\r
                                                        reference=give_generic;\r


@@ -563,7 +674,83 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        }\r
                                }\r
                                \r
                                        }\r
                                }\r
                                \r

+                               /** It was not used in this Implementation\r
+                               childName = "tertiary-title";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elTitles, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elTertiary_title = doubleResult.getFirstResult();\r
+                               if (elTertiary_title != null){\r
+                                       childName = "style";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elTertiary_title, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elStyle_Tertiary_title = doubleResult.getFirstResult();\r
+                                       if (elStyle_Tertiary_title != null) {\r
+                                               String strColor_Tertiary_title = elStyle_Tertiary_title.getAttributeValue("color");\r
+                                               String strFace_Tertiary_title = elStyle_Tertiary_title.getAttributeValue("face");\r
+                                               String strFont_Tertiary_title = elStyle_Tertiary_title.getAttributeValue("font");\r
+                                               String strSize_Tertiary_title = elStyle_Tertiary_title.getAttributeValue("size");\r
+                                       }\r
+                               }\r
+                               childName = "alt-title";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elTitles, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elAlt_title = doubleResult.getFirstResult();\r
+                               if (elAlt_title != null) {\r
+                                       childName = "style";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elAlt_title, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elStyle_Alt_title = doubleResult.getFirstResult();\r
+                                       if (elStyle_Alt_title != null) {\r
+                                               String strColor_Alt_title = elStyle_Alt_title.getAttributeValue("color");\r
+                                               String strFace_Alt_title = elStyle_Alt_title.getAttributeValue("face");\r
+                                               String strFont_Alt_title = elStyle_Alt_title.getAttributeValue("font");\r
+                                               String strSize_Alt_title = elStyle_Alt_title.getAttributeValue("size");\r
+                                       }\r
+                               }\r
+                               childName = "short-title";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elTitles, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elShort_title = doubleResult.getFirstResult();\r
+                               if (elShort_title != null) {\r
+                                       \r
+                                       childName = "style";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elShort_title, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elStyle_Short_title = doubleResult.getFirstResult();\r
+                                       if (elStyle_Short_title != null) {\r
+                                               String strColor_Short_title = elStyle_Short_title.getAttributeValue("color");\r
+                                               String strFace_Short_title = elStyle_Short_title.getAttributeValue("face");\r
+                                               String strFont_Short_title = elStyle_Short_title.getAttributeValue("font");\r
+                                               String strSize_Short_title = elStyle_Short_title.getAttributeValue("size");\r
+                                       }\r
+                               }\r

                                \r
                                \r

+                               childName = "translated-title";\r
+                               obligatory = false;\r
+                               doubleResult =  XmlHelp.getSingleChildElement(elTitles, childName, tcsNamespace, obligatory);\r
+                               success &= doubleResult.getSecondResult();\r
+                               Element elTranslated_title = doubleResult.getFirstResult();\r
+                               if (elTranslated_title != null) {\r
+                       \r
+                                       childName = "style";\r
+                                       obligatory = false;\r
+                                       doubleResult =  XmlHelp.getSingleChildElement(elTranslated_title, childName, tcsNamespace, obligatory);\r
+                                       success &= doubleResult.getSecondResult();\r
+                                       Element elStyle_Translated_title = doubleResult.getFirstResult();\r
+                                       if (elStyle_Translated_title != null) {\r
+                                               String strColor_Translated_title = elStyle_Translated_title.getAttributeValue("color");\r
+                                               String strFace_Translated_title = elStyle_Translated_title.getAttributeValue("face");\r
+                                               String strFont_Translated_title = elStyle_Translated_title.getAttributeValue("font");\r
+                                               String strSize_Translated_title = elStyle_Translated_title.getAttributeValue("size");\r
+                                       }\r
+                               }\r
+                       */\r

                        }\r
                 \r
                        logger.info("start make periodical ...");\r
                        }\r
                 \r
                        logger.info("start make periodical ...");\r


@@ -599,15 +786,14 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        if (periodical != null) {                                       \r
                                                ReferenceBase give_journal = map_journal.get(periodical);\r
                                                        if (give_journal!= null) {\r
                                        if (periodical != null) {                                       \r
                                                ReferenceBase give_journal = map_journal.get(periodical);\r
                                                        if (give_journal!= null) {\r

-                                                               reference.setInJournal(give_journal);   \r
+                                                               article.setInJournal(give_journal);     \r

                                                                give_journal.setTitle(periodical);\r
                                                        } else {\r
                                                                give_journal.setTitle(periodical);\r
                                                        } else {\r

-                                                               ReferenceBase journal = refFactory.newJournal();\r
-                                                               reference.setInJournal(journal);                 \r
+                                                               article.setInJournal(journal);           \r

                                                                map_journal.put(periodical, journal);\r
                                                                journal.setTitle(periodical);\r
                                                        }\r
                                                                map_journal.put(periodical, journal);\r
                                                                journal.setTitle(periodical);\r
                                                        }\r

-                                                       \r
+                                                       reference=article;\r

                                        }\r
                                } else {\r
                                                logger.warn("The type was not found...");\r
                                        }\r
                                } else {\r
                                                logger.warn("The type was not found...");\r


@@ -615,7 +801,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        }                       \r
                            }\r
                             \r
                                        }                       \r
                            }\r
                             \r

-                           *//** It was not used in this Implementation\r
+                           /** It was not used in this Implementation\r

                            childName = "abbr-1";\r
                            obligatory = false;\r
                            doubleResult =  XmlHelp.getSingleChildElement(elPeriodical, childName, tcsNamespace, obligatory);\r
                            childName = "abbr-1";\r
                            obligatory = false;\r
                            doubleResult =  XmlHelp.getSingleChildElement(elPeriodical, childName, tcsNamespace, obligatory);\r


@@ -669,7 +855,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Abbr_3 = elStyle_Abbr_3.getAttributeValue("font");\r
                                String strSize_Abbr_3 = elStyle_Abbr_3.getAttributeValue("size");\r
                            }\r
                                String strFont_Abbr_3 = elStyle_Abbr_3.getAttributeValue("font");\r
                                String strSize_Abbr_3 = elStyle_Abbr_3.getAttributeValue("size");\r
                            }\r

-                       *//*\r
+                       */\r

                        }\r
                        \r
                        logger.info("start make pages ...");\r
                        }\r
                        \r
                        logger.info("start make pages ...");\r


@@ -696,17 +882,17 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String page = elStyle_Pages.getTextNormalize();\r
                                 \r
                                if (strName_reftype.equals("Journal Article")) {\r
                                String page = elStyle_Pages.getTextNormalize();\r
                                 \r
                                if (strName_reftype.equals("Journal Article")) {\r

-                                       map_article.put(page, reference);\r
+                                       map_article.put(page, article);\r

                                        ReferenceBase give_article = map_article.get(page);\r
                                        give_article.setPages(page);\r
                                        reference = give_article;\r
                                }else if (strName_reftype.equals("Article")){\r
                                        ReferenceBase give_article = map_article.get(page);\r
                                        give_article.setPages(page);\r
                                        reference = give_article;\r
                                }else if (strName_reftype.equals("Article")){\r

-                                       map_article.put(page, reference);\r
+                                       map_article.put(page, article);\r

                                        ReferenceBase give_article = map_article.get(page);\r
                                        give_article.setPages(page);\r
                                        reference = give_article;               \r
                                }else if (strName_reftype.equals("Book")){\r
                                        ReferenceBase give_article = map_article.get(page);\r
                                        give_article.setPages(page);\r
                                        reference = give_article;               \r
                                }else if (strName_reftype.equals("Book")){\r

-                                       map_book.put(page, reference);\r
+                                       map_book.put(page, book);\r

                                        ReferenceBase give_book = map_book.get(page);\r
                                        give_book.setPages(page);\r
                                        reference=give_book; \r
                                        ReferenceBase give_book = map_book.get(page);\r
                                        give_book.setPages(page);\r
                                        reference=give_book; \r


@@ -827,7 +1013,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                }                               \r
                        }\r
                        \r
                                }                               \r
                        }\r
                        \r

-                       *//**\r
+                       /**\r

                        // NOT USE IN THE IMPLEMENTATION        \r
                        childName = "issue"; // not use in CDM\r
                        obligatory = false;\r
                        // NOT USE IN THE IMPLEMENTATION        \r
                        childName = "issue"; // not use in CDM\r
                        obligatory = false;\r


@@ -865,7 +1051,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Num_vols = elStyle_Num_vols.getAttributeValue("font");\r
                                String strSize_Num_vols = elStyle_Num_vols.getAttributeValue("size");\r
                        }\r
                                String strFont_Num_vols = elStyle_Num_vols.getAttributeValue("font");\r
                                String strSize_Num_vols = elStyle_Num_vols.getAttributeValue("size");\r
                        }\r

-                       *//*\r
+                       */\r

                        \r
                        logger.info("start make edition ...");\r
                        childName = "edition";\r
                        \r
                        logger.info("start make edition ...");\r
                        childName = "edition";\r


@@ -902,7 +1088,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                }\r
                        }\r
                        \r
                                }\r
                        }\r
                        \r

-                       *//**It was not used in this Implementation\r
+                       /**It was not used in this Implementation\r

                        // LIKE NUMBER ELEMENT (the same content) use very selten\r
                        childName = "section";\r
                        obligatory = false;\r
                        // LIKE NUMBER ELEMENT (the same content) use very selten\r
                        childName = "section";\r
                        obligatory = false;\r


@@ -965,7 +1151,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        String strSize_Keyword = elStyle_Keyword.getAttributeValue("size");\r
                                }\r
                        }\r
                                        String strSize_Keyword = elStyle_Keyword.getAttributeValue("size");\r
                                }\r
                        }\r

-                       *//*    \r
+                       */      \r

                        \r
                        childName = "dates";\r
                        obligatory = false;\r
                        \r
                        childName = "dates";\r
                        obligatory = false;\r


@@ -1186,7 +1372,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                }                       \r
                        }\r
                        \r
                                }                       \r
                        }\r
                        \r

-                       *//**\r
+                       /**\r

                        // It was not used in this Implementation\r
                        childName = "orig-pub"; // original grant number - the name in Endnote Programm\r
                        obligatory = false;\r
                        // It was not used in this Implementation\r
                        childName = "orig-pub"; // original grant number - the name in Endnote Programm\r
                        obligatory = false;\r


@@ -1205,7 +1391,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Orig_pub = elStyle_Orig_pub.getAttributeValue("font");\r
                                String strSize_Orig_pub = elStyle_Orig_pub.getAttributeValue("size");\r
                        }\r
                                String strFont_Orig_pub = elStyle_Orig_pub.getAttributeValue("font");\r
                                String strSize_Orig_pub = elStyle_Orig_pub.getAttributeValue("size");\r
                        }\r

-                       *//*\r
+                       */\r

                \r
                        logger.info("start make ISBN/ISNN ...");\r
                        childName = "isbn";\r
                \r
                        logger.info("start make ISBN/ISNN ...");\r
                        childName = "isbn";\r


@@ -1245,7 +1431,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                }                                                                       \r
                        }\r
                        \r
                                }                                                                       \r
                        }\r
                        \r

-                       *//**\r
+                       /**\r

                        // It was not used in this Implementation\r
                        childName = "accession-num";\r
                        obligatory = false;\r
                        // It was not used in this Implementation\r
                        childName = "accession-num";\r
                        obligatory = false;\r


@@ -1283,7 +1469,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Call_num = elStyle_Call_num.getAttributeValue("font");\r
                                String strSize_Call_num = elStyle_Call_num.getAttributeValue("size");\r
                        }\r
                                String strFont_Call_num = elStyle_Call_num.getAttributeValue("font");\r
                                String strSize_Call_num = elStyle_Call_num.getAttributeValue("size");\r
                        }\r

-                       *//*\r
+                       */\r

                        \r
                        logger.info("start make electronic-resource-num ...");\r
                        childName = "electronic-resource-num";  //DOI - the name in Endnote Programm\r
                        \r
                        logger.info("start make electronic-resource-num ...");\r
                        childName = "electronic-resource-num";  //DOI - the name in Endnote Programm\r


@@ -1336,7 +1522,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                }\r
                        }\r
                        \r
                                }\r
                        }\r
                        \r

-                       *//**\r
+                       /**\r

                        // It was not used in this Implementation\r
                        childName = "label";\r
                        obligatory = false;\r
                        // It was not used in this Implementation\r
                        childName = "label";\r
                        obligatory = false;\r


@@ -1434,9 +1620,9 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Research_notes = elStyle_Research_notes.getAttributeValue("font");\r
                                String strSize_Research_notes = elStyle_Research_notes.getAttributeValue("size");\r
                        }\r
                                String strFont_Research_notes = elStyle_Research_notes.getAttributeValue("font");\r
                                String strSize_Research_notes = elStyle_Research_notes.getAttributeValue("size");\r
                        }\r

-                       *//*\r
+                       */\r

                        \r
                        \r

-                       *//**It was not used in this Implementation\r
+                       /**It was not used in this Implementation\r

                        childName = "work-type"; // thesis type\r
                        obligatory = false;\r
                        doubleResult =  XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r
                        childName = "work-type"; // thesis type\r
                        obligatory = false;\r
                        doubleResult =  XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r


@@ -1532,7 +1718,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Remote_database_provider = elStyle_Remote_database_provider.getAttributeValue("font");\r
                                String strSize_Remote_database_provider = elStyle_Remote_database_provider.getAttributeValue("size");\r
                        }\r
                                String strFont_Remote_database_provider = elStyle_Remote_database_provider.getAttributeValue("font");\r
                                String strSize_Remote_database_provider = elStyle_Remote_database_provider.getAttributeValue("size");\r
                        }\r

-                       *//*\r
+                       */\r

                        \r
                        childName = "language";\r
                        obligatory = false;\r
                        \r
                        childName = "language";\r
                        obligatory = false;\r


@@ -1712,7 +1898,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                }\r
                        }\r
                        \r
                                }\r
                        }\r
                        \r

-                       *//** It was not used in this Implementation\r
+                       /** It was not used in this Implementation\r

                        childName = "access-date";\r
                        obligatory = false;\r
                        doubleResult =  XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r
                        childName = "access-date";\r
                        obligatory = false;\r
                        doubleResult =  XmlHelp.getSingleChildElement(elRecord, childName, tcsNamespace, obligatory);\r


@@ -1878,7 +2064,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                String strFont_Custom7 = elStyle_Custom7.getAttributeValue("font");\r
                                String strSize_Custom7 = elStyle_Custom7.getAttributeValue("size");\r
                        }\r
                                String strFont_Custom7 = elStyle_Custom7.getAttributeValue("font");\r
                                String strSize_Custom7 = elStyle_Custom7.getAttributeValue("size");\r
                        }\r

-                *//*           \r
+                */             \r

                        authorMap.put(elRec_number, (Team) author);\r
                        referenceMap.put(elRec_number, reference);       \r
                }       \r
                        authorMap.put(elRec_number, (Team) author);\r
                        referenceMap.put(elRec_number, reference);       \r
                }       \r


@@ -1889,12 +2075,11 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                return success;\r
        }       \r
                        \r
                return success;\r
        }       \r
                        \r

-        (non-Javadoc)\r
+       /* (non-Javadoc)\r

         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r

-        \r
+        */\r

        protected boolean isIgnore(EndnoteImportState state){\r
                EndnoteImportConfigurator tcsConfig = state.getConfig();\r
                return (! tcsConfig.isDoRecords());\r
        }\r
 }\r
        protected boolean isIgnore(EndnoteImportState state){\r
                EndnoteImportConfigurator tcsConfig = state.getConfig();\r
                return (! tcsConfig.isDoRecords());\r
        }\r
 }\r

-*/
\ No newline at end of file