Merge pull request #26 from IhateTrains/version-names

IhateTrains · web-flow · commit dee8178323c0 · 2022-08-22T21:01:13.000+02:00
Allow mapping version to be any string matching stringRegex
diff --git a/ProvinceMapper/Source/LinkMapper/LinkMapper.cpp b/ProvinceMapper/Source/LinkMapper/LinkMapper.cpp
@@ -33,7 +33,7 @@ void LinkMapper::loadMappings(const std::string& linksFileString,
 
 void LinkMapper::registerKeys()
 {
-	registerRegex(R"(\d+.\d+.\d+.*)", [this](const std::string& versionName, std::istream& theStream) {
+	registerRegex(commonItems::stringRegex, [this](const std::string& versionName, std::istream& theStream) {
 		const auto version = std::make_shared<LinkMappingVersion>(theStream, versionName, sourceDefs, targetDefs, sourceToken, targetToken, versionCounter);
 		++versionCounter;
 		versions.emplace_back(version);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void LinkMapper::loadMappings(const std::string& linksFileString,`
`33`	`33`
`34`	`34`	`void LinkMapper::registerKeys()`
`35`	`35`	`{`
`36`		`- registerRegex(R"(\d+.\d+.\d+.*)", [this](const std::string& versionName, std::istream& theStream) {`
	`36`	`+ registerRegex(commonItems::stringRegex, [this](const std::string& versionName, std::istream& theStream) {`
`37`	`37`	`const auto version = std::make_shared<LinkMappingVersion>(theStream, versionName, sourceDefs, targetDefs, sourceToken, targetToken, versionCounter);`
`38`	`38`	`++versionCounter;`
`39`	`39`	`versions.emplace_back(version);`