From 51fd56020424dcca50c4b8cfb3877640a6a9656b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 16 Dec 2017 17:18:01 -0500 Subject: target config file locations, refine --- org/sdp.org | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'org/sdp.org') diff --git a/org/sdp.org b/org/sdp.org index 011fd85..d874489 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -492,9 +492,10 @@ foreach(arg; args[1..$]) { _manifest_start = PodManifest!()(arg); if (arg.match(rgx.flag_action)) { flag_action ~= " " ~ arg; // flags not taken by getopt - } else if (arg.match(rgx.src_pth_sst_or_ssm)) { - _manifests ~= PodMatters!()(_opt_action, _env, arg, arg); // gather input markup source file names for processing - } else if (_manifest_start.pod_manifest_file_with_path) { + } else if ( + !(arg.match(rgx.src_pth_sst_or_ssm)) + && _manifest_start.pod_manifest_file_with_path + ) { string contents_location_raw_; string contents_location_; string sisudoc_txt_ = _manifest_start.pod_manifest_file_with_path; @@ -540,6 +541,8 @@ foreach(arg; args[1..$]) { _manifests ~= _manifest_matter; // TODO how to capture? } } + } else if (arg.match(rgx.src_pth_sst_or_ssm)) { + _manifests ~= PodMatters!()(_opt_action, _env, arg, arg); // gather input markup source file names for processing } else if (arg.match(rgx.src_pth_zip)) { // fns_src ~= arg; // gather input markup source file names for processing } else { // anything remaining, unused @@ -552,8 +555,8 @@ foreach(arg; args[1..$]) { #+NAME: sdp_conf_files #+BEGIN_SRC d -auto sdl_root_config_document = configReadDoc!()(_manifest, _env, "config_document"); // document config file -auto sdl_root_config_local_site = configReadSite!()(_manifest, _env, "config_local_site"); // local site config +auto sdl_root_config_document = configReadDoc!()(_manifest, _env); // document config file +auto sdl_root_config_local_site = configReadSite!()(_manifest, _env); // local site config auto conf_files_composite_make = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site); #+END_SRC @@ -733,7 +736,7 @@ debug(steps) { ); } auto _header_body_insertfilelist_imagelist = - SiSUrawMarkupContent!()(_opt_action, _manifest.src_fn); + SiSUrawMarkupContent!()(_opt_action, _manifest.src_path_and_fn); static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist)); static assert(_header_body_insertfilelist_imagelist.length==4); debug(steps) { -- cgit v1.2.3