From 08549c763cd731531d4e1c52c86fe265cbef92f2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 11 Apr 2020 19:43:06 -0400 Subject: uid, select separator that works better with sqlite --- src/doc_reform/io_in/paths_source.d | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/doc_reform/io_in') diff --git a/src/doc_reform/io_in/paths_source.d b/src/doc_reform/io_in/paths_source.d index 432b484..c504c77 100644 --- a/src/doc_reform/io_in/paths_source.d +++ b/src/doc_reform/io_in/paths_source.d @@ -193,12 +193,12 @@ template PathMatters() { string _uid; if (is_pod && !(pod_name_with_path.empty)) { if (pod_name_with_path.baseName == filename_base) { - _uid = filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng; + _uid = filename_base ~ "." ~ filename_extension ~ mkup.uid_sep ~ lng; } else { - _uid = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng; + _uid = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ "." ~ filename_extension ~ mkup.uid_sep ~ lng; } } else { - _uid = mkup.sep ~ filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng; + _uid = mkup.uid_sep ~ filename_base ~ "." ~ filename_extension ~ mkup.uid_sep ~ lng; } return _uid; } @@ -208,7 +208,7 @@ template PathMatters() { if (pod_name_with_path.baseName == filename_base) { _uid = filename_base ~ "." ~ lng; } else { - _uid = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ "." ~ lng; + _uid = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ "." ~ lng; } } else { _uid = "_" ~ filename_base ~ "." ~ lng; @@ -218,18 +218,18 @@ template PathMatters() { @safe string docname_composite_unique_per_src_doc() { string _fn; if (pod_name_with_path.baseName == filename_base) { - _fn = filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng; + _fn = filename_base ~ mkup.uid_sep ~ filename_extension ~ mkup.uid_sep ~ lng; } else if (!(pod_name_with_path.empty)) { - _fn = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng; + _fn = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension ~ mkup.uid_sep ~ lng; } else { - _fn = "_" ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng; + _fn = "_" ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension ~ mkup.uid_sep ~ lng; } return _fn; } @safe string docname_composite_unique_per_src_pod() { /+ z pod name if any + src filename (without lng code) - filename ~ mkup.sep ~ lng + filename ~ mkup.uid_sep ~ lng * unique per src pod used by - pod (multilingual collection) @@ -237,11 +237,11 @@ template PathMatters() { +/ string _fn; if (pod_name_with_path.baseName == filename_base) { - _fn = filename_base ~ mkup.sep ~ filename_extension; + _fn = filename_base ~ mkup.uid_sep ~ filename_extension; } else if (!(pod_name_with_path.empty)) { - _fn = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension; + _fn = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension; } else { - _fn = "_" ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension; + _fn = "_" ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension; } return _fn; } -- cgit v1.2.3