Fisheye: Tag 1.1.16.1 refers to a dead (removed) revision in file `openacs-4/packages/news/lib/item-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/news/lib/item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/item.tcl,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/news/lib/item.tcl 12 Sep 2015 11:06:41 -0000 1.4.2.1 +++ openacs-4/packages/news/lib/item.tcl 2 Jan 2016 20:34:49 -0000 1.4.2.2 @@ -35,17 +35,18 @@ # live view of a news item in its active revision -set item_exist_p [db_0or1row "" " -select item_id, +set item_exist_p [db_0or1row get_news_info { + select item_id, live_revision, publish_title, publish_lead, publish_format, publish_body, publish_date, '' || item_creator || '' as creator_link -from news_items_live_or_submitted -where item_id = :item_id"] + from news_items_live_or_submitted + where item_id = :item_id +}] if { $item_exist_p } { @@ -56,9 +57,11 @@ # set get_content [db_map get_content] if {$get_content ne ""} { - set publish_body [db_string get_content "select content - from cr_revisions - where revision_id = :live_revision"] + set publish_body [db_string get_content { + select content + from cr_revisions + where revision_id = :live_revision + }] } # text-only body Index: openacs-4/packages/news/tcl/news-apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-apm-callback-procs.tcl,v diff -u -r1.4.12.1 -r1.4.12.2 --- openacs-4/packages/news/tcl/news-apm-callback-procs.tcl 12 Sep 2015 11:06:41 -0000 1.4.12.1 +++ openacs-4/packages/news/tcl/news-apm-callback-procs.tcl 2 Jan 2016 20:34:49 -0000 1.4.12.2 @@ -130,7 +130,7 @@ @error } { - news_items_delete [db_list dead_news ""] + news_items_delete [db_list dead_news {}] rss_support::del_subscription -summary_context_id $package_id -owner news -impl_name news } Fisheye: Tag 1.2.12.1 refers to a dead (removed) revision in file `openacs-4/packages/news/tcl/news-callback-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.12.1 refers to a dead (removed) revision in file `openacs-4/packages/news/tcl/news-callback-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/news/tcl/news-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-callback-procs.tcl,v diff -u -r1.3.12.1 -r1.3.12.2 --- openacs-4/packages/news/tcl/news-callback-procs.tcl 12 Sep 2015 11:06:42 -0000 1.3.12.1 +++ openacs-4/packages/news/tcl/news-callback-procs.tcl 2 Jan 2016 20:34:49 -0000 1.3.12.2 @@ -17,7 +17,7 @@ ns_log Notice $msg set result [list $msg] - set news [db_list_of_lists getaprovednews { *SQL* }] + set news [db_list_of_lists getaprovednews {}] lappend result $news @@ -34,7 +34,7 @@ ns_log Notice $msg set result [list $msg] - db_dml update_from_news_approval { *SQL* } + db_dml update_from_news_approval {} lappend result "Merge of news is done" Index: openacs-4/packages/news/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v diff -u -r1.35.2.2 -r1.35.2.3 --- openacs-4/packages/news/tcl/news-procs.tcl 25 Sep 2015 08:25:57 -0000 1.35.2.2 +++ openacs-4/packages/news/tcl/news-procs.tcl 2 Jan 2016 20:34:49 -0000 1.35.2.3 @@ -17,13 +17,7 @@ } { foreach id $id_list { - db_exec_plsql news_item_archive { - begin - news.archive( - item_id => :id, - archive_date => :when); - end; - } + db_exec_plsql news_item_archive {} } } @@ -37,11 +31,7 @@ } { foreach id $id_list { - db_exec_plsql news_item_make_permanent { - begin - news.make_permanent(:id); - end; - } + db_exec_plsql news_item_make_permanent {} } } @@ -54,11 +44,7 @@ } { foreach id $id_list { - db_exec_plsql news_item_delete { - begin - news.del(:id); - end; - } + db_exec_plsql news_item_delete {} } } @@ -72,12 +58,7 @@ set url_stub "" - db_0or1row get_url_stub " - select site_node__url(node_id) as url_stub - from site_nodes - where object_id=:package_id - " - + db_0or1row get_url_stub {} return $url_stub } @@ -238,7 +219,7 @@ @error } { - return [db_string get_last_updated ""] + return [db_string get_last_updated {}] } ad_proc -private news__rss_datasource { @@ -338,8 +319,10 @@ set instance_name [application_group::closest_ancestor_element -include_self -node_id $node_id -element "instance_name"] # get the title and teaser for latest news item for the given package id - if { [db_0or1row "get_news" "select item_id, publish_date, publish_title as title, publish_lead as lead, publish_body, publish_format from news_items_live_or_submitted where news_id = - :news_id"] } { + if { [db_0or1row get_news { + select item_id, publish_date, publish_title as title, publish_lead as lead, publish_body, publish_format + from news_items_live_or_submitted where news_id = :news_id + }] } { set new_content "$title\n\n$lead\n\n[ad_html_text_convert -from $publish_format -to text/plain -- $publish_body]" set html_content [ad_html_text_convert -from $publish_format -to text/html -- $publish_body] append new_content "\n\n[string repeat - 70]" 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.12.2.1 -r1.12.2.2 --- openacs-4/packages/news/tcl/test/news-db-test-init.tcl 12 Sep 2015 11:06:42 -0000 1.12.2.1 +++ openacs-4/packages/news/tcl/test/news-db-test-init.tcl 2 Jan 2016 20:34:50 -0000 1.12.2.2 @@ -525,14 +525,14 @@ # Extract the list of all privileges and privilege heirachies. # set priv_list {} - db_foreach "get-privileges" { + db_foreach get-privileges { select privilege from acs_privileges } { lappend priv_list $privilege } set priv_h_list {} - db_foreach "get-privilege-heirarchys" { + db_foreach get-privilege-heirarchys { select privilege, child_privilege from acs_privilege_hierarchy } { lappend priv_h_list "$privilege,$child_privilege" @@ -666,7 +666,7 @@ } "check-object-type" { Checks the news object type. } { - set news_type_exists_p [db_0or1row "get-news-type-info" { + set news_type_exists_p [db_0or1row get-news-type-info { select supertype from acs_object_types where object_type = 'news' @@ -677,7 +677,7 @@ if {$news_type_exists_p} { aa_equals "Check the supertype is content_revision" $supertype "content_revision" - db_foreach "get-news-type-attribs" { + db_foreach get-news-type-attribs { select attribute_name from acs_attributes where object_type = 'news' @@ -692,7 +692,7 @@ aa_true "Check $attribute_name exists" {[lsearch $attribs $attribute_name] != -1} } - set news_folder_exists_p [db_0or1row "get-news-cr-folder" { + set news_folder_exists_p [db_0or1row get-news-cr-folder { select folder_id from cr_folders where label = 'news' Index: openacs-4/packages/news/www/preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v diff -u -r1.31.2.1 -r1.31.2.2 --- openacs-4/packages/news/www/preview.tcl 12 Sep 2015 11:06:43 -0000 1.31.2.1 +++ openacs-4/packages/news/www/preview.tcl 2 Jan 2016 20:34:50 -0000 1.31.2.2 @@ -158,10 +158,11 @@ } # creator link -set creator_name [db_string creator " -select first_names || ' ' || last_name -from cc_users -where user_id = :user_id"] +set creator_name [db_string creator { + select first_names || ' ' || last_name + from cc_users + where user_id = :user_id +}] set creator_link "$creator_name" template::head::add_style -style ".news-item-preview { color: inherit; background-color: #eeeeee; margin: 1em 4em 1em 4em; padding: 1em; }" -media screen Index: openacs-4/packages/news/www/preview.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/preview.xql,v diff -u -r1.2 -r1.2.16.1 --- openacs-4/packages/news/www/preview.xql 24 Feb 2005 18:03:05 -0000 1.2 +++ openacs-4/packages/news/www/preview.xql 2 Jan 2016 20:34:50 -0000 1.2.16.1 @@ -10,9 +10,4 @@ - -SELECT item_id AS img_item_id FROM cr_items -WHERE content_type = 'image' AND parent_id = :item_id - - Index: openacs-4/packages/news/www/admin/approve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve-2.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/news/www/admin/approve-2.tcl 12 Sep 2015 11:06:43 -0000 1.6.2.1 +++ openacs-4/packages/news/www/admin/approve-2.tcl 2 Jan 2016 20:34:50 -0000 1.6.2.2 @@ -47,20 +47,7 @@ foreach id $revision_id { - db_exec_plsql news_item_approve_publish { - begin - news.set_approve( - approve_p => 't', - revision_id => :id, - publish_date => :publish_date_ansi, - archive_date => :archive_date_ansi, - approval_user => :approval_user, - approval_date => :approval_date, - approval_ip => :approval_ip, - live_revision_p => :live_revision_p - ); - end; - } + db_exec_plsql news_item_approve_publish {} } set package_id [ad_conn package_id] Index: openacs-4/packages/news/www/admin/approve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve.tcl,v diff -u -r1.7.4.1 -r1.7.4.2 --- openacs-4/packages/news/www/admin/approve.tcl 12 Sep 2015 11:06:43 -0000 1.7.4.1 +++ openacs-4/packages/news/www/admin/approve.tcl 2 Jan 2016 20:34:50 -0000 1.7.4.2 @@ -24,12 +24,13 @@ } -set title "[_ news.Approve_items]" +set title [_ news.Approve_items] set context [list $title] # pre-set date widgets with defaults -set proj_archival_date [db_string week "select sysdate + [parameter::get -parameter ActiveDays -default 14] from dual"] +set active_days [parameter::get -parameter ActiveDays -default 14] +set proj_archival_date [db_string week {}] set publish_date_select [dt_widget_datetime -default now publish_date days] set archive_date_select [dt_widget_datetime -default $proj_archival_date archive_date days] Index: openacs-4/packages/news/www/admin/process-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process-2.tcl,v diff -u -r1.4.22.1 -r1.4.22.2 --- openacs-4/packages/news/www/admin/process-2.tcl 12 Sep 2015 11:06:43 -0000 1.4.22.1 +++ openacs-4/packages/news/www/admin/process-2.tcl 2 Jan 2016 20:34:50 -0000 1.4.22.2 @@ -29,17 +29,17 @@ } "archive now" { - set when [db_string archive_now "select sysdate from dual"] + set when [db_string archive_now {}] news_items_archive $n_items $when } "archive next week" { - set when [db_string archive_next_week "select next_day(sysdate,'Monday') from dual"] + set when [db_string archive_next_week {}] news_items_archive $n_items $when } "archive next month" { - set when [db_string archive_next_month "select last_day(sysdate)+1 from dual"] + set when [db_string archive_next_month {}] news_items_archive $n_items $when } Index: openacs-4/packages/news/www/admin/revision-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add-3.tcl,v diff -u -r1.13.2.1 -r1.13.2.2 --- openacs-4/packages/news/www/admin/revision-add-3.tcl 12 Sep 2015 11:06:44 -0000 1.13.2.1 +++ openacs-4/packages/news/www/admin/revision-add-3.tcl 2 Jan 2016 20:34:50 -0000 1.13.2.2 @@ -43,38 +43,23 @@ # Insert is 2-step process, same as in item-create-3.tcl if [catch { - set revision_id [db_exec_plsql create_news_item_revision " - begin - :1 := news.revision_new( - item_id => :item_id, - publish_date => :publish_date_ansi, - title => :publish_title, - description => :revision_log, - mime_type => :mime_type, - package_id => [ad_conn package_id], - archive_date => :archive_date_ansi, - approval_user => :approval_user, - approval_date => :approval_date, - approval_ip => :approval_ip, - creation_ip => :creation_ip, - creation_user => :creation_user, - make_active_revision_p => :active_revision_p); - end;"] + set revision_id [db_exec_plsql create_news_item_revision {}] set content_add [db_map content_add] if {![string match $content_add ""]} { - db_dml content_add " - update cr_revisions - set content = empty_blob() - where revision_id = :revision_id - returning content into :1" -blobs [list $publish_body] + db_dml content_add { + update cr_revisions + set content = empty_blob() + where revision_id = :revision_id + returning content into :1 + } -blobs [list $publish_body] } } errmsg ] { - set complaint " [_ news.lt_The_database_did_not_] - [_ news.lt_See_details_for_the_e]\n\n\t

$errmsg" - ad_return_error "[_ news.Database_Error]" "$complaint" + set complaint " [_ news.lt_The_database_did_not_] \ + [_ news.lt_See_details_for_the_e]\n\n\t

$errmsg" + ad_return_error [_ news.Database_Error] $complaint ad_script_abort } else { Index: openacs-4/packages/news/www/admin/revision-set-active.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-set-active.tcl,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/news/www/admin/revision-set-active.tcl 12 Sep 2015 11:06:44 -0000 1.4.2.1 +++ openacs-4/packages/news/www/admin/revision-set-active.tcl 2 Jan 2016 20:34:50 -0000 1.4.2.2 @@ -16,11 +16,7 @@ } -db_exec_plsql update_forum { - begin - news.revision_set_active (:new_rev_id); - end; -} +db_exec_plsql update_forum {} ad_returnredirect "item?item_id=$item_id" Index: openacs-4/packages/news/www/admin/revoke.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revoke.tcl,v diff -u -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/news/www/admin/revoke.tcl 12 Sep 2015 11:06:44 -0000 1.4.2.1 +++ openacs-4/packages/news/www/admin/revoke.tcl 2 Jan 2016 20:34:50 -0000 1.4.2.2 @@ -15,14 +15,7 @@ } -db_exec_plsql news_item_revoke { - begin - news.set_approve( - approve_p => 'f', - revision_id => :revision_id - ); - end; -} +db_exec_plsql news_item_revoke {} ad_returnredirect "item?item_id=$item_id"