Index: openacs-4/packages/lars-blogger/tcl/category-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/category-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/tcl/category-procs.tcl 11 Dec 2003 21:40:05 -0000 1.2 +++ openacs-4/packages/lars-blogger/tcl/category-procs.tcl 14 Dec 2003 16:12:06 -0000 1.3 @@ -46,3 +46,11 @@ return [db_list short_names {}] } +ad_proc lars_blogger::category::get_id_by_name { + {-package_id:required} + {-name:required} +} { + Returns category ID from name (not short_name) +} { + return [db_string select_category_id {} -default {}] +} \ No newline at end of file Index: openacs-4/packages/lars-blogger/tcl/category-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/category-procs.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/tcl/category-procs.xql 11 Dec 2003 21:40:05 -0000 1.2 +++ openacs-4/packages/lars-blogger/tcl/category-procs.xql 14 Dec 2003 16:12:06 -0000 1.3 @@ -19,5 +19,14 @@ + + + select category_id + from pinds_blog_categories + where package_id = :package_id + and name = :category_name + + + Index: openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl 14 Dec 2003 11:10:44 -0000 1.3 +++ openacs-4/packages/lars-blogger/tcl/metaweblog-api-procs.tcl 14 Dec 2003 16:12:06 -0000 1.4 @@ -72,30 +72,26 @@ } # OpenACS time format YYYY-MM-DD - set fmt "%Y-%m-%d" + set fmt "%Y-%m-%d %H:%M:%S" # hopefully pubDate is in a readable format if { [catch {set pubDate [clock format [clock scan $content(pubDate)] -format $fmt]}] } { set pubDate [clock format [clock seconds] -format $fmt] } - # ignore 'enclosure' for now - if { [exists_and_not_null content(categories)] } { # Only looking at the first category - set category_name [lindex $content(categories) 0] - set category_id [db_string select_category_id { - select category_id - from pinds_blog_categories - where package_id = :package_id - and name = :category_name - }] + set category_id [lars_blogger::category::get_id_by_name \ + -package_id $package_id \ + -name [lindex $content(categories) 0]] } else { set category_id {} } - - return [list -string [lars_blog_entry_add -entry_id $entry_id \ + # ignore 'enclosure' for now + + return [list -string [lars_blogger::entry::new \ + -entry_id $entry_id \ -package_id $package_id \ -title $content(title) \ -content $content(description) \ @@ -144,16 +140,26 @@ } # OpenACS time format YYYY-MM-DD - set fmt "%Y-%m-%d" + set fmt "%Y-%m-%d %H:%M:%S" # hopefully pubDate is in a readable format if { [catch {set pubDate [clock format [clock scan $content(pubDate)] -format $fmt]}] } { set pubDate [clock format [clock seconds] -format $fmt] } - # ignore 'category', 'enclosure' for now + if { [exists_and_not_null content(categories)] } { + # Only looking at the first category + set category_id [lars_blogger::category::get_id_by_name \ + -package_id $package_id \ + -name [lindex $content(categories) 0]] + } else { + set category_id {} + } + + # ignore 'enclosure' for now - lars_blog_entry_edit -entry_id $entry_id \ + lars_blogger::entry::edit \ + -entry_id $entry_id \ -title $content(title) \ -content $content(description) \ -content_format "text/html" \