/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 249ab8e3

Added by Andreas Müller almost 9 years ago

ID 249ab8e33751ad4a280e148a48f8826c86de7c2a
Parent 7f777e9c
Child 89dc0db4

Improve E+M import for transmission engine #3979

     	static final Source berlinModelSource = BerlinModelSources.euroMed_BGBM42();
     //	static final Source berlinModelSource = BerlinModelSources.euroMed_PESI3();
     //	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_euroMed();
     	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_euroMed();
     	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_pesi_euromed();
     //	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_pesi_euromed();
     //	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_euromed3();
     //	static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
-...
     	static final int partitionSize = 2500;
     	//check - import
     	static final CHECK check = CHECK.CHECK_AND_IMPORT;
     	static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;
     	//editor - import
     	static final EDITOR editor = EDITOR.EDITOR_AS_EDITOR;
-...
+    	    }
+        }
         //1. run transmission engine #3979
         private void runTransmissionEngine(BerlinModelImportConfigurator config,
                 CdmDefaultImport<BerlinModelImportConfigurator> bmImport) {
             //Transmission engine #3979 .1
             if (config.isDoOccurrence() && (config.getCheck().isImport()  )  ){
             if (true || config.isDoOccurrence() && (config.getCheck().isImport()  )  ){
                 ICdmApplicationConfiguration app = bmImport.getCdmAppController();
                 final List<String> term_init_strategy = Arrays.asList(new String []{
                         "representations"
                 });
                 UUID uuidSuperAreaLevel = BerlinModelTransformer.uuidEuroMedAreaLevelFirst;
                 NamedAreaLevel euroMedLevel1 = (NamedAreaLevel)app.getTermService().find(uuidSuperAreaLevel);
                 Pager<NamedArea> areaPager = app.getTermService().list(
                         NamedAreaLevel.TDWG_LEVEL3(),
                         euroMedLevel1,
                         (NamedAreaType) null,
                         null,
                         null,
-...
+            }
+        }
         //5.Mark areas to be hidden #3979 .5
         private void markAreasAsHidden(BerlinModelImportConfigurator config,
                 CdmDefaultImport<BerlinModelImportConfigurator> bmImport) {
             //5.Mark areas to be hidden #3979 .5
     	    if (config.isDoOccurrence() && (config.getCheck().isImport())){
             if (config.isDoOccurrence() && (config.getCheck().isImport())){
     	        ICdmApplicationConfiguration app = bmImport.getCdmAppController();
     	        TransactionStatus tx = app.startTransaction();
     	        MarkerType hiddenAreaMarkerType = MarkerType.NewInstance("", "Hidden area", null);
     	        MarkerType hiddenAreaMarkerType = MarkerType.NewInstance("Used to hide distributions for the named areas in publications", "Hidden Area", null);
     	        hiddenAreaMarkerType.setUuid(BerlinModelTransformer.uuidHiddenArea);
     	        @SuppressWarnings("unchecked")
                 TermVocabulary<MarkerType> vocUserDefinedMarkerTypes = app.getVocabularyService().find(CdmImportBase.uuidUserDefinedMarkerTypeVocabulary);
-...
                     rs_n.addMarker(Marker.NewInstance(hiddenAreaMarkerType, true));
                     app.getTermService().saveOrUpdate(rs_n);
+    	        }
     	        app.commitTransaction(tx);
+    	    }
+        }
         //2. import shapefile attributes #3979 .2
         private void importShapefile(BerlinModelImportConfigurator config,
                 CdmDefaultImport<BerlinModelImportConfigurator> bmImport) {
             //      //import shapefile attributes #3979 .2
     	    if (config.isDoOccurrence() && (config.getCheck().isImport())){
             if (config.isDoOccurrence() && (config.getCheck().isImport())){
     	       UUID areaVocabularyUuid = BerlinModelTransformer.uuidVocEuroMedAreas;
                List<String> idSearchFields = Arrays.asList(new String[]{"EMAREA","PARENT"});
-...
+    	    }
+        }
         private void createUsersAndRoles(BerlinModelImportConfigurator config,
         //4. Create users and assign roles  #3979
         private void createUsersAndRoles(
                 BerlinModelImportConfigurator config,
                 CdmDefaultImport<BerlinModelImportConfigurator> bmImport) {
             //4. Create users and assign roles  #3979
     	    if (config.isDoRelTaxa() && (config.getCheck().isImport())){
             if (config.isDoRelTaxa() && (config.getCheck().isImport())){
     	        ICdmApplicationConfiguration app = bmImport.getCdmAppController();
     	        TransactionStatus tx = app.startTransaction();
-...
                     System.out.println(message);
+                }
                 UUID uuidCichorieaeGroup = UUID.fromString("a630938d-dd4f-48c2-9406-91def487b11e");
                 String cichorieaeGroupName = "cichorieae";
                 String cichorieaeGroupName = "Cichorieae";
                 Group cichorieaeGroup = checkGroup(app.getGroupService(), uuidCichorieaeGroup, cichorieaeGroupName, cichorieaeRoles);
                 cichorieaeGroup.addMember(userCichEditor);
                 app.getGroupService().saveOrUpdate(cichorieaeGroup);

     		ExtensionType isoCodeExtType = getExtensionType(state, BerlinModelTransformer.uuidIsoCode, "IsoCode", "IsoCode", "iso");
     		ExtensionType tdwgCodeExtType = getExtensionType(state, BerlinModelTransformer.uuidTdwgAreaCode, "TDWG code", "TDWG Area code", "tdwg");
     		ExtensionType mclCodeExtType = getExtensionType(state, BerlinModelTransformer.uuidMclCode, "MCL code", "MedCheckList code", "mcl");
     		NamedAreaLevel areaLevelTop = getNamedAreaLevel(state, BerlinModelTransformer.uuidAreaLevelTop, "Euro+Med top area level", "Euro+Med top area level. This level is only to be used for the area representing the complete Euro+Med area", "e+m top", null);
     		NamedAreaLevel areaLevelEm1 = getNamedAreaLevel(state, BerlinModelTransformer.uuidAreaLevelFirst, "Euro+Med 1. area level", "Euro+Med 1. area level", "e+m 1.", null);
     		NamedAreaLevel areaLevelEm2 = getNamedAreaLevel(state, BerlinModelTransformer.uuidAreaLevelSecond, "Euro+Med 2. area level", "Euro+Med 2. area level", "Euro+Med 1. area level", null);
     		NamedAreaLevel areaLevelTop = getNamedAreaLevel(state, BerlinModelTransformer.uuidEuroMedAreaLevelTop, "Euro+Med top area level", "Euro+Med top area level. This level is only to be used for the area representing the complete Euro+Med area", "e+m top", null);
     		NamedAreaLevel areaLevelEm1 = getNamedAreaLevel(state, BerlinModelTransformer.uuidEuroMedAreaLevelFirst, "Euro+Med 1. area level", "Euro+Med 1. area level", "e+m 1.", null);
     		NamedAreaLevel areaLevelEm2 = getNamedAreaLevel(state, BerlinModelTransformer.uuidEuroMedAreaLevelSecond, "Euro+Med 2. area level", "Euro+Med 2. area level", "Euro+Med 1. area level", null);
     		String sql = "SELECT * , CASE WHEN EMCode = 'EM' THEN 'a' ELSE 'b' END as isEM " +

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 249ab8e3

Added by Andreas Müller almost 9 years ago