/ - Diff - EDIT - EDIT Project Management

             return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
+        }
         public static ICdmDataSource cdm_postgres_edaphobase(){
             DatabaseTypeEnum dbType = DatabaseTypeEnum.PostgreSQL;
             String cdmServer = "130.133.70.26";
             String cdmDB = "cdm_edaphobase";
             String cdmUserName = "edaphobase";
             int port = 5433;
             return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null);
+        }
         public static ICdmDataSource cdm_test_postgres_edaphobase(){
             DatabaseTypeEnum dbType = DatabaseTypeEnum.PostgreSQL;
             String cdmServer = "160.45.63.175";
             String cdmDB = "cdm_edaphobase";
             String cdmUserName = "edaphobase";
             int port = 5432;
             return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null);
+        }
         public static ICdmDataSource cdm_test_postgres__ssh_edaphobase(){
             DatabaseTypeEnum dbType = DatabaseTypeEnum.PostgreSQL;
             String cdmServer = "localhost";
             String cdmDB = "cdm_edaphobase";
             String cdmUserName = "edaphobase";
             int port = 13306;
             return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null);
+        }
         public static ICdmDataSource cdm_local_caryo_spp(){
             DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
             String cdmServer = "127.0.0.1";

             return  makeSource(dbms, strServer, strDB, port, userName, null);
+        }
         public static Source EDAPHOBASE8(){
             String dbms = Source.POSTGRESQL9;  //TODO 10
             String strServer = "130.133.70.26";  //BGBM-PESISQL
             String strDB = "edaphobase8";
             int port = 5433;
             String userName = "edaphobase";
             return  makeSource(dbms, strServer, strDB, port, userName, null);
+        }
+    }

         static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;
     //    static final Source edaphoSource = CdmImportSources.EDAPHOBASE();
         static final Source edaphoSource = CdmImportSources.EDAPHOBASE6();
         static final Source edaphoSource = CdmImportSources.EDAPHOBASE8();
     //    static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
         static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_edaphobase();
     //    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_edaphobase();
     //    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_edaphobase();
     //    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_postgres_edaphobase();
     //    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_postgres_edaphobase();
         static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_postgres_edaphobase();
         //feature tree uuid
         private static final UUID featureTreeUuid = UUID.fromString("a543d66a-e310-4b3e-a9fa-b729afefad16");
-...
         private static final boolean doReferences = true;
         private static final boolean doDescriptions = false;
         //logging
         private static final boolean ignoreSubgenus = true;
         private static final boolean ignore4nomial = true;
         //check - import
         static CHECK check = CHECK.IMPORT_WITHOUT_CHECK;
-...
             config.setDoDescriptions(doDescriptions);
             config.setCheck(check);
             config.setIgnoreSubgenus(ignoreSubgenus);
             config.setIgnore4nomial(ignore4nomial);
             CdmDefaultImport<EdaphobaseImportConfigurator> myImport = new CdmDefaultImport<>();
             myImport.invoke(config);

         public String getEdaphobaseSecundumTitle() {return edaphobaseSecundumTitle;}
         public void setEdaphobaseSecundumTitle(String edaphobaseSecundumTitle) {this.edaphobaseSecundumTitle = edaphobaseSecundumTitle;}
         //logging
         private boolean ignoreSubgenus = true;
         public boolean isIgnoreSubgenus() {return ignoreSubgenus;}
         public void setIgnoreSubgenus(boolean ignoreSubgenus) {this.ignoreSubgenus = ignoreSubgenus;}
         private boolean ignore4nomial = true;
         public boolean isIgnore4nomial() {return ignore4nomial;}
         public void setIgnore4nomial(boolean ignore4nomial) {this.ignore4nomial = ignore4nomial;}
         /**
          * @param source

             String parentNameStr = rs.getString("parentName");
             String grandParentNameStr = rs.getString("grandParentName");
             String grandGrandParentNameStr = rs.getString("grandGrandParentName");
             String editUuid = rs.getString("edit_uuid");
             if (isDeleted){
-...
+                }
                 name.setNomenclaturalReference(nomRef);
+            }
             name.setNomenclaturalMicroReference(StringUtils.isBlank(pages)? null : pages);
             name.setNomenclaturalMicroReference(isBlank(pages)? null : pages);
             //taxon
             Reference secRef = state.getRelatedObject(REFERENCE_NAMESPACE, state.getConfig().getSecUuid().toString(), Reference.class);
-...
             //id
             ImportHelper.setOriginalSource(taxonBase, state.getTransactionalSourceReference(), id, TAXON_NAMESPACE);
             ImportHelper.setOriginalSource(name, state.getTransactionalSourceReference(), id, TAXON_NAMESPACE);
             taxonBase.setUuid(UUID.fromString(editUuid));
             handleExampleIdentifiers(taxonBase, id);
             if (!nameAdditionUsed){
                 logger.warn("name_addition not recognized: " +  nameAddition + ". ID="+id);
                 name.setAppendedPhrase(nameAddition);
+            }
             String orig = displayString.replace("nomen nudum [Hirschmann, 1951]", "Hirschmann, 1951")
                     .replace("  ", " ");
             String nameTitleCache = name.getTitleCache().replace("species group", "group");
             String taxonTitleCache = taxonBase.getTitleCache().replace("species group", "group");
             if (!orig.equals(nameTitleCache) && !orig.equals(name.getFullTitleCache()) && !orig.equals(taxonTitleCache)){
             if (titleCacheDiffers(state, displayString, name, taxonBase)){
                 String titleCache = taxonBase.getAppendedPhrase() != null ? taxonBase.getTitleCache() : name.getTitleCache();
                 logger.warn("Displaystring differs from titleCache. ID=" + id + ".\n   " + displayString + "\n   " + titleCache);
+            }
-...
         /**
          * @param state
          * @param displayString
          * @param name
          * @param taxonBase
          * @return
          */
         private boolean titleCacheDiffers(EdaphobaseImportState state, String displayString, IZoologicalName name, TaxonBase<?> taxonBase) {
             String orig = displayString.replace("nomen nudum [Hirschmann, 1951]", "Hirschmann, 1951")
                     .replace("  ", " ");
             String nameTitleCache = name.getTitleCache().replace("species group", "group");
             String taxonTitleCache = taxonBase.getTitleCache().replace("species group", "group");
     //        if (state.getConfig().isIgnore4nomial() && orig.matches(".* subsp"))
             boolean result =
                     !orig.equals(nameTitleCache)
                     && !orig.equals(name.getFullTitleCache())
                     && !orig.equals(taxonTitleCache);
             return result;
+        }
         /**
          * @param authorStr
          * @return
          */
-...
         private void handleExampleIdentifiers(TaxonBase<?> taxonBase, Integer id) {
             if (idMap.get(id) != null){
                 taxonBase.setUuid(idMap.get(id));
                 logger.warn("Override UUID for specific taxa. ID="+ id +  "; uuid="+idMap.get(id) + "; name="+ taxonBase.getName().getTitleCache());
+            }
+        }

Project

General

Profile

EDIT

Revision 76a5e528

Added by Andreas Müller almost 6 years ago