Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 24 May 2007 08:56:33 -0000 1.22 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 25 May 2007 11:49:13 -0000 1.23 @@ -212,6 +212,14 @@ set group_clause [expr {$groupby ne "" ? "GROUP BY $groupby" : ""}] return "SELECT $vars FROM $from WHERE $where $group_clause $order_clause $limit_clause" } + + sql proc date_trunc {field date} { + return "date_trunc('$field',$date)" + } + sql proc date_trunc_expression {field date date_string} { + return "date_trunc('$field',$date) = '$date_string'" + } + } else { ;# Oracle proc map_sql_datatype {type} { switch $type { @@ -253,6 +261,12 @@ my log "--returned sql = $sql" return $sql } + sql proc date_trunc {field date} { + return "to_char(trunc(to_date($date,'YYYY-MM-DD'),'$field'), 'YYYY-MM-DD HH24:MI:SS')" + } + sql proc date_trunc_expression {field date date_string} { + return "trunc('$date,'$field') = trunc(to_date('$string','YYYY-MM-DD'),'$field')" + } } sql proc since_interval_condition {var interval} { set since [clock format [clock scan "-$interval"] -format "%Y-%m-%d %T"] Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v diff -u -r1.68 -r1.69 --- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 24 May 2007 08:56:33 -0000 1.68 +++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 25 May 2007 11:49:13 -0000 1.69 @@ -460,8 +460,8 @@ Delete a content item from the content repository. @param item_id id of the item to be deleted } { - #::xo::db::CONTENT_ITEM DELETE {item_id} - ::xo::db::content_item delete -item_id $item_id + #::xo::db::content_item delete -item_id $item_id + ::xo::db::content_item del -item_id $item_id } CrClass instproc object_types {