(no commit message)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
index 00af3a51f46b9a813f060341d349bca1a415ac52..c86d63deb598ccbab099231b2a166565ab27b5ae 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java
@@ -3073,6 +3073,19 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
                        UUID uuid = state.getAreaUuid(areaName);\r
                        if (uuid == null){\r
                                isNewInState = true;\r
+                               \r
+                               \r
+                               try {\r
+                                       uuid = state.getTransformer().getNamedAreaUuid(areaName);\r
+                               } catch (UndefinedTransformerMethodException e) {\r
+                                       throw new RuntimeException(e);\r
+                               }\r
+                       }       \r
+                       TermMatchMode matchMode = TermMatchMode.UUID_LABEL;\r
+                       area = getNamedArea(state, uuid, areaName, areaName, areaName, areaType, level, voc, matchMode);\r
+                       if (isNewInState){\r
+                               state.putAreaUuid(areaName, area.getUuid());\r
+                               \r
                                //TODO just for testing -> make generic and move to better place\r
                                if ("Bangka".equals(areaName)){\r
                                        String geoServiceLayer="vmap0_as_bnd_political_boundary_a";\r
@@ -3082,26 +3095,13 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
                                        GeoServiceArea geoServiceArea = new GeoServiceArea();\r
                                        geoServiceArea.add(geoServiceLayer, layerFieldName, areaValue);\r
                                        try {\r
-                                               String a = geoServiceArea.toXml();\r
-                                               System.out.println(a);\r
+                                               GeoServiceArea.set(area, geoServiceArea);\r
                                        } catch (XMLStreamException e) {\r
                                                // TODO Auto-generated catch block\r
                                                e.printStackTrace();\r
                                        }\r
-//                                     area = createNewArea(areaName,geoServiceLayer, layerFieldName, areaValue);\r
-                                       \r
-                               }\r
-                               \r
-                               try {\r
-                                       uuid = state.getTransformer().getNamedAreaUuid(areaName);\r
-                               } catch (UndefinedTransformerMethodException e) {\r
-                                       throw new RuntimeException(e);\r
+                                       save(area, state);\r
                                }\r
-                       }       \r
-                       TermMatchMode matchMode = TermMatchMode.UUID_LABEL;\r
-                       area = getNamedArea(state, uuid, areaName, areaName, areaName, areaType, level, voc, matchMode);\r
-                       if (isNewInState){\r
-                               state.putAreaUuid(areaName, area.getUuid());\r
                        }\r
                }\r
                return area;\r