diff options
| -rw-r--r-- | org/ocda.org | 1 | ||||
| -rw-r--r-- | org/spine.org | 2 | ||||
| -rw-r--r-- | src/sisudoc/abstraction/package.d | 1 | ||||
| -rw-r--r-- | src/sisudoc/abstraction/ssp.d (renamed from src/sisudoc/io_out/create_abstraction_txt.d) | 12 | ||||
| -rwxr-xr-x | src/sisudoc/spine.d | 4 |
5 files changed, 12 insertions, 8 deletions
diff --git a/org/ocda.org b/org/ocda.org index aab5f2a..d4da85d 100644 --- a/org/ocda.org +++ b/org/ocda.org @@ -64,6 +64,7 @@ module sisudoc.abstraction; @safe: public import sisudoc.meta.metadoc; // spineAbstraction (A-layer) public import sisudoc.meta.metadoc_from_src; // docAbstraction (B-layer) +public import sisudoc.abstraction.ssp; // spineAbstractionTxt (.ssp) #+END_SRC ** _module template_ :module:metadoc_from_src: diff --git a/org/spine.org b/org/spine.org index cdc99ff..481f2c7 100644 --- a/org/spine.org +++ b/org/spine.org @@ -1614,7 +1614,7 @@ if (doc.matters.opt.action.show_config) { #+BEGIN_SRC d /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.io_out.create_abstraction_txt; + import sisudoc.abstraction.ssp; spineAbstractionTxt!()(doc); } #+END_SRC diff --git a/src/sisudoc/abstraction/package.d b/src/sisudoc/abstraction/package.d index 74110f6..645a514 100644 --- a/src/sisudoc/abstraction/package.d +++ b/src/sisudoc/abstraction/package.d @@ -83,3 +83,4 @@ module sisudoc.abstraction; @safe: public import sisudoc.meta.metadoc; // spineAbstraction (A-layer) public import sisudoc.meta.metadoc_from_src; // docAbstraction (B-layer) +public import sisudoc.abstraction.ssp; // spineAbstractionTxt (.ssp) diff --git a/src/sisudoc/io_out/create_abstraction_txt.d b/src/sisudoc/abstraction/ssp.d index af98f61..6eecef0 100644 --- a/src/sisudoc/io_out/create_abstraction_txt.d +++ b/src/sisudoc/abstraction/ssp.d @@ -47,7 +47,7 @@ [https://git.sisudoc.org/] +/ -module sisudoc.io_out.create_abstraction_txt; +module sisudoc.abstraction.ssp; @safe: /+ ↓ write document abstraction as human-readable .ssp text file +/ @@ -59,7 +59,6 @@ template spineAbstractionTxt() { import std.stdio; import std.string; import std.array; - import sisudoc.io_out.paths_output; void spineAbstractionTxt(D)(D doc) { auto doc_abstraction = doc.abstraction; @@ -408,9 +407,12 @@ template spineAbstractionTxt() { } /+ ↓ write to file +/ - auto out_pth = spineOutPaths!()(doc_matters.output_path, doc_matters.src.language); - string base_dir = "abstraction"; - string base_pth = ((out_pth.output_base.chainPath(base_dir)).asNormalizedPath).array; + /+ path: <output_path>/<language>/abstraction/<doc_uid_out>.ssp +/ + string out_root = (doc_matters.output_path.length > 0) + ? doc_matters.output_path : ""; + string base_pth = (out_root + .chainPath(doc_matters.src.language, "abstraction") + .asNormalizedPath).array; try { if (!exists(base_pth)) { base_pth.mkdirRecurse; diff --git a/src/sisudoc/spine.d b/src/sisudoc/spine.d index b00469a..a47c6db 100755 --- a/src/sisudoc/spine.d +++ b/src/sisudoc/spine.d @@ -1326,7 +1326,7 @@ string program_name = "spine"; } /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.io_out.create_abstraction_txt; + import sisudoc.abstraction.ssp; spineAbstractionTxt!()(doc); } /+ ↓ document abstraction sqlite database +/ @@ -1435,7 +1435,7 @@ string program_name = "spine"; } /+ ↓ document abstraction text representation +/ if (doc.matters.opt.action.show_abstraction) { - import sisudoc.io_out.create_abstraction_txt; + import sisudoc.abstraction.ssp; spineAbstractionTxt!()(doc); } /+ ↓ document abstraction sqlite database +/ |