correcting utf8 chars

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java
index d6e214ccc4ae8240b96b8b262c2334d2901576f0..444e7d0440892787015b30faf31eb5295472391c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java
@@ -122,7 +122,7 @@ public class BerlinModelAuthorImport extends BerlinModelImportBase {
                                        String initials = null;\r
                                        for (int j = 1; j <= rs.getMetaData().getColumnCount(); j++){\r
                                                String label = rs.getMetaData().getColumnLabel(j);\r
-                                               if (label.equalsIgnoreCase("Initials") || label.equalsIgnoreCase("Kürzel")){\r
+                                               if (label.equalsIgnoreCase("Initials") || label.equalsIgnoreCase("Kürzel")){\r
                                                        initials = rs.getString(j);\r
                                                        break;\r
                                                }\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java
index 3726a10f5b6d518fbadf674191b7422d7ec2e9bc..69f64d3deec4b6ba58698e34b727a1f489281a4b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java
@@ -66,8 +66,8 @@ public class BerlinModelAuthorExport extends BerlinModelExportBase<Person> {
                mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.NOMENCLATURAL_STANDARD(), "NomStandard"));\r
                mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.AREA_OF_INTREREST(), "AreaOfInterest"));\r
                mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(), "Initials"));\r
-//             mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(),Kürzel")); //Initials used instead\r
-//             mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(), "DraftKürz")); //Initials used instead\r
+//             mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(),Kürzel")); //Initials used instead\r
+//             mapping.addMapper(DbExtensionMapper.NewInstance(ExtensionType.ABBREVIATION(), "DraftKürz")); //Initials used instead\r
                mapping.addMapper(CreatedAndNotesMapper.NewInstance());\r
                \r
                return mapping;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
index 9dacad3fb9fa80e3ac27343ca2a3a03c84f594c0..f8d6d620554c9db078fd02a3f57e5ecfba193034 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
@@ -841,7 +841,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                if (value.startsWith(replacementString) ){\r
                        value = value.substring(replacementString.length()).trim();\r
                }\r
-               while (value.startsWith("-") || value.startsWith("\96") ){\r
+               while (value.startsWith("-") || value.startsWith("–") ){\r
                        value = value.substring("-".length()).trim();\r
                }\r
                return value;\r
@@ -1007,7 +1007,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         */\r
        protected String removeStartingTypeRefMinus(String typeRef) {\r
                typeRef = replaceStart(typeRef, "-");\r
-               typeRef = replaceStart(typeRef, "\97");\r
+               typeRef = replaceStart(typeRef, "—");\r
                typeRef = replaceStart(typeRef, "\u002d");\r
                typeRef = replaceStart(typeRef, "\u2013");\r
                typeRef = replaceStart(typeRef, "--");\r
@@ -1034,7 +1034,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                //create name\r
                BotanicalName nameType = (BotanicalName)parser.parseFullName(typeText, NomenclaturalCode.ICBN, Rank.SPECIES());\r
                ((NameTypeDesignation) typeDesignation).setTypeName(nameType);\r
-               //TODO wie können NameTypes den Namen zugeordnet werden? -  wird aber vom Portal via NameCache matching gemacht\r
+               //TODO wie können NameTypes den Namen zugeordnet werden? -  wird aber vom Portal via NameCache matching gemacht\r
        }\r
 \r
 \r
@@ -1217,7 +1217,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                }\r
                \r
                //test nom element has no text\r
-               if (StringUtils.isNotBlank(elNom.getTextNormalize().replace("\97", "").replace("\u002d","").replace("\u2013", ""))){\r
+               if (StringUtils.isNotBlank(elNom.getTextNormalize().replace("—", "").replace("\u002d","").replace("\u2013", ""))){\r
                        String strElNom = elNom.getTextNormalize();\r
                        if ("?".equals(strElNom)){\r
                                handleQuestionMark(name, taxon);\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsSourceUsesImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsSourceUsesImport.java
index 562068a7c3d0ef0d9158f9a192a869ad8d2857ab..bb7b3d7cbb4c6991ac0f3cce1b255ab8ecfb54a0 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsSourceUsesImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsSourceUsesImport.java
@@ -300,7 +300,7 @@ public class ErmsSourceUsesImport  extends ErmsImportBase<CommonTaxonName> {
         */\r
        private IdentifiableEntity makeCombinationReference(ResultSetPartitioner partitioner, ErmsImportState state, ReferenceBase ref, String strTaxonId, String strPageNr) {\r
                // Kopie von Orig. Comb.\r
-               //TODO ist das wirklich der richtige Name, oder muss ein verknüpfter Name verwendet werden\r
+               //TODO ist das wirklich der richtige Name, oder muss ein verknüpfter Name verwendet werden\r
                TaxonNameBase taxonName = (TaxonNameBase)state.getRelatedObject(ErmsTaxonImport.NAME_NAMESPACE, strTaxonId);\r
                taxonName.setNomenclaturalReference(ref);\r
                taxonName.setNomenclaturalMicroReference(strPageNr);\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java
index efa2d0d2b2bb5b374d285bb09a492f91e9534fb5..4f81b2015467ef07fbac9c684496f1dec0212b83 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java
@@ -217,7 +217,7 @@ public final class ErmsTransformer extends InputTransformerBase {
                }else if (ermsAbbrev.equals("de")){return Language.GERMAN();\r
 //             }else if (ermsAbbrev.equals("ec")){return Language.ENGLISH-CANADIAN();  //no iso\r
                }else if (ermsAbbrev.equals("ee")){return Language.ESTONIAN();\r
-//             }else if (ermsAbbrev.equals("ek")){return Language.EVEN-KAMCHATKA(); //iso639-3: eve    Lamut, Ewen, Eben, Orich, Ilqan; Russian: ???´????? ???´?, earlier also ????????? ???´?) is a Tungusic language spoken by the Evens in Siberia\r
+//             }else if (ermsAbbrev.equals("ek")){return Language.EVEN-KAMCHATKA(); //iso639-3: eve    Lamut, Ewen, Eben, Orich, Ilqan; Russian: ???´????? ???´?, earlier also ????????? ???´?) is a Tungusic language spoken by the Evens in Siberia\r
                }else if (ermsAbbrev.equals("en")){return Language.ENGLISH();\r
                }else if (ermsAbbrev.equals("ep")){return Language.ESPERANTO();\r
                }else if (ermsAbbrev.equals("es")){return Language.SPANISH_CATALAN();\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
index 1102c4f7187438fa272808e89090cad646941a78..72dc78d3a38bed9c793aefda563ca40d14f11e64 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
@@ -1017,9 +1017,9 @@ public final class PesiTransformer {
        public static String STR_AREA_CORVO = "Corvo";\r
        public static String STR_AREA_FAIAL = "Faial";\r
        public static String STR_AREA_GRACIOSA = "Graciosa";\r
-       public static String STR_AREA_SAO_JORGE = "São Jorge";\r
+       public static String STR_AREA_SAO_JORGE = "São Jorge";\r
        public static String STR_AREA_FLORES = "Flores";\r
-       public static String STR_AREA_SAO_MIGUEL = "São Miguel";\r
+       public static String STR_AREA_SAO_MIGUEL = "São Miguel";\r
        public static String STR_AREA_PICO = "Pico";\r
        public static String STR_AREA_SANTA_MARIA = "Santa Maria";\r
        public static String STR_AREA_TERCEIRA = "Terceira";\r
@@ -1102,7 +1102,7 @@ public final class PesiTransformer {
        public static String STR_AREA_RUSSIA_NORTHERN = "Russia Northern";\r
        public static String STR_AREA_RUSSIA_SOUTHWEST = "Russia Southwest";\r
        public static String STR_AREA_SARDEGNA = "Sardegna";\r
-       public static String STR_AREA_SVALBARD_WITH_BJORNOYA_AND_JAN_MAYEN = "Svalbard with Björnöya and Jan Mayen";\r
+       public static String STR_AREA_SVALBARD_WITH_BJORNOYA_AND_JAN_MAYEN = "Svalbard with Björnöya and Jan Mayen";\r
        public static String STR_AREA_SELVAGENS_ISLANDS = "Selvagens Islands";\r
        public static String STR_AREA_SICILY_WITH_MALTA = "Sicily with Malta";\r
        public static String STR_AREA_MALTA = "Malta";\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java
index ef8b1ae01a4b0c2e2434b2b89958ea8afc048d15..0fb3668cec139e92ad6b9e4dc52656d4cb172fc3 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java
@@ -48,7 +48,7 @@ public class EndnoteImportConfigurator extends ImportConfiguratorBase<EndnoteImp
        \r
        //      rdfNamespace\r
        Namespace EndnoteNamespace;\r
-/*TODO: wieder zurück!!!\r
+/*TODO: wieder zurück!!!\r
        protected void makeIoClassList(){\r
                ioClassList = new Class[]{\r
                        EndnoteRecordsImport.class\r