add geoservice bean

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 c86d63deb598ccbab099231b2a166565ab27b5ae..ff47728d45a82db66be1212958b7c83edb10565f 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
@@ -46,6 +46,8 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade.DerivedUnitType;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.ext.geo.GeoServiceArea;\r
+import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
+import eu.etaxonomy.cdm.ext.geo.IGeoServiceAreaMapping;\r
 import eu.etaxonomy.cdm.io.common.ICdmIO;\r
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
 import eu.etaxonomy.cdm.io.markup.UnmatchedLeads.UnmatchedLeadsKey;\r
@@ -112,20 +114,18 @@ import eu.etaxonomy.cdm.strategy.parser.SpecimenTypeParser.TypeInfo;
  */\r
 @Component\r
 public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<MarkupImportState> {\r
-       private static final String FREQUENCY = "frequency";\r
-\r
-       private static final String TAXONTYPE = "taxontype";\r
-\r
-       private static final String DEDICATION = "dedication";\r
-\r
-       private static final String QUOTE = "quote";\r
-\r
        private static final Logger logger = Logger.getLogger(MarkupDocumentImport.class);\r
 \r
        private static final boolean CREATE_NEW = true;\r
        private static final boolean IS_IMAGE_GALLERY = true;\r
        private static final boolean NO_IMAGE_GALLERY = false;\r
 \r
+       \r
+\r
+\r
+\r
+\r
+\r
        private static final String ACCEPTED = "accepted";\r
        private static final String ACCEPTED_NAME = "acceptedName";\r
        private static final String ADDENDA = "addenda";\r
@@ -147,6 +147,7 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
        private static final String COORDINATES = "coordinates";\r
        private static final String COUPLET = "couplet";\r
        private static final String DATES = "dates";\r
+       private static final String DEDICATION = "dedication";\r
        private static final String DEFAULT_MEDIA_URL = "defaultMediaUrl";\r
        private static final String DESTROYED = "destroyed";\r
        private static final String DETAILS = "details";\r
@@ -164,6 +165,7 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
        private static final String FOOTNOTE_REF = "footnoteRef";\r
        private static final String FOOTNOTE_STRING = "footnoteString";\r
        private static final String FIELD_NUM = "fieldNum";\r
+       private static final String FREQUENCY = "frequency";\r
        private static final String FULL_NAME = "fullName";\r
        private static final String FULL_TYPE = "fullType";\r
        private static final String GATHERING = "gathering";\r
@@ -202,6 +204,7 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
        private static final String PUBTITLE = "pubtitle";\r
        private static final String PUBTYPE = "pubtype";\r
        private static final String QUESTION = "question";\r
+       private static final String QUOTE = "quote";\r
        private static final String RANK = "rank";\r
        private static final String REF = "ref";\r
        private static final String REF_NUM = "refNum";\r
@@ -210,6 +213,7 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
        private static final String REFERENCES = "references";\r
        private static final String TAXON = "taxon";\r
        private static final String TAXONTITLE = "taxontitle";\r
+       private static final String TAXONTYPE = "taxontype";\r
        private static final String TEXT = "text";\r
        private static final String TEXT_SECTION = "textSection";\r
        private static final String TO_COUPLET = "toCouplet";\r
@@ -238,6 +242,9 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
        // second time\r
        private UnmatchedLeads unmatchedLeads;\r
 \r
+       @Autowired\r
+       IEditGeoService editGeoService;\r
+       \r
        // TODO remove preliminary\r
        @Autowired\r
        private AuthenticationManager authenticationManager;\r
@@ -3094,13 +3101,8 @@ public class MarkupDocumentImport extends MarkupImportBase implements ICdmIO<Mar
                                        String areaValue = "PULAU BANGKA#SUMATERA SELATAN";\r
                                        GeoServiceArea geoServiceArea = new GeoServiceArea();\r
                                        geoServiceArea.add(geoServiceLayer, layerFieldName, areaValue);\r
-                                       try {\r
-                                               GeoServiceArea.set(area, geoServiceArea);\r
-                                       } catch (XMLStreamException e) {\r
-                                               // TODO Auto-generated catch block\r
-                                               e.printStackTrace();\r
-                                       }\r
-                                       save(area, state);\r
+                                       this.editGeoService.setMapping(area, geoServiceArea);\r
+//                                     save(area, state);\r
                                }\r
                        }\r
                }\r