diff --git a/calexium_lib/CXM_message_constants.anubis b/calexium_lib/CXM_message_constants.anubis index 5304df8..ce354b2 100644 --- a/calexium_lib/CXM_message_constants.anubis +++ b/calexium_lib/CXM_message_constants.anubis @@ -5,8 +5,9 @@ * Time: 16:06 * (c) Calexium * - * To change this template use Tools | Options | Coding | Edit Standard Headers. */ + +public define Word32 _NO_NAME_MSG = 0x00000000. // **************** MAILBOX PROTOCOL *************** diff --git a/calexium_lib/database/db_types.anubis b/calexium_lib/database/db_types.anubis new file mode 100644 index 0000000..12795f1 --- /dev/null +++ b/calexium_lib/database/db_types.anubis @@ -0,0 +1,59 @@ +/* + * Created by PyramIDE. + * User: Totoro + * Date: 14/11/2011 + * Time: 22:41 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +read tools/basis.anubis + +public type DB_id: + none, + db_id(Int value). + +public type DB_datetime: + datetime(String datetime). + +public type DB_date: + date(String date). + +public type DB_integer: + db_integer(Int value). + + +public define String + to_String + ( + DB_id idx + )= + if idx is + { + none then "none", + db_id(idx) then abs_to_decimal(idx) + }. + +public define String + to_String + ( + DB_date d + )= + d.date. + +public define String + to_String + ( + DB_datetime d + )= + d.datetime. + +public define String + to_DBString + ( + Bool value + )= + if value then "1" else "0". + +public type SQLite3_update_field: + field(String column, SQLite3Bind bind). + diff --git a/calexium_lib/database/db_utils.anubis b/calexium_lib/database/db_utils.anubis index 44558e2..045a2a3 100644 --- a/calexium_lib/database/db_utils.anubis +++ b/calexium_lib/database/db_utils.anubis @@ -81,7 +81,7 @@ public define DbQueryResult with t0 = unow, if sql_query_timeout(db, sql_query, initial_bindings, 60, 100, (DbError _) |-> false) is { - error(sql_error) then logError("DB", db_error(sql_error,msg)); + error(sql_error) then logError("DB", db_error(sql_error,msg) + " executing [" + sql_query + "]"); __logLongQueries(t0, sql_query); error(sql_error), ok(headers, cursor, reset) then @@ -124,7 +124,8 @@ public define SQLite3QueryResult with t0 = unow, if sql_query_timeout(db, sql_query, initial_bindings, 60, 100) is { - error(sql_error) then logError("DB", db_error(sql_error,msg)); + error(sql_error) then logError("DB", db_error(sql_error,msg) /*+ " executing [" + sql_query + "]"*/); + //println(" executing [" + sql_query + "]"); __logLongQueries(t0, sql_query); error(sql_error), ok(headers, cursor, reset) then diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis index 3556102..2fb9b36 100644 --- a/calexium_lib/web/CXM_making_a_web_site.anubis +++ b/calexium_lib/web/CXM_making_a_web_site.anubis @@ -3524,7 +3524,7 @@ define Printable_tree { [ ] then [ ], [h . t] then if h is cell(options,element) then - ["", + ["", format_element(element), "" . format(t,format_element)] @@ -3558,7 +3558,7 @@ define Printable_tree { [ ] then [ ], [h . t] then if h is row(options,cells) then - ["", + ["", format(cells,format_element), "\n" . format(t,format_element)] @@ -3574,7 +3574,7 @@ define Printable_tree { empty then [ ], header_row(options,cells) then - [" ", + [" ", format(cells,format_element), " \n" ] @@ -3590,7 +3590,7 @@ define Printable_tree { empty then [ ], footer_row(options,cells) then - [" ", + [" ", format(cells,format_element), " \n" ] @@ -3890,18 +3890,18 @@ define Printable_tree if element is { any_text(opts,t) then - ["",t,""], + ["",t,""], any_preformated(opts,s) then - ["
",s,"
"], + ["
",s,"
"], //["
",s,"
"], any_paragraph(opts,e) then - ["

",format_element(e),"

\n"], + ["",format_element(e),"

\n"], any_image(opts, url, alt) then ["\"",alt,"\""], any_image(opts, url, alt, w, h) then ["\"",alt,"\""], any_table(opts,h_row, rows, f_row) then - ["", + ["", format(h_row, format_element), "",format(rows,format_element),"", format(f_row, format_element), -- libgit2 0.21.4