From 7ff39fa3e6384f6a023d2f2c8e164bf4fc44cb34 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Wed, 22 Jan 2025 11:50:30 +0100
Subject: [PATCH] FIX: Fix typos and datamodel problems

---
 .../sample-management-datamodel.yml           |   2 +-
 .../scripting/bin/register_new_containers.py  |  12 +-
 .../bin/sample_helpers/container_name.py      |   4 +-
 .../scripting/bin/sample_helpers/utils.py     |   8 +-
 .../custom/other/restore/caosdb.dump.sql      | 403 ++++++++++++++----
 5 files changed, 324 insertions(+), 105 deletions(-)

diff --git a/models_and_helper_scripts/sample-management-datamodel.yml b/models_and_helper_scripts/sample-management-datamodel.yml
index dd30639..78935e6 100644
--- a/models_and_helper_scripts/sample-management-datamodel.yml
+++ b/models_and_helper_scripts/sample-management-datamodel.yml
@@ -65,10 +65,10 @@ Container:
   obligatory_properties:
     Responsible:
     ContainerType:
+  suggested_properties:
     container_label:
       description: A standardized label for a container
       datatype: TEXT
-  suggested_properties:
     Child container:
       datatype: LIST<Container>
     Container size:
diff --git a/sample-management-custom/caosdb-server/scripting/bin/register_new_containers.py b/sample-management-custom/caosdb-server/scripting/bin/register_new_containers.py
index f68c350..12d3224 100755
--- a/sample-management-custom/caosdb-server/scripting/bin/register_new_containers.py
+++ b/sample-management-custom/caosdb-server/scripting/bin/register_new_containers.py
@@ -28,7 +28,7 @@ import json
 import logging
 import sys
 
-import caosdb as db
+import linkahead as db
 from caosadvancedtools.serverside import helper
 from caosadvancedtools.serverside.logging import configure_server_side_logging
 
@@ -126,16 +126,18 @@ def create_container_entities(responsible_id, container_type_id, container_size,
     # Post process child containers
     batch = post_process_containers(batch)
     try:
+        logger.info(batch)
         batch.insert()
-    except:
-        logger.error("{}The registered containers could not be imported to the system.{}".format(
+    except Exception as e:
+        logger.error("{} The registered containers could not be imported to the system. {}".format(
             ERROR_PREFIX, ERROR_SUFFIX))
+        logger.error(e)
         return None
         # TODO: Reset the internal_container_label_counter of person to its previous value if nothing has be inserted
 
     # Add to parent container
     if parent_container is not None:
-        child_cont_prop = db.Property(name=get_entity_name("child_container_prop").retrieve()
+        child_cont_prop = db.Property(name=get_entity_name("child_container_prop")).retrieve()
         new_childs=[]
         for entity in batch:
             new_childs += [entity.id]
@@ -148,7 +150,7 @@ def create_container_entities(responsible_id, container_type_id, container_size,
                 parent_container.get_property(child_cont_prop.name).value=new_childs
             else:
                 parent_container.get_property(child_cont_prop.name).value += new_childs
-        parent_container=post_process_parent_container(parent)
+        parent_container=post_process_parent_container(parent_container)
         parent_container.update()
 
     set_label_counter(container_type_id=container_type_id,
diff --git a/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/container_name.py b/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/container_name.py
index 0d45834..efcab85 100644
--- a/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/container_name.py
+++ b/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/container_name.py
@@ -55,8 +55,8 @@ def get_container_name_prefix(responsible_id: int, container_type_id: int) -> st
         Name in the format `<responsible>_<container_type_name>`
 
     """
-    resp = db.cached_get_entity_by(eid=responsible_id)
-    ct = db.cached_get_entity_by(eid=container_type_id)
+    resp = db.cached.cached_get_entity_by(eid=responsible_id)
+    ct = db.cached.cached_get_entity_by(eid=container_type_id)
 
     resp_str = get_record_string(resp)
     ct_str = get_record_string(ct)
diff --git a/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/utils.py b/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/utils.py
index b80215b..e345c22 100644
--- a/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/utils.py
+++ b/sample-management-custom/caosdb-server/scripting/bin/sample_helpers/utils.py
@@ -3,10 +3,12 @@ import yaml
 
 from pathlib import Path
 
-CONSTANTS = yaml.load(os.path.join(Path(__file__).parent, "default_constants.yml"))
+with open(os.path.join(Path(__file__).parent, "default_constants.yml")) as yaml_file:
+    CONSTANTS = yaml.safe_load(yaml_file)
 
 if os.path.isfile(os.path.join(Path(__file__).parent, "constants.yml")):
-    CONSTANTS.update(yaml.load(os.path.join(Path(__file__).parent, "constants.yml")))
+    with open(os.path.join(Path(__file__).parent, "constants.yml")) as custom_yaml_file:
+        CONSTANTS.update(yaml.safe_load(custom_yaml_file))
 
 
 def get_entity_name(name: str):
@@ -21,6 +23,6 @@ def get_entity_name(name: str):
 def get_column_header_name(name: str):
 
     if name in CONSTANTS["csv_column_names"]:
-        return CONSTANTS["csv_column_names"]
+        return CONSTANTS["csv_column_names"][name]
 
     return get_entity_name(name)
diff --git a/test-profile/custom/other/restore/caosdb.dump.sql b/test-profile/custom/other/restore/caosdb.dump.sql
index 1182c12..1c57494 100644
--- a/test-profile/custom/other/restore/caosdb.dump.sql
+++ b/test-profile/custom/other/restore/caosdb.dump.sql
@@ -45,6 +45,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);
 /*!40000 ALTER TABLE `archive_collection_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -81,7 +83,24 @@ CREATE TABLE `archive_data_type` (
 LOCK TABLES `archive_data_type` WRITE;
 /*!40000 ALTER TABLE `archive_data_type` DISABLE KEYS */;
 INSERT INTO `archive_data_type` VALUES
-(0,188,177,105,1);
+(0,0,144,13,1),
+(0,0,145,13,1),
+(0,0,146,13,1),
+(0,0,147,13,1),
+(0,111,177,101,1),
+(0,105,177,103,1),
+(0,106,177,105,1),
+(0,188,177,105,1),
+(0,111,178,110,1),
+(0,136,177,110,1),
+(0,118,178,111,1),
+(0,118,177,119,1),
+(0,118,179,120,1),
+(0,118,180,121,1),
+(0,119,178,138,1),
+(0,153,177,143,1),
+(0,150,177,148,1),
+(0,153,178,148,1);
 /*!40000 ALTER TABLE `archive_data_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -249,15 +268,34 @@ 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),
+(106,NULL,'RECORDTYPE',2,1),
+(111,NULL,'RECORDTYPE',2,1),
+(118,NULL,'RECORDTYPE',2,1),
+(119,NULL,'RECORDTYPE',2,1),
+(136,NULL,'RECORDTYPE',2,1),
+(143,NULL,'RECORDTYPE',2,1),
+(144,'The depth of the water in meters as a positive value','PROPERTY',2,1),
+(145,'The depth in meters where the sampling took place as a positive value','PROPERTY',2,1),
+(146,NULL,'PROPERTY',2,1),
+(147,NULL,'PROPERTY',2,1),
+(150,NULL,'RECORDTYPE',2,1),
+(153,NULL,'RECORDTYPE',2,1),
+(161,NULL,'RECORDTYPE',2,1),
+(162,NULL,'RECORDTYPE',2,1),
 (188,NULL,'RECORD',2,1),
 (192,NULL,'RECORD',2,1),
 (193,NULL,'RECORD',2,1),
 (193,NULL,'RECORD',3,2),
+(193,NULL,'RECORD',3,3),
 (194,NULL,'RECORD',2,1),
 (195,NULL,'RECORD',2,1),
 (195,NULL,'RECORD',3,2),
+(195,NULL,'RECORD',3,3),
 (196,NULL,'RECORD',2,1),
 (197,NULL,'RECORD',2,1),
+(197,NULL,'RECORD',3,2),
 (198,NULL,'RECORD',2,1);
 /*!40000 ALTER TABLE `archive_entities` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -399,7 +437,19 @@ INSERT INTO `archive_isa` VALUES
 (197,1,111,1),
 (195,2,111,1),
 (196,1,136,1),
-(198,1,118,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),
+(161,1,143,1),
+(162,1,143,1),
+(193,3,111,1),
+(195,3,111,1),
+(197,2,111,1);
 /*!40000 ALTER TABLE `archive_isa` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -440,7 +490,26 @@ INSERT INTO `archive_name_data` VALUES
 (0,195,20,'fad_mru_myn_2025_rom_1','FIX',0,1),
 (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,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),
+(0,119,20,'NagoyaCase','FIX',0,1),
+(0,136,20,'LabelCounter','FIX',0,1),
+(0,143,20,'Position','FIX',0,1),
+(0,144,20,'Water depth','FIX',0,1),
+(0,145,20,'Sampling depth','FIX',0,1),
+(0,146,20,'Latitude','FIX',0,1),
+(0,147,20,'Longitude','FIX',0,1),
+(0,150,20,'Event','FIX',0,1),
+(0,153,20,'SourceEvent','FIX',0,1),
+(0,161,20,'StartPosition','FIX',0,1),
+(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);
 /*!40000 ALTER TABLE `archive_name_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -477,9 +546,12 @@ LOCK TABLES `archive_name_overrides` WRITE;
 INSERT INTO `archive_name_overrides` VALUES
 (0,193,177,'BIS label',1),
 (0,193,177,'BIS label',2),
+(0,193,177,'BIS label',3),
 (0,195,177,'BIS label',1),
 (0,195,177,'BIS label',2),
-(0,197,177,'BIS label',1);
+(0,195,177,'BIS label',3),
+(0,197,177,'BIS label',1),
+(0,197,177,'BIS label',2);
 /*!40000 ALTER TABLE `archive_name_overrides` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -520,7 +592,68 @@ INSERT INTO `archive_null_data` VALUES
 (0,197,178,'FIX',0,1),
 (0,195,178,'FIX',0,2),
 (0,198,111,'FIX',1,1),
-(0,198,119,'FIX',2,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),
+(0,106,177,'OBLIGATORY',0,1),
+(0,106,102,'OBLIGATORY',0,1),
+(0,111,177,'OBLIGATORY',0,1),
+(0,111,178,'OBLIGATORY',0,1),
+(0,111,179,'SUGGESTED',0,1),
+(0,111,113,'SUGGESTED',4,1),
+(0,111,114,'SUGGESTED',5,1),
+(0,111,115,'SUGGESTED',6,1),
+(0,111,116,'SUGGESTED',7,1),
+(0,118,177,'RECOMMENDED',0,1),
+(0,118,178,'RECOMMENDED',0,1),
+(0,118,179,'RECOMMENDED',0,1),
+(0,118,180,'RECOMMENDED',0,1),
+(0,118,122,'RECOMMENDED',4,1),
+(0,118,123,'RECOMMENDED',5,1),
+(0,118,124,'RECOMMENDED',6,1),
+(0,118,181,'SUGGESTED',0,1),
+(0,118,182,'SUGGESTED',0,1),
+(0,118,183,'SUGGESTED',0,1),
+(0,118,184,'SUGGESTED',0,1),
+(0,118,185,'SUGGESTED',0,1),
+(0,118,130,'SUGGESTED',12,1),
+(0,118,131,'SUGGESTED',13,1),
+(0,118,132,'SUGGESTED',14,1),
+(0,118,133,'SUGGESTED',15,1),
+(0,118,134,'SUGGESTED',16,1),
+(0,119,142,'OBLIGATORY',0,1),
+(0,119,140,'RECOMMENDED',1,1),
+(0,119,177,'SUGGESTED',0,1),
+(0,119,178,'SUGGESTED',0,1),
+(0,136,137,'OBLIGATORY',0,1),
+(0,136,177,'OBLIGATORY',0,1),
+(0,143,146,'OBLIGATORY',0,1),
+(0,143,147,'OBLIGATORY',1,1),
+(0,143,144,'RECOMMENDED',2,1),
+(0,143,145,'RECOMMENDED',3,1),
+(0,150,177,'OBLIGATORY',0,1),
+(0,150,151,'RECOMMENDED',1,1),
+(0,150,152,'SUGGESTED',2,1),
+(0,153,177,'OBLIGATORY',0,1),
+(0,153,178,'OBLIGATORY',0,1),
+(0,153,154,'RECOMMENDED',2,1),
+(0,153,155,'RECOMMENDED',3,1),
+(0,153,156,'RECOMMENDED',4,1),
+(0,153,157,'RECOMMENDED',5,1),
+(0,153,158,'SUGGESTED',6,1),
+(0,153,151,'RECOMMENDED',0,1),
+(0,153,152,'SUGGESTED',0,1),
+(0,161,146,'OBLIGATORY',0,1),
+(0,161,147,'OBLIGATORY',0,1),
+(0,162,146,'OBLIGATORY',0,1),
+(0,162,147,'OBLIGATORY',0,1),
+(0,197,178,'FIX',0,2);
 /*!40000 ALTER TABLE `archive_null_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -588,28 +721,54 @@ INSERT INTO `archive_reference_data` VALUES
 (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,117,177,NULL,'REPLACEMENT',3,1),
 (0,193,112,178,NULL,'REPLACEMENT',4,1),
 (0,192,110,189,NULL,'FIX',1,1),
 (0,195,101,188,NULL,'FIX',0,1),
 (0,195,110,190,NULL,'FIX',1,1),
-(0,195,117,177,NULL,'REPLACEMENT',3,1),
 (0,195,112,178,NULL,'REPLACEMENT',4,1),
 (0,193,101,188,NULL,'FIX',0,2),
 (0,193,110,189,NULL,'FIX',1,2),
-(0,193,117,177,NULL,'REPLACEMENT',3,2),
 (0,193,112,178,NULL,'REPLACEMENT',4,2),
 (0,194,110,190,NULL,'FIX',1,1),
 (0,197,101,188,NULL,'FIX',0,1),
 (0,197,110,191,NULL,'FIX',1,1),
-(0,197,117,177,NULL,'REPLACEMENT',3,1),
 (0,197,112,178,NULL,'REPLACEMENT',4,1),
 (0,195,101,188,NULL,'FIX',0,2),
 (0,195,110,190,NULL,'FIX',1,2),
-(0,195,117,177,NULL,'REPLACEMENT',3,2),
 (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,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),
+(0,118,119,177,NULL,'REPLACEMENT',0,1),
+(0,118,111,178,NULL,'REPLACEMENT',1,1),
+(0,118,120,179,NULL,'REPLACEMENT',2,1),
+(0,118,121,180,NULL,'REPLACEMENT',3,1),
+(0,118,125,181,NULL,'REPLACEMENT',7,1),
+(0,118,126,182,NULL,'REPLACEMENT',8,1),
+(0,118,127,183,NULL,'REPLACEMENT',9,1),
+(0,118,128,184,NULL,'REPLACEMENT',10,1),
+(0,118,129,185,NULL,'REPLACEMENT',11,1),
+(0,119,141,177,NULL,'REPLACEMENT',2,1),
+(0,119,138,178,NULL,'REPLACEMENT',3,1),
+(0,136,110,177,NULL,'REPLACEMENT',1,1),
+(0,150,148,177,NULL,'REPLACEMENT',0,1),
+(0,153,143,177,NULL,'REPLACEMENT',0,1),
+(0,153,148,178,NULL,'REPLACEMENT',1,1),
+(0,193,101,188,NULL,'FIX',0,3),
+(0,193,110,189,NULL,'FIX',1,3),
+(0,193,178,195,NULL,'FIX',0,3),
+(0,193,112,178,NULL,'REPLACEMENT',4,3),
+(0,195,101,188,NULL,'FIX',0,3),
+(0,195,110,190,NULL,'FIX',1,3),
+(0,195,178,197,NULL,'FIX',0,3),
+(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);
 /*!40000 ALTER TABLE `archive_reference_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -658,7 +817,25 @@ INSERT INTO `archive_text_data` VALUES
 (0,197,113,'300 l','FIX',2,1),
 (0,197,177,'fad_mru_myn_2025_fri_1','FIX',0,1),
 (0,195,113,'30 m²','FIX',2,2),
-(0,195,177,'fad_mru_myn_2025_rom_1','FIX',0,2);
+(0,195,177,'fad_mru_myn_2025_rom_1','FIX',0,2),
+(143,146,21,'°','FIX',0,1),
+(143,147,21,'°','FIX',0,1),
+(143,144,21,'m','FIX',0,1),
+(143,145,21,'m','FIX',0,1),
+(0,144,21,'m','FIX',0,1),
+(0,145,21,'m','FIX',0,1),
+(0,146,21,'°','FIX',0,1),
+(0,147,21,'°','FIX',0,1),
+(161,146,21,'°','FIX',0,1),
+(161,147,21,'°','FIX',0,1),
+(162,146,21,'°','FIX',0,1),
+(162,147,21,'°','FIX',0,1),
+(0,193,113,'20 rooms','FIX',2,3),
+(0,193,177,'fad_mru_myn_2025_bld_1','FIX',0,3),
+(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);
 /*!40000 ALTER TABLE `archive_text_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -752,7 +929,6 @@ INSERT INTO `data_type` VALUES
 (0,0,113,14),
 (0,0,114,14),
 (0,0,115,14),
-(0,0,117,14),
 (0,0,125,14),
 (0,0,126,14),
 (0,0,127,14),
@@ -772,6 +948,7 @@ INSERT INTO `data_type` VALUES
 (0,0,158,14),
 (0,0,164,14),
 (0,0,166,14),
+(0,0,212,14),
 (0,0,132,15),
 (0,0,133,15),
 (0,0,151,15),
@@ -953,7 +1130,7 @@ CREATE TABLE `entities` (
   PRIMARY KEY (`id`),
   KEY `entity_entity_acl` (`acl`),
   CONSTRAINT `entity_entity_acl` FOREIGN KEY (`acl`) REFERENCES `entity_acl` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=212 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=213 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -998,7 +1175,6 @@ INSERT INTO `entities` VALUES
 (114,'A custom label for a container that doesn\'t have to follow the BIS labeling guidelines.','PROPERTY',2),
 (115,NULL,'PROPERTY',2),
 (116,NULL,'PROPERTY',2),
-(117,'A standardized label for a container in BIS.','PROPERTY',2),
 (118,NULL,'RECORDTYPE',2),
 (119,NULL,'RECORDTYPE',2),
 (120,NULL,'RECORDTYPE',2),
@@ -1092,7 +1268,8 @@ INSERT INTO `entities` VALUES
 (208,NULL,'RECORD',2),
 (209,NULL,'RECORD',2),
 (210,NULL,'RECORD',2),
-(211,NULL,'RECORD',2);
+(211,NULL,'RECORD',2),
+(212,'A standardized label for a container','PROPERTY',2);
 /*!40000 ALTER TABLE `entities` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1181,7 +1358,6 @@ INSERT INTO `entity_ids` VALUES
 ('116',114),
 ('117',115),
 ('118',116),
-('119',117),
 ('120',118),
 ('121',119),
 ('122',120),
@@ -1266,7 +1442,8 @@ INSERT INTO `entity_ids` VALUES
 ('201',208),
 ('202',209),
 ('203',210),
-('204',211);
+('204',211),
+('205',212);
 /*!40000 ALTER TABLE `entity_ids` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1321,22 +1498,27 @@ INSERT INTO `entity_version` VALUES
 (101,NULL,'d761933f0fb660cb3c456896d7a5cfb9da7b3ec6',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
 (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'),
 (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'),
 (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'),
 (111,NULL,'36c265d80cb5abb79d5671a1b431dd62e971e9b5',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(111,NULL,'83299d432a84245a01410042af78b1e332315114',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (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'),
 (115,NULL,'c3a15cdd5c2c50a8573ed8f58c70f54c437f6acf',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
 (116,NULL,'b8184c3ce8527029ffd55e5aa9919610fd2f5193',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
-(117,NULL,'8d70e8707a7954b7d83a25d615e9fbdd8f34519f',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'),
 (119,NULL,'9bfc33ae0c6be37cb027a62afd792d1c311d006a',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(119,NULL,'61ee09a05b915dba2c6d158244966d3688ccef1a',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (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'),
@@ -1354,6 +1536,7 @@ INSERT INTO `entity_version` VALUES
 (134,NULL,'e9433547a60b486baaca979aec1608510a2f4541',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
 (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'),
 (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'),
@@ -1361,16 +1544,23 @@ INSERT INTO `entity_version` VALUES
 (141,NULL,'56b4d616f183a665bd2b1e6de026cbe3a3555aff',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
 (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'),
 (144,NULL,'a1d4da47f82593afbb269cbf6fc2311b059812d7',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(144,NULL,'a80b7c60c82df12adde5a14916dd39832bfc6c02',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (145,NULL,'535909011d32dc82dc3368b463c01f471c72b5f6',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(145,NULL,'b881b96d70e6900c63fb9dd2709a3682e65028e9',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (146,NULL,'8ab9de04122cf31364610d3372f0d922b4e110a5',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(146,NULL,'26cf3920bc49690f1e071d1362d90ad3dde4051f',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (147,NULL,'affd3537da482fb6655fc65cd223befedc845cb1',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(147,NULL,'f2f3f1bafbee48263ab7c5184a17b036f528bf8a',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (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'),
 (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'),
 (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'),
@@ -1379,7 +1569,9 @@ INSERT INTO `entity_version` VALUES
 (159,NULL,'728569f7e5de34afd82293e30bafcd11f106440e',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
 (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'),
 (162,NULL,'49fd42751089f19e7d6bb5da57df79ba6cc546d2',1,NULL,'27f2534b-49b9-4e44-9232-53eadf8ba072'),
+(162,NULL,'5d512dd3f177da0402db804e1f2f7d811302bddd',2,1,'a61cf61b-8583-41ec-b204-bfa65e3a7807'),
 (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'),
@@ -1406,15 +1598,18 @@ INSERT INTO `entity_version` VALUES
 (193,NULL,'249bf63173256aa2a0199949a901047c2d080ab7',1,NULL,'daa492ef-1495-4123-9966-9951328211b3'),
 (193,NULL,'0dc1ff0d0894d7033c1d97678b6a7785ed73d74b',2,1,'dbf1dd0f-405c-4952-b8b6-62e169c79397'),
 (193,NULL,'67cfb95fa8340113f44f5fc9a359807e7049c0eb',3,2,'2df660f0-e3a6-447e-837f-4778e5323f5d'),
+(193,NULL,'d6cf7df7f43a6f8d4901622c3addae7af88005e4',4,3,'936c19b1-3e0c-47d2-a073-024623962a00'),
 (194,NULL,'3a6433b58e041efb94320c84ecd5ddc741ee4975',1,NULL,'df3a0e97-6feb-42aa-8800-074ee5520428'),
 (194,NULL,'c42e8133496df248dbd53b3935cfa04f60c747b2',2,1,'d0af8a57-7550-42b2-aba9-4b254897976b'),
 (195,NULL,'d7bda4827e1f168d92a3bee5582f1aba5240931c',1,NULL,'8205d330-42ef-4519-9e5e-ade1e2465bed'),
 (195,NULL,'6bd556548038c036e4ebc8e1832fa9fd522e0e68',2,1,'2d5a4ba7-517f-4b85-9727-b3d96988c485'),
 (195,NULL,'54f7e3866e4bf3fcddbfe5ca5300e51b1f36f1b3',3,2,'b29fcae5-7964-4beb-b73a-2f7ce0a4809f'),
+(195,NULL,'a25a7dc15bd193b4a332619947a7f6281f7d9d88',4,3,'29ff518f-b089-430e-85a9-3b42b08a9c0c'),
 (196,NULL,'9db6c0625e7d6ad1c41e5909ad6e753c377697d3',1,NULL,'488967a3-a042-43d4-b74d-485f4bf622a2'),
 (196,NULL,'bd9f34005699da67f4f7740642d92de5e18f1c05',2,1,'fe535f2d-6865-41b7-bab1-781f412454f6'),
 (197,NULL,'fdc053362de6949898756c2b88da18d5bd86847b',1,NULL,'89a537e0-496a-4e50-b078-74f34cd21a07'),
 (197,NULL,'604f5d26dedef5739253efa6722cf181c8405ff8',2,1,'c03fb8ed-a263-4997-a02b-37bf97af9563'),
+(197,NULL,'9660e361a98ef391e35f0b503cf88ee725ca0999',3,2,'c1e6cb48-b70f-48df-bcbe-31351e3293ff'),
 (198,NULL,'6f97792294445568ab202c93d019065b2a0985ad',1,NULL,'3c931e13-7e9f-4835-99df-d325020b887d'),
 (198,NULL,'5f1fe0019202163f814741a0117134c388188cfe',2,1,'032bc38a-28d3-4c59-9d31-1494b62a2ba4'),
 (199,NULL,'a56ccd3a7b635129f62520a47996489c5caeca31',1,NULL,'22245d86-e095-4514-917a-7677616c544b'),
@@ -1429,7 +1624,8 @@ INSERT INTO `entity_version` VALUES
 (208,NULL,'3198b07efca7137577e72e9b579fd522758cd883',1,NULL,'06147cec-8ac2-4c72-9744-cab44e960e09'),
 (209,NULL,'425038e42b7607f1536b5bdda3e31c78486a9f69',1,NULL,'cd4b5be6-82c4-4444-bb3e-143ea3c1fcfe'),
 (210,NULL,'9fb32d510fe24863b12988e6a32eb9d9a6322130',1,NULL,'b51ffa82-bcf0-42a1-922c-9f4a845e6f42'),
-(211,NULL,'2b5e49feb87fc451f2d3441120adeae539c68f4e',1,NULL,'b51ffa82-bcf0-42a1-922c-9f4a845e6f42');
+(211,NULL,'2b5e49feb87fc451f2d3441120adeae539c68f4e',1,NULL,'b51ffa82-bcf0-42a1-922c-9f4a845e6f42'),
+(212,NULL,'776e020b4eeb8d7754f94d1daa5eb2a67c2e4550',1,NULL,'80009e0c-8c91-4add-9ada-6aed2ac526b7');
 /*!40000 ALTER TABLE `entity_version` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1726,7 +1922,6 @@ INSERT INTO `name_data` VALUES
 (0,114,20,'Custom label','FIX',0),
 (0,115,20,'Container Contents','FIX',0),
 (0,116,20,'PI','FIX',0),
-(0,117,20,'BIS Label','FIX',0),
 (0,118,20,'Sample','FIX',0),
 (0,119,20,'NagoyaCase','FIX',0),
 (0,120,20,'FunctionalGroup','FIX',0),
@@ -1802,7 +1997,8 @@ INSERT INTO `name_data` VALUES
 (0,206,20,'Fish','FIX',0),
 (0,207,20,'Filet','FIX',0),
 (0,208,20,'Water','FIX',0),
-(0,209,20,'Field sampling','FIX',0);
+(0,209,20,'Field sampling','FIX',0),
+(0,212,20,'container_label','FIX',0);
 /*!40000 ALTER TABLE `name_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1835,9 +2031,6 @@ CREATE TABLE `name_overrides` (
 LOCK TABLES `name_overrides` WRITE;
 /*!40000 ALTER TABLE `name_overrides` DISABLE KEYS */;
 INSERT INTO `name_overrides` VALUES
-(0,193,177,'BIS label'),
-(0,197,177,'BIS label'),
-(0,195,177,'BIS label'),
 (0,198,180,'Sample Context');
 /*!40000 ALTER TABLE `name_overrides` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1872,6 +2065,16 @@ 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),
+(0,165,166,'RECOMMENDED',0),
+(0,167,166,'RECOMMENDED',0),
+(0,168,166,'RECOMMENDED',0),
+(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),
@@ -1882,10 +2085,9 @@ INSERT INTO `null_data` VALUES
 (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,117,'OBLIGATORY',2),
+(0,111,212,'SUGGESTED',2),
 (0,111,179,'SUGGESTED',0),
 (0,111,113,'SUGGESTED',4),
 (0,111,114,'SUGGESTED',5),
@@ -1914,12 +2116,10 @@ INSERT INTO `null_data` VALUES
 (0,119,178,'SUGGESTED',0),
 (0,136,137,'OBLIGATORY',0),
 (0,136,177,'OBLIGATORY',0),
-(0,138,139,'OBLIGATORY',0),
 (0,143,146,'OBLIGATORY',0),
 (0,143,147,'OBLIGATORY',1),
 (0,143,144,'RECOMMENDED',2),
 (0,143,145,'RECOMMENDED',3),
-(0,148,149,'RECOMMENDED',0),
 (0,150,177,'OBLIGATORY',0),
 (0,150,151,'RECOMMENDED',1),
 (0,150,152,'SUGGESTED',2),
@@ -1936,14 +2136,7 @@ INSERT INTO `null_data` VALUES
 (0,161,147,'OBLIGATORY',0),
 (0,162,146,'OBLIGATORY',0),
 (0,162,147,'OBLIGATORY',0),
-(0,163,177,'RECOMMENDED',0),
-(0,165,166,'RECOMMENDED',0),
-(0,167,166,'RECOMMENDED',0),
-(0,168,166,'RECOMMENDED',0),
-(0,197,178,'FIX',0),
-(0,199,149,'RECOMMENDED',0),
-(0,211,145,'FIX',2),
-(0,211,144,'FIX',3);
+(0,197,177,'FIX',0);
 /*!40000 ALTER TABLE `null_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2058,47 +2251,13 @@ CREATE TABLE `reference_data` (
 LOCK TABLES `reference_data` WRITE;
 /*!40000 ALTER TABLE `reference_data` DISABLE KEYS */;
 INSERT INTO `reference_data` VALUES
-(0,105,103,177,'REPLACEMENT',1,NULL),
-(0,106,105,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),
-(0,118,119,177,'REPLACEMENT',0,NULL),
-(0,118,111,178,'REPLACEMENT',1,NULL),
-(0,118,120,179,'REPLACEMENT',2,NULL),
-(0,118,121,180,'REPLACEMENT',3,NULL),
-(0,118,125,181,'REPLACEMENT',7,NULL),
-(0,118,126,182,'REPLACEMENT',8,NULL),
-(0,118,127,183,'REPLACEMENT',9,NULL),
-(0,118,128,184,'REPLACEMENT',10,NULL),
-(0,118,129,185,'REPLACEMENT',11,NULL),
-(0,119,141,177,'REPLACEMENT',2,NULL),
-(0,119,138,178,'REPLACEMENT',3,NULL),
-(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,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,193,101,188,'FIX',0,NULL),
-(0,193,110,189,'FIX',1,NULL),
-(0,193,117,177,'REPLACEMENT',3,NULL),
-(0,193,178,195,'FIX',0,NULL),
-(0,193,112,178,'REPLACEMENT',4,NULL),
 (0,194,110,190,'FIX',1,NULL),
-(0,197,101,188,'FIX',0,NULL),
-(0,197,110,191,'FIX',1,NULL),
-(0,197,117,177,'REPLACEMENT',3,NULL),
-(0,197,112,178,'REPLACEMENT',4,NULL),
-(0,195,101,188,'FIX',0,NULL),
-(0,195,110,190,'FIX',1,NULL),
-(0,195,117,177,'REPLACEMENT',3,NULL),
-(0,195,178,197,'FIX',0,NULL),
-(0,195,112,178,'REPLACEMENT',4,NULL),
 (0,196,110,191,'FIX',1,NULL),
 (0,210,177,200,'FIX',0,NULL),
 (0,210,148,177,'REPLACEMENT',1,NULL),
@@ -2118,7 +2277,38 @@ INSERT INTO `reference_data` VALUES
 (0,198,121,206,'FIX',8,NULL),
 (0,198,160,207,'FIX',9,NULL),
 (0,198,180,209,'FIX',0,NULL),
-(0,198,171,180,'REPLACEMENT',10,NULL);
+(0,198,171,180,'REPLACEMENT',10,NULL),
+(0,105,103,177,'REPLACEMENT',1,NULL),
+(0,106,105,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),
+(0,118,119,177,'REPLACEMENT',0,NULL),
+(0,118,111,178,'REPLACEMENT',1,NULL),
+(0,118,120,179,'REPLACEMENT',2,NULL),
+(0,118,121,180,'REPLACEMENT',3,NULL),
+(0,118,125,181,'REPLACEMENT',7,NULL),
+(0,118,126,182,'REPLACEMENT',8,NULL),
+(0,118,127,183,'REPLACEMENT',9,NULL),
+(0,118,128,184,'REPLACEMENT',10,NULL),
+(0,118,129,185,'REPLACEMENT',11,NULL),
+(0,119,141,177,'REPLACEMENT',2,NULL),
+(0,119,138,178,'REPLACEMENT',3,NULL),
+(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);
 /*!40000 ALTER TABLE `reference_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2169,7 +2359,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\0measurementst\0Ljava/util/Map;[\0stackTraceElementst\0[Ljava/lang/StackTraceElement;L\0\rsubBenchmarksq\0~\0xp\0\0
�Av��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\0
q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0	
\0\0
fq\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\0w\0\0\0\0\0\0
t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmark����Qk]\0
L\0nameq\0~\0\nxq\0~\0
\0\0
�Av��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~\0q\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\0getBenchmarkppsq\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\0syncDatabaseppsq\0~\0	
\0\0\0�q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0	\0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0
t\0	SyncStatssq\0~\0\"\0\0
�Av��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~\0q\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~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0
t\0MySQLSyncStatssq\0~\0\"\0\0
�Av��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~\0q\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
q\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~\0q\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\0measurementst\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\0
q\0~\0q\0~\0q\0~\0t\0<clinit>ppsq\0~\0	
\0\0
fq\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\0w\0\0\0\0\0\0
t\0Infosr\0,org.caosdb.server.database.misc.SubBenchmark����Qk]\0
L\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~\0q\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\0getBenchmarkppsq\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\0syncDatabaseppsq\0~\0	
\0\0\0�q\0~\0t\0/org.caosdb.server.database.misc.RootBenchmark$1q\0~\0t\0runppsq\0~\0	\0\0Hpq\0~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0
t\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~\0q\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~\0q\0~\0\rq\0~\09q\0~\0q\0~\0sq\0~\0?@\0\0\0\0\0w\0\0\0\0\0\0
t\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\0sq\0~\0	\0\0Spq\0~\0q\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
q\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~\0q\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~\0
xp\0\0
l���Wsr\0java.util.HashMap���`�\0F\0\nloadFactorI\0	thresholdxp?@\0\0\0\0\0w\0\0\0\0\0\0t\0	SyncStatssr\0java.lang.Long;��̏#�\0
J\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\0w\0\0\0\0\0\0q\0~\0sr\0java.lang.Integer⠤���8\0
I\0valuexq\0~\0\0\0\0
q\0~\0	sq\0~\0\0\0\0x');
 /*!40000 ALTER TABLE `stats` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -2204,18 +2394,6 @@ CREATE TABLE `text_data` (
 LOCK TABLES `text_data` WRITE;
 /*!40000 ALTER TABLE `text_data` DISABLE KEYS */;
 INSERT INTO `text_data` VALUES
-(143,146,21,'°','FIX',0),
-(143,147,21,'°','FIX',0),
-(143,144,21,'m','FIX',0),
-(143,145,21,'m','FIX',0),
-(0,144,21,'m','FIX',0),
-(0,145,21,'m','FIX',0),
-(0,146,21,'°','FIX',0),
-(0,147,21,'°','FIX',0),
-(161,146,21,'°','FIX',0),
-(161,147,21,'°','FIX',0),
-(162,146,21,'°','FIX',0),
-(162,147,21,'°','FIX',0),
 (0,186,104,'Spannende Abteilung','FIX',0),
 (0,186,102,'fad','FIX',1),
 (0,187,102,'mru','FIX',0),
@@ -2227,12 +2405,6 @@ INSERT INTO `text_data` VALUES
 (0,188,102,'myn','FIX',1),
 (0,188,108,'Name','FIX',2),
 (0,188,109,'my.name@example.com','FIX',3),
-(0,193,113,'20 rooms','FIX',2),
-(0,193,177,'fad_mru_myn_2025_bld_1','FIX',0),
-(0,197,113,'300 l','FIX',2),
-(0,197,177,'fad_mru_myn_2025_fri_1','FIX',0),
-(0,195,113,'30 m²','FIX',2),
-(0,195,177,'fad_mru_myn_2025_rom_1','FIX',0),
 (0,200,149,'2m','FIX',0),
 (0,202,142,'ABCD-1234','FIX',0),
 (0,204,166,'Nails','FIX',0),
@@ -2240,7 +2412,22 @@ INSERT INTO `text_data` VALUES
 (211,146,21,'°','FIX',0),
 (211,147,21,'°','FIX',0),
 (211,145,21,'m','FIX',0),
-(211,144,21,'m','FIX',0);
+(211,144,21,'m','FIX',0),
+(143,146,21,'°','FIX',0),
+(143,147,21,'°','FIX',0),
+(143,144,21,'m','FIX',0),
+(143,145,21,'m','FIX',0),
+(0,144,21,'m','FIX',0),
+(0,145,21,'m','FIX',0),
+(0,146,21,'°','FIX',0),
+(0,147,21,'°','FIX',0),
+(161,146,21,'°','FIX',0),
+(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);
 /*!40000 ALTER TABLE `text_data` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2381,7 +2568,28 @@ INSERT INTO `transaction_log` VALUES
 ('Insert','202','admin',1736265896,593000000,'PAM'),
 ('Insert','203','admin',1736265919,980000000,'PAM'),
 ('Insert','204','admin',1736265919,980000000,'PAM'),
-('Update','191','admin',1736265920,63000000,'PAM');
+('Update','191','admin',1736265920,63000000,'PAM'),
+('Insert','205','admin',1737542797,604000000,'PAM'),
+('Update','105','admin',1737542799,463000000,'PAM'),
+('Update','107','admin',1737542799,463000000,'PAM'),
+('Update','108','admin',1737542799,463000000,'PAM'),
+('Update','113','admin',1737542799,463000000,'PAM'),
+('Update','120','admin',1737542799,463000000,'PAM'),
+('Update','121','admin',1737542799,463000000,'PAM'),
+('Update','138','admin',1737542799,463000000,'PAM'),
+('Update','145','admin',1737542799,463000000,'PAM'),
+('Update','146','admin',1737542799,463000000,'PAM'),
+('Update','147','admin',1737542799,463000000,'PAM'),
+('Update','148','admin',1737542799,463000000,'PAM'),
+('Update','149','admin',1737542799,463000000,'PAM'),
+('Update','152','admin',1737542799,463000000,'PAM'),
+('Update','155','admin',1737542799,463000000,'PAM'),
+('Update','163','admin',1737542799,463000000,'PAM'),
+('Update','164','admin',1737542799,463000000,'PAM'),
+('Update','186','admin',1737542873,229000000,'PAM'),
+('Update','188','admin',1737542878,789000000,'PAM'),
+('Update','190','admin',1737542888,999000000,'PAM'),
+('Delete','119','admin',1737542900,973000000,'PAM');
 /*!40000 ALTER TABLE `transaction_log` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2412,9 +2620,12 @@ INSERT INTO `transactions` VALUES
 ('032bc38a-28d3-4c59-9d31-1494b62a2ba4','admin','PAM',1736265920,63000000),
 ('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),
 ('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),
 ('27f2534b-49b9-4e44-9232-53eadf8ba072','admin','PAM',1736264522,437000000),
+('29ff518f-b089-430e-85a9-3b42b08a9c0c','admin','PAM',1737542878,789000000),
 ('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),
@@ -2422,17 +2633,21 @@ INSERT INTO `transactions` VALUES
 ('488967a3-a042-43d4-b74d-485f4bf622a2','admin','PAM',1736265441,647000000),
 ('55dcaf7b-7372-4778-995a-a6a8bde1b471','admin','PAM',1736264805,952000000),
 ('7663f26d-982f-4710-aeab-073a44290f3a','admin','PAM',1736265841,217000000),
+('80009e0c-8c91-4add-9ada-6aed2ac526b7','admin','PAM',1737542797,604000000),
 ('8205d330-42ef-4519-9e5e-ade1e2465bed','admin','PAM',1736265392,368000000),
 ('84bd4faf-510c-4950-b827-4bab81546887','admin','PAM',1736264663,736000000),
 ('89a537e0-496a-4e50-b078-74f34cd21a07','admin','PAM',1736265441,688000000),
+('936c19b1-3e0c-47d2-a073-024623962a00','admin','PAM',1737542873,229000000),
 ('975ea8ec-ba79-452e-bc44-2d9432ce4993','admin','PAM',1736265742,101000000),
 ('9d2c4381-148f-4559-9d30-95a328169bbf','admin','PAM',1736265204,451000000),
 ('a41c5d15-6c9e-4e5c-a8fb-2fa7d38da140','admin','PAM',1736264752,282000000),
+('a61cf61b-8583-41ec-b204-bfa65e3a7807','admin','PAM',1737542799,463000000),
 ('aa019373-730c-4cec-8f83-3eb2f2ee9629','admin','PAM',1736265619,737000000),
 ('ada94a1f-e942-46e2-a5de-626a18cd2af9','admin','PAM',1736265702,487000000),
 ('b29fcae5-7964-4beb-b73a-2f7ce0a4809f','admin','PAM',1736265441,871000000),
 ('b51ffa82-bcf0-42a1-922c-9f4a845e6f42','admin','PAM',1736265919,980000000),
 ('c03fb8ed-a263-4997-a02b-37bf97af9563','admin','PAM',1736265441,780000000),
+('c1e6cb48-b70f-48df-bcbe-31351e3293ff','admin','PAM',1737542888,999000000),
 ('c6549725-13bb-4076-9d49-219c6b8192f3','admin','PAM',1736264700,733000000),
 ('ca9db47b-d2d5-4980-84da-7268869f9e3c','admin','PAM',1736264603,389000000),
 ('cad02c5b-f559-4400-9897-80e56c1035ba','admin','PAM',1736264740,329000000),
@@ -6916,4 +7131,4 @@ DELIMITER ;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-01-07 16:05:15
+-- Dump completed on 2025-01-22 10:48:39
-- 
GitLab