Index: openacs-4/packages/forums/lib/forums/forums-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/Attic/forums-chunk-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/forums/lib/forums/forums-chunk-oracle.xql 27 Apr 2009 16:32:22 -0000 1.5 +++ openacs-4/packages/forums/lib/forums/forums-chunk-oracle.xql 23 Nov 2017 12:33:11 -0000 1.6 @@ -16,14 +16,4 @@ </querytext> </fullquery> - <partialquery name="unread_or_new_query"> - <querytext> - approved_thread_count-nvl((SELECT forums_reading_info_user.threads_read - FROM forums_reading_info_user - WHERE forums_reading_info_user.forum_id=forums_forums_enabled.forum_id - AND forums_reading_info_user.user_id=:user_id), 0) - as count_unread - </querytext> - </partialquery> - </queryset> Index: openacs-4/packages/forums/lib/forums/forums-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/Attic/forums-chunk-postgresql.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/forums/lib/forums/forums-chunk-postgresql.xql 27 Apr 2009 16:32:22 -0000 1.5 +++ openacs-4/packages/forums/lib/forums/forums-chunk-postgresql.xql 23 Nov 2017 12:33:11 -0000 1.6 @@ -16,15 +16,4 @@ </querytext> </fullquery> - <partialquery name="unread_or_new_query"> - <querytext> - approved_thread_count-coalesce((SELECT forums_reading_info_user.threads_read - FROM forums_reading_info_user - WHERE forums_reading_info_user.forum_id=forums_forums_enabled.forum_id - AND forums_reading_info_user.user_id=:user_id), 0) - as count_unread - </querytext> - </partialquery> - - </queryset> Index: openacs-4/packages/forums/lib/forums/forums-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/forums/lib/forums/forums-chunk.xql 23 Nov 2017 12:33:11 -0000 1.1 @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<queryset> + + <partialquery name="unread_or_new_query"> + <querytext> + approved_thread_count - coalesce( + (SELECT forums_reading_info_user.threads_read + FROM forums_reading_info_user + WHERE forums_reading_info_user.forum_id=forums_forums_enabled.forum_id + AND forums_reading_info_user.user_id=:user_id), + 0) as count_unread + </querytext> + </partialquery> + +</queryset> Index: openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql 4 Jan 2007 09:08:15 -0000 1.8 +++ openacs-4/packages/workflow/tcl/workflow-procs-oracle.xql 23 Nov 2017 12:38:07 -0000 1.9 @@ -2,27 +2,6 @@ <queryset> <rdbms><type>oracle</type><version>8.1.6</version></rdbms> - <fullquery name="workflow::get_not_cached.workflow_info"> - <querytext> - select w.workflow_id, - w.short_name, - w.pretty_name, - w.object_id, - w.package_key, - w.object_type, - w.description, - w.description_mime_type, - a.short_name as initial_action, - a.action_id as initial_action_id - from workflows w, - workflow_actions a - where w.workflow_id = :workflow_id - and w.workflow_id = a.workflow_id (+) - and a.parent_action_id is null - and a.trigger_type(+) = 'init' - </querytext> - </fullquery> - <fullquery name="workflow::edit.do_insert"> <querytext> begin @@ -47,13 +26,5 @@ end; </querytext> </fullquery> - - <fullquery name="workflow::callback_insert.select_sort_order"> - <querytext> - select nvl(max(sort_order),0) + 1 - from workflow_callbacks - where workflow_id = :workflow_id - </querytext> - </fullquery> - + </queryset> Index: openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql 23 Jan 2004 11:02:27 -0000 1.8 +++ openacs-4/packages/workflow/tcl/workflow-procs-postgresql.xql 23 Nov 2017 12:38:07 -0000 1.9 @@ -2,27 +2,6 @@ <queryset> <rdbms><type>postgresql</type><version>7.2</version></rdbms> - <fullquery name="workflow::get_not_cached.workflow_info"> - <querytext> - select w.workflow_id, - w.short_name, - w.pretty_name, - w.object_id, - w.package_key, - w.object_type, - w.description, - w.description_mime_type, - a.short_name as initial_action, - a.action_id as initial_action_id - from workflows w left outer join - workflow_actions a on (a.workflow_id = w.workflow_id - and a.parent_action_id is null - and a.trigger_type = 'init') - where w.workflow_id = :workflow_id - </querytext> - </fullquery> - - <fullquery name="workflow::edit.do_insert"> <querytext> select workflow__new ( @@ -44,12 +23,4 @@ </querytext> </fullquery> - <fullquery name="workflow::callback_insert.select_sort_order"> - <querytext> - select coalesce(max(sort_order),0) + 1 - from workflow_callbacks - where workflow_id = :workflow_id - </querytext> - </fullquery> - </queryset> Index: openacs-4/packages/workflow/tcl/workflow-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/workflow-procs.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/workflow/tcl/workflow-procs.xql 29 Oct 2003 10:47:12 -0000 1.7 +++ openacs-4/packages/workflow/tcl/workflow-procs.xql 23 Nov 2017 12:38:07 -0000 1.8 @@ -1,6 +1,34 @@ <?xml version="1.0"?> <queryset> + <fullquery name="workflow::get_not_cached.workflow_info"> + <querytext> + select w.workflow_id, + w.short_name, + w.pretty_name, + w.object_id, + w.package_key, + w.object_type, + w.description, + w.description_mime_type, + a.short_name as initial_action, + a.action_id as initial_action_id + from workflows w left outer join + workflow_actions a on (a.workflow_id = w.workflow_id + and a.parent_action_id is null + and a.trigger_type = 'init') + where w.workflow_id = :workflow_id + </querytext> + </fullquery> + + <fullquery name="workflow::callback_insert.select_sort_order"> + <querytext> + select coalesce(max(sort_order),0) + 1 + from workflow_callbacks + where workflow_id = :workflow_id + </querytext> + </fullquery> + <fullquery name="workflow::get_id_not_cached.select_workflow_id_by_object_id"> <querytext> select workflow_id