Index: openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql 31 Oct 2001 05:13:54 -0000 1.2 @@ -63,5 +63,86 @@ where node_id = site_node.node_id(:url_stub, null) + + + + select 1 from cr_items + where parent_id = etp.get_folder_id(:package_id) + and name = :name + + + + + + select i.item_id, i.name, r.revision_id, r.title, + r.description, r.publish_date, r.content $extended_attributes + from cr_items i, cr_revisions r + where i.parent_id = etp.get_folder_id(:package_id) + and i.name = :name + and i.item_id = r.item_id + and r.revision_id = i.live_revision + + + + + select i.item_id, i.name, r.revision_id, r.title, + r.description, r.publish_date, r.content $extended_attributes + from cr_items i, cr_revisions r + where i.parent_id = etp.get_folder_id(:package_id) + and i.name = :name + and i.item_id = r.item_id + and r.revision_id = :revision_id + + + + + + select max(revision_id) as revision_id + from cr_revisions r, cr_items i + where i.parent_id = etp.get_folder_id(:package_id) + and i.name = :name + and i.item_id = r.item_id + + + + + + select live_revision as revision_id + from cr_items i + where i.parent_id = etp.get_folder_id(:package_id) + and i.name = :name + + + + + + select * from ( + select $columns + from cr_items i + left join + cr_revisions r + on (i.live_revision = r.revision_id) + where i.parent_id = etp.get_folder_id(:package_id) + and i.name != 'index' + ) as attributes + where $extra_where_clauses + order by $orderby + $limit_clause + + + + + +select child.name, child.node_id, child.object_id as package_id, + etp.package_title(child.object_id) as title, + etp.package_description(child.object_id) as description + from site_nodes parent, site_nodes child, apm_packages p + where parent.object_id = :package_id + and child.parent_id = parent.node_id + and child.object_id = p.package_id + and p.package_key = 'edit-this-page' + + + Index: openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql 31 Oct 2001 04:12:38 -0000 1.2 +++ openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql 31 Oct 2001 05:13:54 -0000 1.3 @@ -58,4 +58,86 @@ + + + select 1 from cr_items + where parent_id = etp__get_folder_id(:package_id) + and name = :name + + + + + + select i.item_id, i.name, r.revision_id, r.title, + r.description, r.publish_date, r.content $extended_attributes + from cr_items i, cr_revisions r + where i.parent_id = etp__get_folder_id(:package_id) + and i.name = :name + and i.item_id = r.item_id + and r.revision_id = i.live_revision + + + + + + select i.item_id, i.name, r.revision_id, r.title, + r.description, r.publish_date, r.content $extended_attributes + from cr_items i, cr_revisions r + where i.parent_id = etp__get_folder_id(:package_id) + and i.name = :name + and i.item_id = r.item_id + and r.revision_id = :revision_id + + + + + + select max(revision_id) as revision_id + from cr_revisions r, cr_items i + where i.parent_id = etp__get_folder_id(:package_id) + and i.name = :name + and i.item_id = r.item_id + + + + + + select live_revision as revision_id + from cr_items i + where i.parent_id = etp__get_folder_id(:package_id) + and i.name = :name + + + + + + select * from ( + select $columns + from cr_items i + left join + cr_revisions r + on (i.live_revision = r.revision_id) + where i.parent_id = etp__get_folder_id(:package_id) + and i.name != 'index' + ) as attributes + where $extra_where_clauses + order by $orderby + $limit_clause + + + + + + +select child.name, child.node_id, child.object_id as package_id, + etp__package_title(child.object_id) as title, + etp__package_description(child.object_id) as description + from site_nodes parent, site_nodes child, apm_packages p + where parent.object_id = :package_id + and child.parent_id = parent.node_id + and child.object_id = p.package_id + and p.package_key = 'edit-this-page' + + + Index: openacs-4/packages/edit-this-page/tcl/etp-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/tcl/etp-procs.tcl 22 Oct 2001 15:09:30 -0000 1.2 +++ openacs-4/packages/edit-this-page/tcl/etp-procs.tcl 31 Oct 2001 05:13:54 -0000 1.3 @@ -446,7 +446,7 @@ set attribute_name [etp::get_attribute_name $attribute_desc] set default [etp::get_attribute_default $attribute_desc] - set lookup_sql "etp_get_attribute_value(r.revision_id, $attribute_id)" + set lookup_sql "etp__get_attribute_value(r.revision_id, $attribute_id)" # see if a select-list callback function was specified if { [info commands $default] != "" } { @@ -570,9 +570,9 @@ to_char(r.publish_date, 'Mon DD, YYYY') as publish_date, (select object_type from acs_objects where object_id = i.item_id) as object_type, - etp_get_relative_url(i.item_id, i.name) as url, - etp_get_title(i.item_id, r.title) as title, - etp_get_description(i.item_id, r.description) as description + etp__get_relative_url(i.item_id, i.name) as url, + etp__get_title(i.item_id, r.title) as title, + etp__get_description(i.item_id, r.description) as description " set limit_clause "" Index: openacs-4/packages/edit-this-page/tcl/etp-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/tcl/etp-procs.xql 22 Oct 2001 15:09:30 -0000 1.3 +++ openacs-4/packages/edit-this-page/tcl/etp-procs.xql 31 Oct 2001 05:13:54 -0000 1.4 @@ -16,87 +16,4 @@ - - - select 1 from cr_items - where parent_id = etp_get_folder_id(:package_id) - and name = :name - - - - - - select i.item_id, i.name, r.revision_id, r.title, - r.description, r.publish_date, r.content $extended_attributes - from cr_items i, cr_revisions r - where i.parent_id = etp_get_folder_id(:package_id) - and i.name = :name - and i.item_id = r.item_id - and r.revision_id = i.live_revision - - - - - - select i.item_id, i.name, r.revision_id, r.title, - r.description, r.publish_date, r.content $extended_attributes - from cr_items i, cr_revisions r - where i.parent_id = etp_get_folder_id(:package_id) - and i.name = :name - and i.item_id = r.item_id - and r.revision_id = :revision_id - - - - - - select max(revision_id) as revision_id - from cr_revisions r, cr_items i - where i.parent_id = etp_get_folder_id(:package_id) - and i.name = :name - and i.item_id = r.item_id - - - - - - select live_revision as revision_id - from cr_items i - where i.parent_id = etp_get_folder_id(:package_id) - and i.name = :name - - - - - - select * from ( - select $columns - from cr_items i - left join - cr_revisions r - on (i.live_revision = r.revision_id) - where i.parent_id = etp_get_folder_id(:package_id) - and i.name != 'index' - ) as attributes - where $extra_where_clauses - order by $orderby - $limit_clause - - - - - - -select child.name, child.node_id, child.object_id as package_id, - etp_package_title(child.object_id) as title, - etp_package_description(child.object_id) as description - from site_nodes parent, site_nodes child, apm_packages p - where parent.object_id = :package_id - and child.parent_id = parent.node_id - and child.object_id = p.package_id - and p.package_key = 'edit-this-page' - - - - Index: openacs-4/packages/edit-this-page/www/etp-extlink-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-extlink-oracle.xql 31 Oct 2001 04:35:05 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-extlink-oracle.xql 31 Oct 2001 05:09:36 -0000 1.2 @@ -1 +1,11 @@ + + + oracle8.1.6 + + + + select etp.create_extlink(:package_id, :url, :label, :description); + + + + Index: openacs-4/packages/edit-this-page/www/etp-extlink-postgres.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/Attic/etp-extlink-postgres.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/edit-this-page/www/etp-extlink-postgres.xql 31 Oct 2001 05:09:52 -0000 1.1 @@ -0,0 +1,11 @@ + + + postgres7.1 + + + + select etp__create_extlink(:package_id, :url, :label, :description); + + + + Index: openacs-4/packages/edit-this-page/www/etp-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-extlink.tcl 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-extlink.tcl 31 Oct 2001 05:09:30 -0000 1.2 @@ -27,7 +27,7 @@ } else { if { [empty_string_p $item_id] } { db_exec_plsql create_extlink { - select etp_create_extlink(:package_id, :url, :label, :description); + } } else { db_dml update_extlink {