Fix RESQML22 uri validation

Author: philippeVerney

example/withFesapi/etpClient.cpp

@@ -724,6 +724,10 @@ int main(int argc, char **argv)
 	std::string authorization;
 	std::getline(std::cin, authorization);
 
+	std::cout << "Give the data partition id you want to direct your requests (or hit enter if no data partition)" << std::endl;
+	std::string dataPartition;
+	std::getline(std::cin, dataPartition);
+
 	COMMON_NS::DataObjectRepository repo;
 	repo.setDefaultStandard(COMMON_NS::DataObjectRepository::EnergisticsStandard::RESQML2_0_1);
 	repo.setDefaultStandard(COMMON_NS::DataObjectRepository::EnergisticsStandard::EML2_0);
@@ -732,7 +736,7 @@ int main(int argc, char **argv)
 	ETP_NS::InitializationParameters initializationParams = argc == 2
 		? ETP_NS::InitializationParameters(gen(), argv[1]) // URL based
 		: ETP_NS::InitializationParameters(gen(), argv[1], std::stoi(argv[2]), argc < 4 ? "/" : argv[3]); // IP Port and target based
-	std::map< std::string, std::string > additionalHeaderField = { {"data-partition-id", "osdu"} }; // Example for OSDU RDDMS
+	std::map< std::string, std::string > additionalHeaderField = { {"data-partition-id", dataPartition} }; // Example for OSDU RDDMS
 	initializationParams.setAdditionalHandshakeHeaderFields(additionalHeaderField);
 
 	std::cout << "Creating a client session..." << std::endl;

src/etp/EtpHelpers.cpp

@@ -60,7 +60,7 @@ bool ETP_NS::EtpHelpers::validateUri(const std::string & uri)
 	return
 		std::regex_match(uri, std::regex("^eml:///(dataspace[(]'.*'[)])?", std::regex::ECMAScript)) ||
 		std::regex_match(uri, std::regex("^eml:///(dataspace[(]'.*'[)]/)?(resqml20|eml20)\.obj_[a-zA-Z0-9]+[(][a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}(,.*)?[)]", std::regex::ECMAScript)) ||
-		std::regex_match(uri, std::regex("^eml:///(dataspace[(]'.*'[)]/)?(witsml|resqml|prodml|eml)([0-9]{2})\[a-zA-Z0-9]+[(][a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}(,.*)?[)]", std::regex::ECMAScript));
+		std::regex_match(uri, std::regex("^eml:///(dataspace[(]'.*'[)]/)?(witsml|resqml|prodml|eml)([0-9]{2})\.[a-zA-Z0-9]+[(][a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}(,.*)?[)]", std::regex::ECMAScript));
 }
 
 bool ETP_NS::EtpHelpers::validateDataObjectUri(const std::string & uri)