aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/default_paths.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/default_paths.org')
-rw-r--r--org/default_paths.org33
1 files changed, 18 insertions, 15 deletions
diff --git a/org/default_paths.org b/org/default_paths.org
index 68c7da8..55ee430 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -166,7 +166,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() {
@@ -213,9 +213,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;
}
@@ -234,11 +237,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;
@@ -254,10 +257,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;
}
@@ -273,10 +276,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;
}
@@ -978,7 +981,7 @@ template DocReformOutPathsFnPd() {
/+ TODO stuff to work out here +/
auto DocReformOutPathsFnPd(Fn,Pn)(
Fn fn_src_pth,
- Pn pod_name
+ Pn pod_name_with_path
) {
struct _PathsStruct {
string base_filename() {
@@ -996,11 +999,11 @@ template DocReformOutPathsFnPd() {
+/
string _fn_src = fn_src_pth.baseName.stripExtension;
string _output_base_name;
- if (!(pod_name.empty)) {
- if (pod_name == _fn_src) {
+ if (!(pod_name_with_path.empty)) {
+ if (pod_name_with_path == _fn_src) {
_output_base_name = _fn_src;
} else {
- _output_base_name = pod_name ~ "." ~ _fn_src;
+ _output_base_name = pod_name_with_path ~ "." ~ _fn_src;
}
} else {
_output_base_name = _fn_src;