Index: openacs-4/packages/news/tcl/test/news-db-test-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/test/news-db-test-init.tcl,v diff -u -r1.18 -r1.18.2.1 --- openacs-4/packages/news/tcl/test/news-db-test-init.tcl 20 Oct 2018 11:55:29 -0000 1.18 +++ openacs-4/packages/news/tcl/test/news-db-test-init.tcl 14 Feb 2019 16:15:01 -0000 1.18.2.1 @@ -136,7 +136,7 @@ _news_cr_news_root_folder_id } { aa_export_vars {_news_cr_root_folder_id _news_cr_news_root_folder_id} - + set _news_cr_root_folder_id [content::item::get_root_folder] set p_parent_id $_news_cr_root_folder_id set _news_cr_news_root_folder_id [db_string get-cr-news-root-folder { @@ -163,18 +163,18 @@ news_id } { aa_export_vars {p_full_details p_title p_text p_package_id p_is_live - p_approval_user p_approval_ip p_approval_date p_archive_date + p_approval_user p_approval_ip p_approval_date p_archive_date news_id} if {$p_full_details == "t"} { set p_approval_user [ad_conn "user_id"] set p_approval_ip [ad_conn "peeraddr"] set p_approval_date [dt_sysdate] set p_archive_date [dt_sysdate] } else { - set p_approval_user [db_null] - set p_approval_ip [db_null] - set p_approval_date [db_null] - set p_archive_date [db_null] + set p_approval_user "" + set p_approval_ip "" + set p_approval_date "" + set p_archive_date "" } set news_id [db_exec_plsql item-create { begin @@ -224,21 +224,21 @@ Populates:
revision_id } { - aa_export_vars {p_item_id + aa_export_vars {p_item_id p_full_details p_title p_text p_package_id p_make_active_revision_p p_description - p_approval_user p_approval_ip p_approval_date p_archive_date + p_approval_user p_approval_ip p_approval_date p_archive_date revision_id} if {$p_full_details == "t"} { set p_approval_user [ad_conn "user_id"] set p_approval_ip [ad_conn "peeraddr"] set p_approval_date [dt_sysdate] set p_archive_date [dt_sysdate] } else { - set p_approval_user [db_null] - set p_approval_ip [db_null] - set p_approval_date [db_null] - set p_archive_date [db_null] + set p_approval_user "" + set p_approval_ip "" + set p_approval_date "" + set p_archive_date "" } set revision_id [db_exec_plsql revision-create { begin @@ -371,7 +371,7 @@ set retrieval_ok_p 1 if {![db_0or1row get-cr-news-row { select package_id, archive_date, - approval_user, approval_date, approval_ip + approval_user, approval_date, approval_ip from cr_news where news_id = :p_news_id }]} { @@ -646,7 +646,7 @@ db config } -on_error { - The "news" object type doesn't exist, or has isn't configured correctly. + The "news" object type doesn't exist, or has isn't configured correctly. The most probable cause of this is that the news package datamodel hasn't been installed. } "check_object_type" { @@ -797,7 +797,7 @@ # Call the news.name function to retrieve the item name. # aa_log "Call news.name function to retrieve title of content revision" - set p_news_id $news_id + set p_news_id $news_id set name [db_exec_plsql news-name {}] aa_equals "Check the return from news.name is correct" $name $p_title } @@ -820,7 +820,7 @@ set p_item_id $item_id aa_call_component db-get-cr-items-row aa_false "Check the cr_items row was deleted" {$retrieval_ok_p} - + set p_revision_id $news_id aa_call_component db-get-cr-revisions-row aa_false "Check the cr_revisions row was deleted" {$retrieval_ok_p} @@ -1041,7 +1041,7 @@ # set p_news_id $news_id aa_call_component db-get-cr-news-row - aa_equals "Check the archive_date is null" $archive_date [db_null] + aa_equals "Check the archive_date is null" $archive_date "" # # Set the archive period, providing an explicit archive date. @@ -1162,10 +1162,10 @@ if {!$retrieval_ok_p} { aa_error "cr_news row not found for new revision news_id $revision2_id" } else { - aa_equals "Check the archive_date is null" $archive_date [db_null] - aa_equals "Check the approval_date is null" $approval_date [db_null] - aa_equals "Check the aprroval_user is null" $approval_user [db_null] - aa_equals "Check the approval_ip is null" $approval_ip [db_null] + aa_equals "Check the archive_date is null" $archive_date "" + aa_equals "Check the approval_date is null" $approval_date "" + aa_equals "Check the aprroval_user is null" $approval_user "" + aa_equals "Check the approval_ip is null" $approval_ip "" } # @@ -1176,7 +1176,7 @@ if {!$retrieval_ok_p} { aa_error "cr_revisions row not found for new revision revision_id $revision2_id" } else { - aa_equals "Check revision 2 publish_date is null" $publish_date [db_null] + aa_equals "Check revision 2 publish_date is null" $publish_date "" } # @@ -1295,10 +1295,10 @@ aa_log "Unapproving revision 1, setting publish_date null, archive_date null" set p_revision_id $revision1_id set p_approve_p "t" - set p_publish_date [db_null] - set p_archive_date [db_null] + set p_publish_date "" + set p_archive_date "" set p_approval_user [ad_conn "user_id"] - set p_approval_date [db_null] + set p_approval_date "" set p_approval_ip [ad_conn "peeraddr"] set p_live_revision_p "t" aa_call_component db-news-set-approve @@ -1317,7 +1317,7 @@ set p_revision_id $revision1_id set p_approve_p "t" set p_publish_date [clock format [clock scan "+ 1 year"] -format %Y-%m-%d] ; # in the future - set p_archive_date [db_null] + set p_archive_date "" set p_approval_user [ad_conn "user_id"] set p_approval_date "2001-11-03" set p_approval_ip [ad_conn "peeraddr"] @@ -1359,7 +1359,7 @@ set p_revision_id $revision1_id set p_approve_p "t" set p_publish_date "2000-11-01" - set p_archive_date [db_null] + set p_archive_date "" set p_approval_user [ad_conn "user_id"] set p_approval_date "2001-11-03" set p_approval_ip [ad_conn "peeraddr"]