diff options
Diffstat (limited to 'src/doc_reform/io_out')
| -rw-r--r-- | src/doc_reform/io_out/sqlite.d | 48 | ||||
| -rw-r--r-- | src/doc_reform/io_out/xmls.d | 10 |
2 files changed, 29 insertions, 29 deletions
diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d index 99a6b5d..1b010d2 100644 --- a/src/doc_reform/io_out/sqlite.d +++ b/src/doc_reform/io_out/sqlite.d @@ -26,8 +26,8 @@ template SQLiteHubBuildTablesAndPopulate() { M doc_matters, ) { { - string _db_statement; { + string _db_statement; if ((doc_matters.opt.action.sqlite_db_create)) { auto pth_sqlite = spinePathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; @@ -74,8 +74,8 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { M doc_matters, ) { { - string _db_statement; { + string _db_statement; _db_statement ~= SQLiteTablesReCreate!()(); _db_statement ~= SQLiteInsertMetadata!()(doc_matters); _db_statement ~= doc_abstraction.SQLiteInsertDocObjectsLoop!()(doc_matters); @@ -107,10 +107,6 @@ template SQLiteDbRun() { db_statement ~ "\nCOMMIT;\n" ); - if (!(opt_action.sqlite_discrete) - && !(opt_action.sqlite_db_create) - ) { - } } catch (ErrnoException ex) { writeln("ERROR SQLite : ", ex); } catch (Exception ex) { @@ -630,7 +626,7 @@ template SQLiteFormatAndLoadObject() { _txt = t[0]; string _note = t[1]; string o = format(q"┃<p class="%s"> - <table summary="normal text css" width="95%%" border="0" bgcolor="white" cellpadding="2" align="center"> + <table summary="normal text css" width="95%%" border="0" cellpadding="2" align="center"> %s </table> %s @@ -661,7 +657,7 @@ template SQLiteFormatAndLoadObject() { string _html, ) { void _sql_exe(O)( - string _sql, + string _sql, ) { writeln(_html); writeln(_sql); @@ -998,16 +994,16 @@ template SQLiteTablesReCreate() { seg_name CHAR(256), types CHAR(1) NULL ); - CREATE INDEX idx_ocn ON doc_objects(ocn); + CREATE INDEX idx_ocn ON doc_objects(ocn); CREATE INDEX idx_digest_clean ON doc_objects(digest_clean); - CREATE INDEX idx_digest_all ON doc_objects(digest_all); - CREATE INDEX idx_clean ON doc_objects(clean); - CREATE INDEX idx_title ON metadata_and_text(title); - CREATE INDEX idx_author ON metadata_and_text(creator_author_last_first); - CREATE INDEX idx_uid ON metadata_and_text(uid); - CREATE INDEX idx_filename ON metadata_and_text(src_filename_base); - CREATE INDEX idx_language ON metadata_and_text(language_document_char); - CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register); + CREATE INDEX idx_digest_all ON doc_objects(digest_all); + CREATE INDEX idx_clean ON doc_objects(clean); + CREATE INDEX idx_title ON metadata_and_text(title); + CREATE INDEX idx_author ON metadata_and_text(creator_author_last_first); + CREATE INDEX idx_uid ON metadata_and_text(uid); + CREATE INDEX idx_filename ON metadata_and_text(src_filename_base); + CREATE INDEX idx_language ON metadata_and_text(language_document_char); + CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register); ┃",); return _sql_instruct; } @@ -1528,16 +1524,16 @@ template SQLiteTablesCreate() { seg_name CHAR(256), types CHAR(1) NULL ); - CREATE INDEX idx_ocn ON doc_objects(ocn); + CREATE INDEX idx_ocn ON doc_objects(ocn); CREATE INDEX idx_digest_clean ON doc_objects(digest_clean); - CREATE INDEX idx_digest_all ON doc_objects(digest_all); - CREATE INDEX idx_clean ON doc_objects(clean); - CREATE INDEX idx_title ON metadata_and_text(title); - CREATE INDEX idx_author ON metadata_and_text(creator_author_last_first); - CREATE INDEX idx_uid ON metadata_and_text(uid); - CREATE INDEX idx_filename ON metadata_and_text(src_filename_base); - CREATE INDEX idx_language ON metadata_and_text(language_document_char); - CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register); + CREATE INDEX idx_digest_all ON doc_objects(digest_all); + CREATE INDEX idx_clean ON doc_objects(clean); + CREATE INDEX idx_title ON metadata_and_text(title); + CREATE INDEX idx_author ON metadata_and_text(creator_author_last_first); + CREATE INDEX idx_uid ON metadata_and_text(uid); + CREATE INDEX idx_filename ON metadata_and_text(src_filename_base); + CREATE INDEX idx_language ON metadata_and_text(language_document_char); + CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register); ┃",); return _sql_instruct; } diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index c13d31f..ffcdcb6 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -916,7 +916,9 @@ template outputXHTMLs() { </p> </div>┃", obj.metainfo.identifier, - (doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier), + (doc_matters.opt.action.ocn_off) ? "" + : ((obj.metainfo.object_number.empty) ? "" + : obj.metainfo.identifier), obj.metainfo.is_a, obj.metainfo.identifier, _txt @@ -978,7 +980,9 @@ template outputXHTMLs() { <p class="%s" id="%s">%s</p> </div>┃", obj.metainfo.identifier, - (doc_matters.opt.action.ocn_off) ? "" : ((obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier), + (doc_matters.opt.action.ocn_off) ? "" + : ((obj.metainfo.object_number.empty) ? "" + : obj.metainfo.identifier), obj.metainfo.is_a, obj.metainfo.identifier, _txt.stripRight @@ -1132,7 +1136,7 @@ template outputXHTMLs() { o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" id="%s">%s - <table summary="normal text css" width="95%%" border="0" bgcolor="white" cellpadding="2" align="center"> + <table summary="normal text css" width="95%%" border="0" cellpadding="2" align="center"> %s </table> %s |