(no commit message)

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / pesi / out / PesiTransformer.java

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 0d255124420068384abe5573067895b4d98c9d57..ef427d9a56cd6998624195a7183183b086861650 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
@@ -1205,7 +1205,7 @@ public final class PesiTransformer {
         * @throws UnknownCdmTypeException \r
         */\r
        public static String presenceAbsenceTerm2OccurrenceStatusCache(PresenceAbsenceTermBase<?> term) {\r
-               String result = STR_STATUS_PRESENT; // TODO: What should be returned if a PresenceTerm/AbsenceTerm could not be translated to a datawarehouse occurrence status id?\r
+               String result = null;\r
                if (term.isInstanceOf(PresenceTerm.class)) {\r
                        PresenceTerm presenceTerm = CdmBase.deproxy(term, PresenceTerm.class);\r
                        if (presenceTerm.equals(PresenceTerm.PRESENT())) {\r
@@ -1232,7 +1232,6 @@ public final class PesiTransformer {
                        } else {\r
                                logger.error("AbsenceTerm could not be translated to datawarehouse occurrence status id: " + absenceTerm.getLabel());\r
                        }\r
-//                     result = STR_STATUS_ABSENT; // or just like this?\r
                }\r
                return result;\r
        }\r
@@ -1244,7 +1243,7 @@ public final class PesiTransformer {
         * @throws UnknownCdmTypeException \r
         */\r
        public static Integer presenceAbsenceTerm2OccurrenceStatusId(PresenceAbsenceTermBase<?> term) {\r
-               Integer result = STATUS_PRESENT; // TODO: What should be returned if a PresenceTerm/AbsenceTerm could not be translated to a datawarehouse occurrence status id?\r
+               Integer result = null;\r
                if (term.isInstanceOf(PresenceTerm.class)) {\r
                        PresenceTerm presenceTerm = CdmBase.deproxy(term, PresenceTerm.class);\r
                        if (presenceTerm.equals(PresenceTerm.PRESENT())) {\r
@@ -1271,7 +1270,6 @@ public final class PesiTransformer {
                        } else {\r
                                logger.error("AbsenceTerm could not be translated to datawarehouse occurrence status id: " + absenceTerm.getLabel());\r
                        }\r
-//                     result = STATUS_ABSENT; // or just like this?\r
                }\r
                return result;\r
        }\r
@@ -1707,10 +1705,9 @@ public final class PesiTransformer {
                        else if ((tdwgArea.getRepresentation(Language.DEFAULT()).getAbbreviatedLabel()).equals("TODO")) { return AREA_DANISH_EXCLUSIVE_ECONOMIC_ZONE; }\r
                        else {\r
                                logger.error("Unknown TdwgArea Area: " + area.getTitleCache());\r
-                               return 1; // TODO: Actually the export has to stop here because AreaFk's are not allowed to be NULL and another value is plain wrong.\r
                        }\r
                }\r
-               return 1; // TODO: Actually the export has to stop here because AreaFk's are not allowed to be NULL and another value is plain wrong.\r
+               return null;\r
 \r
        }\r
 \r
@@ -2724,8 +2721,8 @@ public final class PesiTransformer {
                        return null;\r
                } else if (reference.getType().equals(ReferenceType.Article)) {\r
                        return REF_ARTICLE_IN_PERIODICAL;\r
-               } else if (reference instanceof ISectionBase) {\r
-                       return REF_PART_OF_OTHER;\r
+//             } else if (reference instanceof ISectionBase) {\r
+//                     return REF_PART_OF_OTHER;\r
                } else if (reference.getType().equals(ReferenceType.Book)) {\r
                        return REF_BOOK;\r
                } else if (reference.getType().equals(ReferenceType.Database)) {\r