diff --git a/models_and_helper_scripts/sample-management-datamodel.yml b/models_and_helper_scripts/sample-management-datamodel.yml index 78935e627bfd9b2e436a3cddfda6d48e1856115c..d2cb68d98bdcb1c906cf01354ecb30fb366551af 100644 --- a/models_and_helper_scripts/sample-management-datamodel.yml +++ b/models_and_helper_scripts/sample-management-datamodel.yml @@ -1,7 +1,6 @@ # -# -# Copyright (C) 2024 IndiScale <info@indiscale.com> -# Copyright (C) 2024 Florian Spreckelsen <f.spreckelsen@indiscale.com> +# Copyright (C) 2024-2025 IndiScale <info@indiscale.com> +# Copyright (C) 2024-2025 Florian Spreckelsen <f.spreckelsen@indiscale.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -28,21 +27,8 @@ Responsible: - ControlledRecordType obligatory_properties: Abbreviation: - description: An abbreviation for this entity that is used for creating BIS labels - datatype: TEXT -ResearchDivision: - inherit_from_obligatory: - - Responsible - obligatory_properties: - German name: - description: A german name for an entitiy. This can be used in queries since it is an alias. + description: An abbreviation for this entity that is used for identification purposes datatype: TEXT -ResearchUnit: - inherit_from_obligatory: - - Responsible - obligatory_properties: - German name: - ResearchDivision: Person: inherit_from_obligatory: - Responsible @@ -53,7 +39,6 @@ Person: datatype: TEXT Email: datatype: TEXT - ResearchUnit: ContainerType: inherit_from_obligatory: @@ -75,7 +60,7 @@ Container: description: The size of the container, e.g. number of spaces or dimension datatype: TEXT Custom label: - description: A custom label for a container that doesn't have to follow the BIS labeling guidelines. + description: A custom label for a container that doesn't have to follow the automatic labeling guidelines. datatype: TEXT Container Contents: datatype: TEXT diff --git a/test-profile/custom/other/restore/caosdb.dump.sql b/test-profile/custom/other/restore/caosdb.dump.sql index 1c574944aa88ae04fdb387942895cfcfcd2e0d7d..913434bfa2cfe81a8704413a3d483fccbe0f7e9a 100644 --- a/test-profile/custom/other/restore/caosdb.dump.sql +++ b/test-profile/custom/other/restore/caosdb.dump.sql @@ -46,7 +46,8 @@ CREATE TABLE `archive_collection_type` ( LOCK TABLES `archive_collection_type` WRITE; /*!40000 ALTER TABLE `archive_collection_type` DISABLE KEYS */; INSERT INTO `archive_collection_type` VALUES -(0,153,177,'LIST',1); +(0,153,177,'LIST',1), +(0,153,177,'LIST',2); /*!40000 ALTER TABLE `archive_collection_type` ENABLE KEYS */; UNLOCK TABLES; @@ -84,23 +85,37 @@ LOCK TABLES `archive_data_type` WRITE; /*!40000 ALTER TABLE `archive_data_type` DISABLE KEYS */; INSERT INTO `archive_data_type` VALUES (0,0,144,13,1), +(0,0,144,13,2), (0,0,145,13,1), +(0,0,145,13,2), (0,0,146,13,1), +(0,0,146,13,2), (0,0,147,13,1), +(0,0,147,13,2), +(0,0,102,14,1), +(0,0,114,14,1), (0,111,177,101,1), -(0,105,177,103,1), -(0,106,177,105,1), -(0,188,177,105,1), +(0,111,177,101,2), (0,111,178,110,1), +(0,111,178,110,2), (0,136,177,110,1), +(0,136,177,110,2), (0,118,178,111,1), +(0,118,178,111,2), (0,118,177,119,1), +(0,118,177,119,2), (0,118,179,120,1), +(0,118,179,120,2), (0,118,180,121,1), +(0,118,180,121,2), (0,119,178,138,1), +(0,119,178,138,2), (0,153,177,143,1), +(0,153,177,143,2), (0,150,177,148,1), -(0,153,178,148,1); +(0,150,177,148,2), +(0,153,178,148,1), +(0,153,178,148,2); /*!40000 ALTER TABLE `archive_data_type` ENABLE KEYS */; UNLOCK TABLES; @@ -268,23 +283,40 @@ CREATE TABLE `archive_entities` ( LOCK TABLES `archive_entities` WRITE; /*!40000 ALTER TABLE `archive_entities` DISABLE KEYS */; INSERT INTO `archive_entities` VALUES -(103,NULL,'RECORDTYPE',2,1), -(105,NULL,'RECORDTYPE',2,1), +(101,NULL,'RECORDTYPE',2,1), +(102,'An abbreviation for this entity that is used for creating BIS labels','PROPERTY',2,1), (106,NULL,'RECORDTYPE',2,1), +(106,NULL,'RECORDTYPE',2,2), +(110,NULL,'RECORDTYPE',2,1), (111,NULL,'RECORDTYPE',2,1), +(111,NULL,'RECORDTYPE',2,2), +(114,'A custom label for a container that doesn\'t have to follow the BIS labeling guidelines.','PROPERTY',2,1), (118,NULL,'RECORDTYPE',2,1), +(118,NULL,'RECORDTYPE',2,2), (119,NULL,'RECORDTYPE',2,1), +(119,NULL,'RECORDTYPE',2,2), (136,NULL,'RECORDTYPE',2,1), +(136,NULL,'RECORDTYPE',2,2), (143,NULL,'RECORDTYPE',2,1), +(143,NULL,'RECORDTYPE',2,2), (144,'The depth of the water in meters as a positive value','PROPERTY',2,1), +(144,'The depth of the water in meters as a positive value','PROPERTY',2,2), (145,'The depth in meters where the sampling took place as a positive value','PROPERTY',2,1), +(145,'The depth in meters where the sampling took place as a positive value','PROPERTY',2,2), (146,NULL,'PROPERTY',2,1), +(146,NULL,'PROPERTY',2,2), (147,NULL,'PROPERTY',2,1), +(147,NULL,'PROPERTY',2,2), (150,NULL,'RECORDTYPE',2,1), +(150,NULL,'RECORDTYPE',2,2), (153,NULL,'RECORDTYPE',2,1), +(153,NULL,'RECORDTYPE',2,2), (161,NULL,'RECORDTYPE',2,1), +(161,NULL,'RECORDTYPE',2,2), (162,NULL,'RECORDTYPE',2,1), +(162,NULL,'RECORDTYPE',2,2), (188,NULL,'RECORD',2,1), +(188,NULL,'RECORD',2,2), (192,NULL,'RECORD',2,1), (193,NULL,'RECORD',2,1), (193,NULL,'RECORD',3,2), @@ -438,10 +470,6 @@ INSERT INTO `archive_isa` VALUES (195,2,111,1), (196,1,136,1), (198,1,118,1), -(103,1,100,0), -(103,1,101,1), -(105,1,100,0), -(105,1,101,1), (106,1,100,0), (106,1,101,1), (153,1,150,1), @@ -449,7 +477,17 @@ INSERT INTO `archive_isa` VALUES (162,1,143,1), (193,3,111,1), (195,3,111,1), -(197,2,111,1); +(197,2,111,1), +(101,1,100,1), +(106,2,100,0), +(106,2,101,1), +(110,1,100,1), +(153,2,150,1), +(161,2,143,1), +(162,2,143,1), +(188,2,100,0), +(188,2,101,0), +(188,2,106,1); /*!40000 ALTER TABLE `archive_isa` ENABLE KEYS */; UNLOCK TABLES; @@ -491,8 +529,6 @@ INSERT INTO `archive_name_data` VALUES (0,193,20,'fad_mru_myn_2025_bld_1','FIX',0,2), (0,197,20,'fad_mru_myn_2025_fri_1','FIX',0,1), (0,195,20,'fad_mru_myn_2025_rom_1','FIX',0,2), -(0,103,20,'ResearchDivision','FIX',0,1), -(0,105,20,'ResearchUnit','FIX',0,1), (0,106,20,'Person','FIX',0,1), (0,111,20,'Container','FIX',0,1), (0,118,20,'Sample','FIX',0,1), @@ -509,7 +545,26 @@ INSERT INTO `archive_name_data` VALUES (0,162,20,'StopPosition','FIX',0,1), (0,193,20,'fad_mru_myn_2025_bld_1','FIX',0,3), (0,195,20,'fad_mru_myn_2025_rom_1','FIX',0,3), -(0,197,20,'fad_mru_myn_2025_fri_1','FIX',0,2); +(0,197,20,'fad_mru_myn_2025_fri_1','FIX',0,2), +(0,101,20,'Responsible','FIX',0,1), +(0,102,20,'Abbreviation','FIX',0,1), +(0,106,20,'Person','FIX',0,2), +(0,110,20,'ContainerType','FIX',0,1), +(0,111,20,'Container','FIX',0,2), +(0,114,20,'Custom label','FIX',0,1), +(0,118,20,'Sample','FIX',0,2), +(0,119,20,'NagoyaCase','FIX',0,2), +(0,136,20,'LabelCounter','FIX',0,2), +(0,143,20,'Position','FIX',0,2), +(0,144,20,'Water depth','FIX',0,2), +(0,145,20,'Sampling depth','FIX',0,2), +(0,146,20,'Latitude','FIX',0,2), +(0,147,20,'Longitude','FIX',0,2), +(0,150,20,'Event','FIX',0,2), +(0,153,20,'SourceEvent','FIX',0,2), +(0,161,20,'StartPosition','FIX',0,2), +(0,162,20,'StopPosition','FIX',0,2), +(0,188,20,'My Name','FIX',0,2); /*!40000 ALTER TABLE `archive_name_data` ENABLE KEYS */; UNLOCK TABLES; @@ -593,11 +648,6 @@ INSERT INTO `archive_null_data` VALUES (0,195,178,'FIX',0,2), (0,198,111,'FIX',1,1), (0,198,119,'FIX',2,1), -(0,103,104,'OBLIGATORY',0,1), -(0,103,102,'OBLIGATORY',0,1), -(0,105,104,'OBLIGATORY',0,1), -(0,105,177,'OBLIGATORY',0,1), -(0,105,102,'OBLIGATORY',0,1), (0,106,107,'OBLIGATORY',0,1), (0,106,108,'OBLIGATORY',1,1), (0,106,109,'OBLIGATORY',2,1), @@ -653,7 +703,65 @@ INSERT INTO `archive_null_data` VALUES (0,161,147,'OBLIGATORY',0,1), (0,162,146,'OBLIGATORY',0,1), (0,162,147,'OBLIGATORY',0,1), -(0,197,178,'FIX',0,2); +(0,197,178,'FIX',0,2), +(0,101,102,'OBLIGATORY',0,1), +(0,106,107,'OBLIGATORY',0,2), +(0,106,108,'OBLIGATORY',1,2), +(0,106,109,'OBLIGATORY',2,2), +(0,106,177,'OBLIGATORY',0,2), +(0,106,102,'OBLIGATORY',0,2), +(0,110,102,'OBLIGATORY',0,1), +(0,111,177,'OBLIGATORY',0,2), +(0,111,178,'OBLIGATORY',0,2), +(0,111,212,'SUGGESTED',2,2), +(0,111,179,'SUGGESTED',0,2), +(0,111,113,'SUGGESTED',4,2), +(0,111,114,'SUGGESTED',5,2), +(0,111,115,'SUGGESTED',6,2), +(0,111,116,'SUGGESTED',7,2), +(0,118,177,'RECOMMENDED',0,2), +(0,118,178,'RECOMMENDED',0,2), +(0,118,179,'RECOMMENDED',0,2), +(0,118,180,'RECOMMENDED',0,2), +(0,118,122,'RECOMMENDED',4,2), +(0,118,123,'RECOMMENDED',5,2), +(0,118,124,'RECOMMENDED',6,2), +(0,118,181,'SUGGESTED',0,2), +(0,118,182,'SUGGESTED',0,2), +(0,118,183,'SUGGESTED',0,2), +(0,118,184,'SUGGESTED',0,2), +(0,118,185,'SUGGESTED',0,2), +(0,118,130,'SUGGESTED',12,2), +(0,118,131,'SUGGESTED',13,2), +(0,118,132,'SUGGESTED',14,2), +(0,118,133,'SUGGESTED',15,2), +(0,118,134,'SUGGESTED',16,2), +(0,119,142,'OBLIGATORY',0,2), +(0,119,140,'RECOMMENDED',1,2), +(0,119,177,'SUGGESTED',0,2), +(0,119,178,'SUGGESTED',0,2), +(0,136,137,'OBLIGATORY',0,2), +(0,136,177,'OBLIGATORY',0,2), +(0,143,146,'OBLIGATORY',0,2), +(0,143,147,'OBLIGATORY',1,2), +(0,143,144,'RECOMMENDED',2,2), +(0,143,145,'RECOMMENDED',3,2), +(0,150,177,'OBLIGATORY',0,2), +(0,150,151,'RECOMMENDED',1,2), +(0,150,152,'SUGGESTED',2,2), +(0,153,177,'OBLIGATORY',0,2), +(0,153,178,'OBLIGATORY',0,2), +(0,153,154,'RECOMMENDED',2,2), +(0,153,155,'RECOMMENDED',3,2), +(0,153,156,'RECOMMENDED',4,2), +(0,153,157,'RECOMMENDED',5,2), +(0,153,158,'SUGGESTED',6,2), +(0,153,151,'RECOMMENDED',0,2), +(0,153,152,'SUGGESTED',0,2), +(0,161,146,'OBLIGATORY',0,2), +(0,161,147,'OBLIGATORY',0,2), +(0,162,146,'OBLIGATORY',0,2), +(0,162,147,'OBLIGATORY',0,2); /*!40000 ALTER TABLE `archive_null_data` ENABLE KEYS */; UNLOCK TABLES; @@ -717,8 +825,6 @@ CREATE TABLE `archive_reference_data` ( LOCK TABLES `archive_reference_data` WRITE; /*!40000 ALTER TABLE `archive_reference_data` DISABLE KEYS */; INSERT INTO `archive_reference_data` VALUES -(0,188,177,187,NULL,'FIX',0,1), -(0,188,105,177,NULL,'REPLACEMENT',4,1), (0,193,101,188,NULL,'FIX',0,1), (0,193,110,189,NULL,'FIX',1,1), (0,193,112,178,NULL,'REPLACEMENT',4,1), @@ -738,8 +844,6 @@ INSERT INTO `archive_reference_data` VALUES (0,195,112,178,NULL,'REPLACEMENT',4,2), (0,196,110,191,NULL,'FIX',1,1), (0,198,124,188,NULL,'FIX',0,1), -(0,105,103,177,NULL,'REPLACEMENT',1,1), -(0,106,105,177,NULL,'REPLACEMENT',3,1), (0,111,101,177,NULL,'REPLACEMENT',0,1), (0,111,110,178,NULL,'REPLACEMENT',1,1), (0,111,112,179,NULL,'REPLACEMENT',3,1), @@ -768,7 +872,25 @@ INSERT INTO `archive_reference_data` VALUES (0,195,112,178,NULL,'REPLACEMENT',4,3), (0,197,101,188,NULL,'FIX',0,2), (0,197,110,191,NULL,'FIX',1,2), -(0,197,112,178,NULL,'REPLACEMENT',4,2); +(0,197,112,178,NULL,'REPLACEMENT',4,2), +(0,111,101,177,NULL,'REPLACEMENT',0,2), +(0,111,110,178,NULL,'REPLACEMENT',1,2), +(0,111,112,179,NULL,'REPLACEMENT',3,2), +(0,118,119,177,NULL,'REPLACEMENT',0,2), +(0,118,111,178,NULL,'REPLACEMENT',1,2), +(0,118,120,179,NULL,'REPLACEMENT',2,2), +(0,118,121,180,NULL,'REPLACEMENT',3,2), +(0,118,125,181,NULL,'REPLACEMENT',7,2), +(0,118,126,182,NULL,'REPLACEMENT',8,2), +(0,118,127,183,NULL,'REPLACEMENT',9,2), +(0,118,128,184,NULL,'REPLACEMENT',10,2), +(0,118,129,185,NULL,'REPLACEMENT',11,2), +(0,119,141,177,NULL,'REPLACEMENT',2,2), +(0,119,138,178,NULL,'REPLACEMENT',3,2), +(0,136,110,177,NULL,'REPLACEMENT',1,2), +(0,150,148,177,NULL,'REPLACEMENT',0,2), +(0,153,143,177,NULL,'REPLACEMENT',0,2), +(0,153,148,178,NULL,'REPLACEMENT',1,2); /*!40000 ALTER TABLE `archive_reference_data` ENABLE KEYS */; UNLOCK TABLES; @@ -835,7 +957,23 @@ INSERT INTO `archive_text_data` VALUES (0,195,113,'30 m²','FIX',2,3), (0,195,177,'fad_mru_myn_2025_rom_1','FIX',0,3), (0,197,113,'300 l','FIX',2,2), -(0,197,177,'fad_mru_myn_2025_fri_1','FIX',0,2); +(0,197,177,'fad_mru_myn_2025_fri_1','FIX',0,2), +(143,146,21,'°','FIX',0,2), +(143,147,21,'°','FIX',0,2), +(143,144,21,'m','FIX',0,2), +(143,145,21,'m','FIX',0,2), +(0,144,21,'m','FIX',0,2), +(0,145,21,'m','FIX',0,2), +(0,146,21,'°','FIX',0,2), +(0,147,21,'°','FIX',0,2), +(161,146,21,'°','FIX',0,2), +(161,147,21,'°','FIX',0,2), +(162,146,21,'°','FIX',0,2), +(162,147,21,'°','FIX',0,2), +(0,188,107,'My','FIX',0,2), +(0,188,102,'myn','FIX',1,2), +(0,188,108,'Name','FIX',2,2), +(0,188,109,'my.name@example.com','FIX',3,2); /*!40000 ALTER TABLE `archive_text_data` ENABLE KEYS */; UNLOCK TABLES; @@ -954,10 +1092,6 @@ INSERT INTO `data_type` VALUES (0,0,151,15), (0,0,152,15), (0,111,177,101), -(0,105,177,103), -(0,187,177,103), -(0,106,177,105), -(0,188,177,105), (0,0,116,106), (0,0,123,106), (0,0,124,106), @@ -1160,10 +1294,8 @@ INSERT INTO `entities` VALUES (24,'Description of an entity.','PROPERTY',0), (100,'Abstract type to denote that a RecordType is controlled, i.e.,\nthat no new Records of this type may be created during\nsample/container upload. Add this type as a parent to any\nRecordType you want to be controlled.\n','RECORDTYPE',2), (101,NULL,'RECORDTYPE',2), -(102,'An abbreviation for this entity that is used for creating BIS labels','PROPERTY',2), -(103,NULL,'RECORDTYPE',2), +(102,'An abbreviation for this entity that is used for identification purposes','PROPERTY',2), (104,'A german name for an entitiy. This can be used in queries since it is an alias.','PROPERTY',2), -(105,NULL,'RECORDTYPE',2), (106,NULL,'RECORDTYPE',2), (107,NULL,'PROPERTY',2), (108,NULL,'PROPERTY',2), @@ -1172,7 +1304,7 @@ INSERT INTO `entities` VALUES (111,NULL,'RECORDTYPE',2), (112,NULL,'PROPERTY',2), (113,'The size of the container, e.g. number of spaces or dimension','PROPERTY',2), -(114,'A custom label for a container that doesn\'t have to follow the BIS labeling guidelines.','PROPERTY',2), +(114,'A custom label for a container that doesn\'t have to follow the automatic labeling guidelines.','PROPERTY',2), (115,NULL,'PROPERTY',2), (116,NULL,'PROPERTY',2), (118,NULL,'RECORDTYPE',2), @@ -1243,8 +1375,6 @@ INSERT INTO `entities` VALUES (183,NULL,'_REPLACEMENT',0), (184,NULL,'_REPLACEMENT',0), (185,NULL,'_REPLACEMENT',0), -(186,NULL,'RECORD',2), -(187,NULL,'RECORD',2), (188,NULL,'RECORD',2), (189,NULL,'RECORD',2), (190,NULL,'RECORD',2), @@ -1344,9 +1474,7 @@ INSERT INTO `entity_ids` VALUES ('102',100), ('103',101), ('104',102), -('105',103), ('106',104), -('107',105), ('108',106), ('109',107), ('110',108), @@ -1417,8 +1545,6 @@ INSERT INTO `entity_ids` VALUES ('176',174), ('177',175), ('178',176), -('179',186), -('180',187), ('181',188), ('182',189), ('183',190), @@ -1496,29 +1622,33 @@ INSERT INTO `entity_version` VALUES (24,NULL,'d78e2b50954d74d6946d2c113cb7393b3b6146f3',1,NULL,'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'), (100,NULL,'49a9b9af29eee9abeae35df062b9c427583e1f82',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (101,NULL,'d761933f0fb660cb3c456896d7a5cfb9da7b3ec6',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), +(101,NULL,'31093347d3ba357def98cef3ffa6f0c1ccf0c76b',2,1,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (102,NULL,'3a411f4a8633301cd3775e9eca91c456839ae455',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), -(103,NULL,'e9435f7be29bab1d255485c653b42323ab472061',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), -(103,NULL,'5f8848816e1e2f9575c27e0cb8530ac5b3e19507',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(102,NULL,'711edec90e7c99f3d88b090a1406b076930cb117',2,1,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (104,NULL,'511fa3fc006bd78100827dee34a831f53df5bc10',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), -(105,NULL,'14ede2bd053b53293bf0a08f1f2f2b41d1d5e753',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), -(105,NULL,'e40b717083e7a4654440295a36589a85f140db61',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), (106,NULL,'48edf0033a82b59a298788a8fd1134aaf5f0cb69',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (106,NULL,'32f2857be024df66d734a79c908061ae8d9fcedc',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(106,NULL,'00d1bb93d150633c1944bdb05c2361f2feeb485f',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (107,NULL,'c07e48a5242cec75dd484535af46788b845fc0c0',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (108,NULL,'ee1eae1aa831261b54a3b302f2a8fe3832caa821',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (109,NULL,'8faa2c5a80f734b894d60dd7f41a69f9686b323f',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (110,NULL,'969e58211cc801b7f29f7d9cf2d386843af3418e',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), +(110,NULL,'bcac18af5682f2b21c7675fc4eb6de3be39ae49a',2,1,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (111,NULL,'36c265d80cb5abb79d5671a1b431dd62e971e9b5',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (111,NULL,'83299d432a84245a01410042af78b1e332315114',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(111,NULL,'d14f134f53a5225fdf9f0377b8af341ae783b294',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (112,NULL,'fb580fe4757eee3dba822814fa51c18a18b761ca',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (113,NULL,'271372b1dfdd98d82b290ad3f40335fbf51d23b1',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (114,NULL,'cf3ab7cfb60c2492e90ddf765784084060508a7d',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), +(114,NULL,'93414b431e411d7007e885c5425dca3c8d634a67',2,1,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (115,NULL,'c3a15cdd5c2c50a8573ed8f58c70f54c437f6acf',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (116,NULL,'b8184c3ce8527029ffd55e5aa9919610fd2f5193',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (118,NULL,'68c8f4408696307d47f93015ecf286b079bd50ba',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (118,NULL,'f8a7baed3750fddb91d5109c5ed4fd6865500883',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(118,NULL,'a02a1cdfe936c3c73e957e5c097e978f50e50c73',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (119,NULL,'9bfc33ae0c6be37cb027a62afd792d1c311d006a',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (119,NULL,'61ee09a05b915dba2c6d158244966d3688ccef1a',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(119,NULL,'74f9449229abf6deadb11c428fd38c437f937f40',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (120,NULL,'46a17aea4446446e72aeaffc3a01ee2f2d5d9957',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (121,NULL,'cecee2780f2756778d57180bb6579333c6743420',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (122,NULL,'1ae73a81970c7cffda61f4354d3747495252da95',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1537,6 +1667,7 @@ INSERT INTO `entity_version` VALUES (135,NULL,'0f0c45a83c79dbdf7211691715154849d6f4b4f3',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (136,NULL,'6902c75485499ba6513b1faefb733322d9cb0239',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (136,NULL,'a65d632df3b40a0d9cdd748c0c578f9bfd538c27',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(136,NULL,'b46bbccd0a67d55e67d8df85a31132a8d77e3c93',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (137,NULL,'acd17699d752e90015eb8010e2f17ab5566a4241',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (138,NULL,'3c63009effd95704bc52400dc38ed7c8ccc63495',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (139,NULL,'54edec758a99a74f50577b74ba8a1ef187e08859',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1545,22 +1676,29 @@ INSERT INTO `entity_version` VALUES (142,NULL,'dc06b53bfef5dc59ccd33b646cb62cb66a37873e',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (143,NULL,'2a1014ad624089133ffbe85a7a39e82beeab2007',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (143,NULL,'96f98bad0aa7f4cf14e5e59a8608ede0cc2e4507',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(143,NULL,'4b5c04e5674df7eaae698b73caed073a6345e90a',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (144,NULL,'a1d4da47f82593afbb269cbf6fc2311b059812d7',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (144,NULL,'a80b7c60c82df12adde5a14916dd39832bfc6c02',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(144,NULL,'9acc339307deafd15e156c9510ff5ae67fdec6fb',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (145,NULL,'535909011d32dc82dc3368b463c01f471c72b5f6',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (145,NULL,'b881b96d70e6900c63fb9dd2709a3682e65028e9',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(145,NULL,'2c0bf525e0375c3d1ab95d1954202f929924aebf',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (146,NULL,'8ab9de04122cf31364610d3372f0d922b4e110a5',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (146,NULL,'26cf3920bc49690f1e071d1362d90ad3dde4051f',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(146,NULL,'2cf5987178082192f54fe85144721e28fb29cb20',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (147,NULL,'affd3537da482fb6655fc65cd223befedc845cb1',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (147,NULL,'f2f3f1bafbee48263ab7c5184a17b036f528bf8a',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(147,NULL,'3b26886ba59708accac6f63a5bb54cc94c4f7ece',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (148,NULL,'3dc270e8ab4ffded2b7f3412e97469022a389a62',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (149,NULL,'949f9468c06c34881820eeeea6bb999e510c3fac',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (150,NULL,'5a0c0116c267a8165eec4bdb0f6bc9393af4ebac',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (150,NULL,'ac659db37f8e5c0874677706da69a6d060a93f0f',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(150,NULL,'f6fd4f82e33dd54b6299106de95283f573f34973',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (151,NULL,'c5eb1e4ec70baa761c151d708676e4c436f28587',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (152,NULL,'8abed6579e778a2bf94e6e12b38791c7a7308b61',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (153,NULL,'a5e4f99ff9324eae679f20131b8b8da68846b1ad',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (153,NULL,'80a3d9eebdd6664a84a8b445c1716dba3cd747ba',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(153,NULL,'bf5595aedf69bb49b3ecf17fa8db422740b39aee',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (154,NULL,'3f8eb5ecfd51c5a745a4862013547d518b7b2955',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (155,NULL,'afbd70a177d0724af03b005dfa54d7a67825082a',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (156,NULL,'34e04866309d1f335fc6767aa9993ef6ee88dbd3',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1570,8 +1708,10 @@ INSERT INTO `entity_version` VALUES (160,NULL,'2c4ec676f3a5a7e6f7f322d047cef0ccd7e794f7',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (161,NULL,'2e5f4fab2cdd47e184fced9b5ea6dd54ba45cdb3',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (161,NULL,'bae9c9da4e3784233fa93ea8562bdf8109570eb9',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(161,NULL,'906ccfbc2adfdaaa0894f188becc08a2aedbf2e1',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (162,NULL,'49fd42751089f19e7d6bb5da57df79ba6cc546d2',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (162,NULL,'5d512dd3f177da0402db804e1f2f7d811302bddd',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'), +(162,NULL,'97e7860660e9f9bfdc54aff4eb8f1494ae975ca4',3,2,'cf5b2beb-6960-4eaf-8d7b-5e747f29f7be'), (163,NULL,'ac2b6777efb772874d95a88bc0062c520e4851c9',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (164,NULL,'767121db8cfc7592f4c50814393559b72614384d',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (165,NULL,'162195b8d54378680140bcc63a78109e83756525',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), @@ -1586,10 +1726,9 @@ INSERT INTO `entity_version` VALUES (174,NULL,'f5ab8459832337b7f5e21367039ccee6939334f0',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (175,NULL,'bf5412505c9414f6c376eb92fd327eb12c1af328',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), (176,NULL,'f5ae5b2f08624ee694e4a9b05eb59cd0d17501c9',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'), -(186,NULL,'4f341d574b7e8dede90e20f885bb16de0ef96be2',1,NULL,'ca9db47b-d2d5-4980-84da-7268869f9e3c'), -(187,NULL,'8a275960e8f28e8683d0fde450c1d6670b353199',1,NULL,'84bd4faf-510c-4950-b827-4bab81546887'), (188,NULL,'d5051e0414a4d4ceddc945eb0fffea1d4ee58a1a',1,NULL,'c6549725-13bb-4076-9d49-219c6b8192f3'), (188,NULL,'2358d20bb098701deefca886d99a9782ddc5918c',2,1,'55dcaf7b-7372-4778-995a-a6a8bde1b471'), +(188,NULL,'a3e64d6631599ba7a0f74caba7d1e3b7c80e7cc6',3,2,'372c0d25-a1ab-45d2-bf7e-76e583bf5192'), (189,NULL,'ed034b9364773357f149ad6027b35ba79488c8b6',1,NULL,'ce298544-326b-4b86-96fd-03de11548c9b'), (190,NULL,'ac6b26b6839869e664429dca95f29f8fbd44d50d',1,NULL,'cad02c5b-f559-4400-9897-80e56c1035ba'), (191,NULL,'ddb59c87045f1ef36a80194e9859b59a132d3f2c',1,NULL,'a41c5d15-6c9e-4e5c-a8fb-2fa7d38da140'), @@ -1776,10 +1915,6 @@ LOCK TABLES `isa_cache` WRITE; /*!40000 ALTER TABLE `isa_cache` DISABLE KEYS */; INSERT INTO `isa_cache` VALUES (101,100,'101'), -(103,100,'101'), -(103,101,'103'), -(105,100,'101'), -(105,101,'105'), (106,100,'101'), (106,101,'106'), (110,100,'110'), @@ -1804,12 +1939,6 @@ INSERT INTO `isa_cache` VALUES (174,100,'174'), (175,100,'175'), (176,100,'176'), -(186,100,'103>101'), -(186,101,'103'), -(186,103,'186'), -(187,100,'105>101'), -(187,101,'105'), -(187,105,'187'), (188,100,'106>101'), (188,101,'106'), (188,106,'188'), @@ -1908,9 +2037,7 @@ INSERT INTO `name_data` VALUES (0,100,20,'ControlledRecordType','FIX',0), (0,101,20,'Responsible','FIX',0), (0,102,20,'Abbreviation','FIX',0), -(0,103,20,'ResearchDivision','FIX',0), (0,104,20,'German name','FIX',0), -(0,105,20,'ResearchUnit','FIX',0), (0,106,20,'Person','FIX',0), (0,107,20,'First name','FIX',0), (0,108,20,'Last name','FIX',0), @@ -1981,8 +2108,6 @@ INSERT INTO `name_data` VALUES (0,174,20,'commonEnglishName','FIX',0), (0,175,20,'Taxonomic group/Species','FIX',0), (0,176,20,'Sample container','FIX',0), -(0,186,20,'Fancy Division','FIX',0), -(0,187,20,'MyResearchUnit','FIX',0), (0,188,20,'My Name','FIX',0), (0,189,20,'Building','FIX',0), (0,190,20,'Room','FIX',0), @@ -2064,8 +2189,6 @@ CREATE TABLE `null_data` ( LOCK TABLES `null_data` WRITE; /*!40000 ALTER TABLE `null_data` DISABLE KEYS */; INSERT INTO `null_data` VALUES -(0,101,102,'OBLIGATORY',0), -(0,110,102,'OBLIGATORY',0), (0,138,139,'OBLIGATORY',0), (0,148,149,'RECOMMENDED',0), (0,163,177,'RECOMMENDED',0), @@ -2075,16 +2198,13 @@ INSERT INTO `null_data` VALUES (0,199,149,'RECOMMENDED',0), (0,211,145,'FIX',2), (0,211,144,'FIX',3), -(0,103,104,'OBLIGATORY',0), -(0,103,102,'OBLIGATORY',0), -(0,105,104,'OBLIGATORY',0), -(0,105,177,'OBLIGATORY',0), -(0,105,102,'OBLIGATORY',0), +(0,197,177,'FIX',0), +(0,101,102,'OBLIGATORY',0), (0,106,107,'OBLIGATORY',0), (0,106,108,'OBLIGATORY',1), (0,106,109,'OBLIGATORY',2), -(0,106,177,'OBLIGATORY',0), (0,106,102,'OBLIGATORY',0), +(0,110,102,'OBLIGATORY',0), (0,111,177,'OBLIGATORY',0), (0,111,178,'OBLIGATORY',0), (0,111,212,'SUGGESTED',2), @@ -2135,8 +2255,7 @@ INSERT INTO `null_data` VALUES (0,161,146,'OBLIGATORY',0), (0,161,147,'OBLIGATORY',0), (0,162,146,'OBLIGATORY',0), -(0,162,147,'OBLIGATORY',0), -(0,197,177,'FIX',0); +(0,162,147,'OBLIGATORY',0); /*!40000 ALTER TABLE `null_data` ENABLE KEYS */; UNLOCK TABLES; @@ -2252,10 +2371,6 @@ LOCK TABLES `reference_data` WRITE; /*!40000 ALTER TABLE `reference_data` DISABLE KEYS */; INSERT INTO `reference_data` VALUES (0,163,164,177,'REPLACEMENT',0,NULL), -(0,187,177,186,'FIX',0,NULL), -(0,187,103,177,'REPLACEMENT',1,NULL), -(0,188,177,187,'FIX',0,NULL), -(0,188,105,177,'REPLACEMENT',4,NULL), (0,192,110,189,'FIX',1,NULL), (0,194,110,190,'FIX',1,NULL), (0,196,110,191,'FIX',1,NULL), @@ -2278,8 +2393,17 @@ INSERT INTO `reference_data` VALUES (0,198,160,207,'FIX',9,NULL), (0,198,180,209,'FIX',0,NULL), (0,198,171,180,'REPLACEMENT',10,NULL), -(0,105,103,177,'REPLACEMENT',1,NULL), -(0,106,105,177,'REPLACEMENT',3,NULL), +(0,193,101,188,'FIX',0,NULL), +(0,193,110,189,'FIX',1,NULL), +(0,193,177,195,'FIX',0,NULL), +(0,193,112,177,'REPLACEMENT',3,NULL), +(0,195,101,188,'FIX',0,NULL), +(0,195,110,190,'FIX',1,NULL), +(0,195,177,197,'FIX',0,NULL), +(0,195,112,177,'REPLACEMENT',3,NULL), +(0,197,101,188,'FIX',0,NULL), +(0,197,110,191,'FIX',1,NULL), +(0,197,112,177,'REPLACEMENT',3,NULL), (0,111,101,177,'REPLACEMENT',0,NULL), (0,111,110,178,'REPLACEMENT',1,NULL), (0,111,112,179,'REPLACEMENT',3,NULL), @@ -2297,18 +2421,7 @@ INSERT INTO `reference_data` VALUES (0,136,110,177,'REPLACEMENT',1,NULL), (0,150,148,177,'REPLACEMENT',0,NULL), (0,153,143,177,'REPLACEMENT',0,NULL), -(0,153,148,178,'REPLACEMENT',1,NULL), -(0,193,101,188,'FIX',0,NULL), -(0,193,110,189,'FIX',1,NULL), -(0,193,177,195,'FIX',0,NULL), -(0,193,112,177,'REPLACEMENT',3,NULL), -(0,195,101,188,'FIX',0,NULL), -(0,195,110,190,'FIX',1,NULL), -(0,195,177,197,'FIX',0,NULL), -(0,195,112,177,'REPLACEMENT',3,NULL), -(0,197,101,188,'FIX',0,NULL), -(0,197,110,191,'FIX',1,NULL), -(0,197,112,177,'REPLACEMENT',3,NULL); +(0,153,148,178,'REPLACEMENT',1,NULL); /*!40000 ALTER TABLE `reference_data` ENABLE KEYS */; UNLOCK TABLES; @@ -2359,7 +2472,7 @@ CREATE TABLE `stats` ( LOCK TABLES `stats` WRITE; /*!40000 ALTER TABLE `stats` DISABLE KEYS */; INSERT INTO `stats` VALUES -('RootBenchmark','��\0sr\0-org.caosdb.server.database.misc.RootBenchmark����Qk]\0\0xr\04org.caosdb.server.database.misc.TransactionBenchmark����Qk]\0J\0sinceL\0measurementst\0Ljava/util/Map;[\0stackTraceElementst\0[Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0����sr\0java.util.HashMap���`�\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xur\0[Ljava.lang.StackTraceElement;F*<<�\"9\0\0xp\0\0\0sr\0java.lang.StackTraceElementa Ś&6݅\0B\0formatI\0\nlineNumberL\0classLoaderNamet\0Ljava/lang/String;L\0declaringClassq\0~\0\nL\0fileNameq\0~\0\nL\0\nmethodNameq\0~\0\nL\0\nmoduleNameq\0~\0\nL\0\rmoduleVersionq\0~\0\nxp\0\0Spt\0java.lang.Threadt\0Thread.javat\0\rgetStackTracet\0 java.baset\017.0.13sq\0~\0 \0\0!t\0appt\04org.caosdb.server.database.misc.TransactionBenchmarkt\0TransactionBenchmark.javat\0<init>ppsq\0~\0 \0\0\0�q\0~\0t\0-org.caosdb.server.database.misc.RootBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0 \0\0fq\0~\0t\0org.caosdb.server.CaosDBServert\0CaosDBServer.javat\0initBackendppsq\0~\0 \0\0\0�q\0~\0q\0~\0q\0~\0t\0mainppsq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmark����Qk]\0L\0nameq\0~\0\nxq\0~\0\0\0����sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0\nsq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0t\0,org.caosdb.server.database.misc.SubBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0t\0getBenchmarkppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\0$q\0~\0t\02org.caosdb.server.transaction.TransactionInterfacet\0TransactionInterface.javat\0getTransactionBenchmarkppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/t\0executeppsq\0~\0 \0\0\0�q\0~\0t\0org.caosdb.server.utils.Infot\0 Info.javat\0syncDatabaseppsq\0~\0 \0\0\0�q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0 SyncStatssq\0~\0\"\0\0����sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0MySQLSyncStatssq\0~\0\"\0\0����sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0q\0~\0t\0-org.caosdb.server.database.BackendTransactiont\0BackendTransaction.javat\0getImplementationppsq\0~\0 \0\0\0+q\0~\0t\08org.caosdb.server.database.backend.transaction.SyncStatst\0SyncStats.javaq\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\0Tq\0~\0Ut\0executeTransactionppsq\0~\0 \0\0\01q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xq\0~\0Jxq\0~\0<xq\0~\0!x'), +('RootBenchmark','��\0sr\0-org.caosdb.server.database.misc.RootBenchmark����Qk]\0\0xr\04org.caosdb.server.database.misc.TransactionBenchmark����Qk]\0J\0sinceL\0measurementst\0Ljava/util/Map;[\0stackTraceElementst\0[Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0��ͻUsr\0java.util.HashMap���`�\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xur\0[Ljava.lang.StackTraceElement;F*<<�\"9\0\0xp\0\0\0sr\0java.lang.StackTraceElementa Ś&6݅\0B\0formatI\0\nlineNumberL\0classLoaderNamet\0Ljava/lang/String;L\0declaringClassq\0~\0\nL\0fileNameq\0~\0\nL\0\nmethodNameq\0~\0\nL\0\nmoduleNameq\0~\0\nL\0\rmoduleVersionq\0~\0\nxp\0\0Spt\0java.lang.Threadt\0Thread.javat\0\rgetStackTracet\0 java.baset\017.0.13sq\0~\0 \0\0!t\0appt\04org.caosdb.server.database.misc.TransactionBenchmarkt\0TransactionBenchmark.javat\0<init>ppsq\0~\0 \0\0\0�q\0~\0t\0-org.caosdb.server.database.misc.RootBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0 \0\0fq\0~\0t\0org.caosdb.server.CaosDBServert\0CaosDBServer.javat\0initBackendppsq\0~\0 \0\0\0�q\0~\0q\0~\0q\0~\0t\0mainppsq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmark����Qk]\0L\0nameq\0~\0\nxq\0~\0\0\0��ͻXsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0\nsq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0t\0,org.caosdb.server.database.misc.SubBenchmarkq\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0t\0getBenchmarkppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\0$q\0~\0t\02org.caosdb.server.transaction.TransactionInterfacet\0TransactionInterface.javat\0getTransactionBenchmarkppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/t\0executeppsq\0~\0 \0\0\0�q\0~\0t\0org.caosdb.server.utils.Infot\0 Info.javat\0syncDatabaseppsq\0~\0 \0\0\0�q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0 SyncStatssq\0~\0\"\0\0��ͻXsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0 sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0\00q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0t\0MySQLSyncStatssq\0~\0\"\0\0��ͻYsq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xuq\0~\0\0\0\0sq\0~\0 \0\0Spq\0~\0q\0~\0\rq\0~\0q\0~\0q\0~\0sq\0~\0 \0\0!q\0~\0q\0~\0q\0~\0q\0~\0ppsq\0~\0 \0\0\0�q\0~\0q\0~\0)q\0~\0q\0~\0ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0�q\0~\0q\0~\0q\0~\0q\0~\0+ppsq\0~\0 \0\0q\0~\0t\0-org.caosdb.server.database.BackendTransactiont\0BackendTransaction.javat\0getImplementationppsq\0~\0 \0\0\0+q\0~\0t\08org.caosdb.server.database.backend.transaction.SyncStatst\0SyncStats.javaq\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\0Tq\0~\0Ut\0executeTransactionppsq\0~\0 \0\0\01q\0~\0q\0~\0.q\0~\0/q\0~\02ppsq\0~\0 \0\0\0�q\0~\0q\0~\04q\0~\05q\0~\06ppsq\0~\0 \0\0\0�q\0~\0q\0~\08q\0~\0q\0~\09ppsq\0~\0 \0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0\0w\0\0\0\0\0\0\0xq\0~\0Jxq\0~\0<xq\0~\0!x'), ('TransactionBenchmark','��\0sr\00caosdb.server.database.misc.TransactionBenchmark�Cl=���E\0J\0sinceL\0acct\0Ljava/util/HashMap;L\0countsq\0~\0xp\0\0l���Wsr\0java.util.HashMap���`�\0F\0\nloadFactorI\0 thresholdxp?@\0\0\0\0\0w\0\0\0\0\0\0t\0 SyncStatssr\0java.lang.Long;��̏#�\0J\0valuexr\0java.lang.Number������\0\0xp\0\0\0\0\0\0\0t\0GetInfosq\0~\0\0\0\0\0\0\0 xsq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0q\0~\0sr\0java.lang.Integer⠤���8\0I\0valuexq\0~\0\0\0\0q\0~\0 sq\0~\0\0\0\0x'); /*!40000 ALTER TABLE `stats` ENABLE KEYS */; UNLOCK TABLES; @@ -2394,17 +2507,9 @@ CREATE TABLE `text_data` ( LOCK TABLES `text_data` WRITE; /*!40000 ALTER TABLE `text_data` DISABLE KEYS */; INSERT INTO `text_data` VALUES -(0,186,104,'Spannende Abteilung','FIX',0), -(0,186,102,'fad','FIX',1), -(0,187,102,'mru','FIX',0), -(0,187,104,'Meine Forschungsgruppe','FIX',2), (0,189,102,'bld','FIX',0), (0,190,102,'rom','FIX',0), (0,191,102,'fri','FIX',0), -(0,188,107,'My','FIX',0), -(0,188,102,'myn','FIX',1), -(0,188,108,'Name','FIX',2), -(0,188,109,'my.name@example.com','FIX',3), (0,200,149,'2m','FIX',0), (0,202,142,'ABCD-1234','FIX',0), (0,204,166,'Nails','FIX',0), @@ -2413,6 +2518,9 @@ INSERT INTO `text_data` VALUES (211,147,21,'°','FIX',0), (211,145,21,'m','FIX',0), (211,144,21,'m','FIX',0), +(0,193,113,'20 rooms','FIX',2), +(0,195,113,'30 m²','FIX',2), +(0,197,113,'300 l','FIX',2), (143,146,21,'°','FIX',0), (143,147,21,'°','FIX',0), (143,144,21,'m','FIX',0), @@ -2425,9 +2533,10 @@ INSERT INTO `text_data` VALUES (161,147,21,'°','FIX',0), (162,146,21,'°','FIX',0), (162,147,21,'°','FIX',0), -(0,193,113,'20 rooms','FIX',2), -(0,195,113,'30 m²','FIX',2), -(0,197,113,'300 l','FIX',2); +(0,188,107,'My','FIX',0), +(0,188,102,'myn','FIX',1), +(0,188,108,'Name','FIX',2), +(0,188,109,'my.name@example.com','FIX',3); /*!40000 ALTER TABLE `text_data` ENABLE KEYS */; UNLOCK TABLES; @@ -2589,7 +2698,30 @@ INSERT INTO `transaction_log` VALUES ('Update','186','admin',1737542873,229000000,'PAM'), ('Update','188','admin',1737542878,789000000,'PAM'), ('Update','190','admin',1737542888,999000000,'PAM'), -('Delete','119','admin',1737542900,973000000,'PAM'); +('Delete','119','admin',1737542900,973000000,'PAM'), +('Update','103','admin',1737714440,921000000,'PAM'), +('Update','104','admin',1737714440,921000000,'PAM'), +('Update','108','admin',1737714440,921000000,'PAM'), +('Update','112','admin',1737714440,921000000,'PAM'), +('Update','113','admin',1737714440,921000000,'PAM'), +('Update','116','admin',1737714440,921000000,'PAM'), +('Update','120','admin',1737714440,921000000,'PAM'), +('Update','121','admin',1737714440,921000000,'PAM'), +('Update','138','admin',1737714440,921000000,'PAM'), +('Update','145','admin',1737714440,921000000,'PAM'), +('Update','146','admin',1737714440,921000000,'PAM'), +('Update','147','admin',1737714440,921000000,'PAM'), +('Update','148','admin',1737714440,921000000,'PAM'), +('Update','149','admin',1737714440,921000000,'PAM'), +('Update','152','admin',1737714440,921000000,'PAM'), +('Update','155','admin',1737714440,921000000,'PAM'), +('Update','163','admin',1737714440,921000000,'PAM'), +('Update','164','admin',1737714440,921000000,'PAM'), +('Update','181','admin',1737714467,357000000,'PAM'), +('Delete','180','admin',1737714483,466000000,'PAM'), +('Delete','179','admin',1737714485,611000000,'PAM'), +('Delete','107','admin',1737714497,308000000,'PAM'), +('Delete','105','admin',1737714500,565000000,'PAM'); /*!40000 ALTER TABLE `transaction_log` ENABLE KEYS */; UNLOCK TABLES; @@ -2621,6 +2753,9 @@ INSERT INTO `transactions` VALUES ('06147cec-8ac2-4c72-9744-cab44e960e09','admin','PAM',1736265865,579000000), ('081a60fb-04b9-4d71-b025-d865b503fc7e','admin','PAM',1736265822,771000000), ('090f0927-a7b8-46cf-a416-98d1185c3518','admin','PAM',1737542837,887000000), +('188f6885-b663-496d-a87a-8b85326b0aa6','admin','PAM',1737714500,565000000), +('1df25a73-1003-4d10-9684-2945d2bd8b3f','admin','PAM',1737714485,611000000), +('1e0cf9db-9fbc-448a-a2eb-e6e5dd48f301','admin','PAM',1737714497,308000000), ('20f056fc-7deb-4c52-a54f-a80a92236315','admin','PAM',1736264636,79000000), ('22245d86-e095-4514-917a-7677616c544b','admin','PAM',1736265602,369000000), ('26be7fc5-b8d5-47d9-bbd3-59e5a00be685','admin','PAM',1737542900,973000000), @@ -2629,6 +2764,7 @@ INSERT INTO `transactions` VALUES ('2d5a4ba7-517f-4b85-9727-b3d96988c485','admin','PAM',1736265392,478000000), ('2df660f0-e3a6-447e-837f-4778e5323f5d','admin','PAM',1736265392,576000000), ('34fade63-2811-4725-becf-0f2b1f84ad90','admin','PAM',1736265204,999000000), +('372c0d25-a1ab-45d2-bf7e-76e583bf5192','admin','PAM',1737714467,357000000), ('3c931e13-7e9f-4835-99df-d325020b887d','admin','PAM',1736265488,391000000), ('488967a3-a042-43d4-b74d-485f4bf622a2','admin','PAM',1736265441,647000000), ('55dcaf7b-7372-4778-995a-a6a8bde1b471','admin','PAM',1736264805,952000000), @@ -2654,12 +2790,14 @@ INSERT INTO `transactions` VALUES ('cbb111a6-b62c-4705-b1c4-36f055b3c815','admin','PAM',1736265656,336000000), ('cd4b5be6-82c4-4444-bb3e-143ea3c1fcfe','admin','PAM',1736265896,593000000), ('ce298544-326b-4b86-96fd-03de11548c9b','admin','PAM',1736264727,998000000), +('cf5b2beb-6960-4eaf-8d7b-5e747f29f7be','admin','PAM',1737714440,921000000), ('cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e','administration','CaosDB',0,0), ('d0af8a57-7550-42b2-aba9-4b254897976b','admin','PAM',1736265392,704000000), ('da56170f-ae54-4ecf-9aa4-342d7512384f','admin','PAM',1736265798,309000000), ('daa492ef-1495-4123-9966-9951328211b3','admin','PAM',1736265204,580000000), ('dbf1dd0f-405c-4952-b8b6-62e169c79397','admin','PAM',1736265204,802000000), ('df3a0e97-6feb-42aa-8800-074ee5520428','admin','PAM',1736265392,321000000), +('e27923fa-df80-4883-9f70-03ed7dbe8fcc','admin','PAM',1737714483,466000000), ('f284f0d8-aba2-44e9-bfc7-ae68fab970b9','admin','PAM',1736265770,375000000), ('fe535f2d-6865-41b7-bab1-781f412454f6','admin','PAM',1736265441,988000000); /*!40000 ALTER TABLE `transactions` ENABLE KEYS */; @@ -7131,4 +7269,4 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-01-22 10:48:39 +-- Dump completed on 2025-01-24 10:29:19