diff options
Diffstat (limited to 'org/out_sqlite.org')
-rw-r--r-- | org/out_sqlite.org | 62 |
1 files changed, 23 insertions, 39 deletions
diff --git a/org/out_sqlite.org b/org/out_sqlite.org index d5fbe7b..113a7c6 100644 --- a/org/out_sqlite.org +++ b/org/out_sqlite.org @@ -158,8 +158,7 @@ template SQLiteDbRun() { writeln("ERROR SQLite : ", ex); } { /+ debug +/ - if (opt_action.debug_do_sqlite - && opt_action.verbose) { + if (opt_action.debug_do_sqlite) { writeln(note); if (opt_action.very_verbose) { writeln(db_statement); @@ -519,8 +518,7 @@ string generic_munge_sanitize_text_for_search( _txt ~= _urls; } { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(_txt, "\n"); } } @@ -576,8 +574,7 @@ string munge_html(M,O)( string _urls; string _txt = _html_font_face(_html_special_characters(obj.text)); { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(_txt, "\n"); } } @@ -1205,8 +1202,7 @@ string[string] heading(M,O)( "html": html_heading(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1234,8 +1230,7 @@ string[string] para(M,O)( "html": html_para(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1263,8 +1258,7 @@ string[string] quote(M,O)( "html": html_quote(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1291,8 +1285,7 @@ string[string] group(M,O)( "html": html_group(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1320,8 +1313,7 @@ string[string] block(M,O)( "html": html_block(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1349,8 +1341,7 @@ string[string] verse(M,O)( "html": html_verse(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1378,8 +1369,7 @@ string[string] code(M,O)( "html": html_code(obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1407,8 +1397,7 @@ string[string] table(M,O)( "html": html_table(doc_matters, obj) ]; { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { debug(sql_txt) { writeln(obj_txt["text"]); } @@ -1443,8 +1432,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); } } @@ -1453,8 +1441,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type); } } @@ -1478,8 +1465,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); } } @@ -1510,8 +1496,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); } } @@ -1520,8 +1505,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type); } } @@ -1550,8 +1534,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); } } @@ -1560,8 +1543,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_type); } } @@ -1572,8 +1554,7 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; default: { /+ debug +/ - if (doc_matters.opt.action.debug_do_sqlite - && doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.debug_do_sqlite) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); // check where empty value could come from writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); writeln(__FILE__, ":", __LINE__, ": ", obj.text); // check where empty value could come from @@ -1582,7 +1563,10 @@ foreach (part; doc_matters.has.keys_seq.sql) { break; } if (obj.metainfo.is_a == "heading") { - if ((doc_matters.opt.action.very_verbose)) { + if (doc_matters.opt.action.show_sqlite) { + if (obj.metainfo.heading_lev_markup == 0) { + writeln(doc_matters.src.filename); + } writeln( "markup: ", obj.metainfo.heading_lev_markup, "> ", obj.metainfo.dom_structure_markedup_tags_status, |