diff options
Diffstat (limited to 'src/doc_reform/source/paths_source.d')
| -rw-r--r-- | src/doc_reform/source/paths_source.d | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/doc_reform/source/paths_source.d b/src/doc_reform/source/paths_source.d index a6f3fc1..4b4abf7 100644 --- a/src/doc_reform/source/paths_source.d +++ b/src/doc_reform/source/paths_source.d @@ -114,7 +114,7 @@ template PathMatters() { string manifest_path() { return _manifest.pod_manifest_path; } - string pod_name() { + string pod_name_with_path() { return _manifest.pod_manifest_path.baseName; } string manifest_file_with_path() { @@ -161,9 +161,12 @@ template PathMatters() { string path_and_fn() { return _fns; } - string pod_name() { + string pod_name_with_path() { return (is_pod) ? _manifest.pod_manifest_path : ""; } + string pod_name() { + return pod_name_with_path.baseName; + } string filename() { return path_and_fn.baseName; } @@ -182,11 +185,11 @@ template PathMatters() { } string doc_uid() { string _uid; - if (is_pod && !(pod_name.empty)) { - if (pod_name.baseName == filename_base) { + if (is_pod && !(pod_name_with_path.empty)) { + if (pod_name_with_path.baseName == filename_base) { _uid = filename_base ~ "." ~ filename_extension ~ _sep ~ lng; } else { - _uid = pod_name.baseName ~ _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng; + _uid = pod_name_with_path.baseName ~ _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng; } } else { _uid = _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng; @@ -202,10 +205,10 @@ template PathMatters() { - sqlite discrete index (multilingual, each language of a document) +/ string _fn; - if (pod_name.baseName == filename_base) { + if (pod_name_with_path.baseName == filename_base) { _fn = filename_base ~ _sep ~ filename_extension ~ _sep ~ lng; - } else if (!(pod_name.empty)) { - _fn = pod_name.baseName ~ _sep ~ filename_base ~ _sep ~ filename_extension ~ _sep ~ lng; + } else if (!(pod_name_with_path.empty)) { + _fn = pod_name_with_path.baseName ~ _sep ~ filename_base ~ _sep ~ filename_extension ~ _sep ~ lng; } else { _fn = "_" ~ _sep ~ filename_base ~ _sep ~ filename_extension ~ _sep ~ lng; } @@ -221,10 +224,10 @@ template PathMatters() { - sqlite discrete index (multilingual collection) +/ string _fn; - if (pod_name.baseName == filename_base) { + if (pod_name_with_path.baseName == filename_base) { _fn = filename_base ~ _sep ~ filename_extension; - } else if (!(pod_name.empty)) { - _fn = pod_name.baseName ~ _sep ~ filename_base ~ _sep ~ filename_extension; + } else if (!(pod_name_with_path.empty)) { + _fn = pod_name_with_path.baseName ~ _sep ~ filename_base ~ _sep ~ filename_extension; } else { _fn = "_" ~ _sep ~ filename_base ~ _sep ~ filename_extension; } |