Index: openacs-4/packages/edit-this-page/Changes =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/Changes,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/Changes 1 Nov 2001 22:51:46 -0000 1.2 +++ openacs-4/packages/edit-this-page/Changes 4 Apr 2003 15:56:20 -0000 1.3 @@ -1,5 +1,13 @@ Edit This Page version history +25 January 2003 +-Oracle is broken. We will fix it later. +-Changed base content type to be etp_page_revision, all custom types should +subtype that. There is an upgrade script, please read the notes before +applying it. With this new types are automatically registered with a +search service contract. + + 30 October 2001 ETP code changed to support Oracle and OpenACS function style. No new functionallity has been added. Index: openacs-4/packages/edit-this-page/edit-this-page.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/edit-this-page.info 18 Nov 2001 18:57:58 -0000 1.4 +++ openacs-4/packages/edit-this-page/edit-this-page.info 4 Apr 2003 15:56:20 -0000 1.5 @@ -7,17 +7,17 @@ f f - + - oracle postgresql - Luke Pond + Dave Bauer + Luke Pond Jon Griffin An easy-to-use content management system. - Nothing Yet + Easy to use publishing system - + @@ -27,6 +27,7 @@ + @@ -118,7 +119,8 @@ - + + Index: openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql 12 Feb 2002 00:02:13 -0000 1.5 +++ openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql 4 Apr 2003 15:57:04 -0000 1.6 @@ -90,12 +90,11 @@ is v_item_id cr_items.item_id%TYPE; v_revision_id cr_revisions.revision_id%TYPE; - v_content_type acs_objects.object_type%TYPE; v_folder_id cr_folders.folder_id%TYPE; begin v_item_id := acs_object.new ( null, - 'content_item', + create_page.content_type, sysdate(), null, null, @@ -107,14 +106,17 @@ insert into cr_items (item_id, parent_id, name, content_type) values - (v_item_id, v_folder_id, name, v_content_type); + (v_item_id, v_folder_id, name, content_type); - -- would like to use content_type here, but since there''s - -- no table that corresponds to it, we get an error from - -- the dynamic sql in acs_object__delete. so just use content_revision. +-- due to a change in acs_object__delete we can reference the actual +-- object type we want +-- using this we can more easily search, but we will have to create a service +-- contract for each custom content type +-- we define a default etp_page_revision and service contract to go with it +-- make sure to subtype from etp_page_revision for any custom types +-- 2003-01-12 DaveB - v_content_type := 'content_revision'; - v_revision_id := acs_object.new(null, v_content_type); + v_revision_id := acs_object.new(null, content_type); insert into cr_revisions (revision_id, item_id, title, publish_date, mime_type) Index: openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql 21 Dec 2002 22:29:10 -0000 1.9 +++ openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql 4 Apr 2003 15:58:13 -0000 1.10 @@ -39,26 +39,28 @@ p_content_type alias for $4; -- default null -> use content_revision v_item_id integer; v_revision_id integer; - v_content_type varchar; v_folder_id integer; begin v_item_id := acs_object__new(null, ''content_item'', now(), null, null, p_package_id); v_folder_id := etp__get_folder_id(p_package_id); +-- due to a change in acs_object__delete we can reference the actual +-- object type we want +-- using this we can more easily search, but we will have to create a service +-- contract for each custom content type +-- we define a default etp_page_revision and service contract to go with it +-- make sure to subtype from etp_page_revision for any custom types +-- 2003-01-12 DaveB + insert into cr_items ( item_id, parent_id, name, content_type ) values ( - v_item_id, v_folder_id, p_name, v_content_type + v_item_id, v_folder_id, p_name, p_content_type ); - -- would like to use p_content_type here, but since there''s - -- no table that corresponds to it, we get an error from - -- the dynamic sql in acs_object__delete. so just use content_revision. + v_revision_id := acs_object__new(null, p_content_type, now(), null, null, v_item_id); - v_content_type := ''content_revision''; - v_revision_id := acs_object__new(null, v_content_type, now(), null, null, v_item_id); - insert into cr_revisions (revision_id, item_id, title, publish_date, mime_type) values (v_revision_id, v_item_id, p_title, now(), ''text/html''); @@ -303,7 +305,7 @@ select target_id into v_item_id from cr_symlinks where symlink_id = p_item_id; - return etp__get_title(p_item_id, null); + return etp__get_title(v_item_id, null); end if; if v_object_type = ''content_item'' then @@ -357,7 +359,7 @@ select target_id into v_item_id from cr_symlinks where symlink_id = p_item_id; - return etp__get_description(p_item_id, null); + return etp__get_description(v_item_id, null); end if; if v_object_type = ''content_item'' then @@ -448,3 +450,17 @@ select inline_1 (); drop function inline_1 (); + +-- create a default content_type etp_page_revision +-- DaveB +-- this references a non-existant table +-- which I might have to change... +select content_type__create_type ( + 'etp_page_revision', -- content_type + 'content_revision', -- supertype + 'ETP managed page', -- pretty_name + 'ETP managed pages', -- pretty_plural + 'etp_page_revisions', -- table_name + 'etp_page_revision_id', -- id_column + 'content_revision__revision_name' -- name_method +); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-sc-create.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/sql/postgresql/upgrade/upgrade-1.1d-1.2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-edit.tcl 23 Jan 2003 19:56:05 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-edit.tcl 4 Apr 2003 15:59:38 -0000 1.5 @@ -72,7 +72,7 @@ set widget [ad_dateentrywidget datevalue $value] } } else { - set widget "\n" + set widget "\n" } set form_vars [export_form_vars name attribute] Index: openacs-4/packages/edit-this-page/www/etp-history.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-history.adp 4 Sep 2002 13:01:46 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-history.adp 4 Apr 2003 15:59:38 -0000 1.3 @@ -3,41 +3,45 @@ @context@ - - - - - - - - - - - -
Version -Created -Published - -
@revisions.version_number@ - - - - -@revisions.creation_user_name@ on - -@revisions.creation_date@ - - - - -@revisions.publish_user_name@ on - -@revisions.publish_date@ - - -view - - | revert - - -
\ No newline at end of file + + Version + Created + Published + + + + + + + @revisions.version_number@ (LIVE) + + + @revisions.version_number@ + + + + + + @revisions.creation_user_name@ on + + @revisions.creation_date@ + + + + + @revisions.publish_user_name@ on + + @revisions.publish_date@ + + + view + + | revert + + + | delete + + + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/www/etp-revision-delete-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/www/etp-revision-delete-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/www/etp-revision-delete.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/edit-this-page/www/etp-setup-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup-2-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-setup-2-postgresql.xql 2 Nov 2001 06:16:37 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-setup-2-postgresql.xql 4 Apr 2003 15:59:38 -0000 1.3 @@ -4,7 +4,7 @@ -select content_folder__new(:name, :title, '', etp__get_folder_id(:parent_package_id)); +select content_folder__new(:name, :title, '', coalesce(etp__get_folder_id(:parent_package_id), NULL)); Index: openacs-4/packages/edit-this-page/www/etp-setup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/etp-setup.tcl 4 Sep 2002 13:01:46 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/etp-setup.tcl 4 Apr 2003 15:59:38 -0000 1.3 @@ -23,8 +23,8 @@ set package_id [ad_conn package_id] if { $confirmed == "f" } { - set app [ad_parameter application "default"] - set subtopic_app [ad_parameter subtopic_application "default"] + set app [parameter::get -package_id $package_id -parameter application -default "default"] + set subtopic_app [parameter::get -package_id $package_id -parameter subtopic_application -default "default"] set app_options "" set subtopic_app_options "" @@ -51,8 +51,9 @@ ad_return_template } else { - db_dml set_app_param "" - db_dml set_subtopic_app_param "" + parameter::set_value -package_id $package_id -parameter application -value $app + parameter::set_value -package_id $package_id -parameter subtopic_application -value $subtopic_app + apm_parameter_sync edit-this-page $package_id ad_returnredirect "etp" ad_script_abort Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/www/etp-setup.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/edit-this-page/www/etp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp.tcl 30 Nov 2002 17:32:17 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp.tcl 4 Apr 2003 15:59:38 -0000 1.4 @@ -64,7 +64,7 @@ if { $name == "index" } { set context [list "Edit"] } else { - set context [list [list $name $name] "Edit"] + set context [list [list $name $pa(title)] "Edit"] } set url_dir "[file dirname [ad_conn url]]" Index: openacs-4/packages/edit-this-page/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/index.vuh,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/index.vuh 24 Sep 2002 00:14:44 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/index.vuh 4 Apr 2003 15:59:38 -0000 1.4 @@ -18,7 +18,7 @@ # get the portion of the url following the package directory set name [ad_conn path_info] -ns_log Notice "index.vuh: request for $name" +#ns_log Notice "index.vuh: request for $name" if { [string index $name end] == "/" } { # it's in a subdirectory, and we know there's no @@ -45,7 +45,7 @@ ns_set put [ns_getform] "name" $name } -ns_log Notice "Edit This Page index.vuh: serving $path" +#ns_log Notice "Edit This Page index.vuh: serving $path" rp_internal_redirect $path Index: openacs-4/packages/edit-this-page/www/doc/index.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/doc/index.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/edit-this-page/www/doc/index.html 9 Jan 2003 21:13:33 -0000 1.2 +++ openacs-4/packages/edit-this-page/www/doc/index.html 4 Apr 2003 16:00:05 -0000 1.3 @@ -31,6 +31,9 @@
+ OpenFTS Search Support + - adding Search support +
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/www/doc/searching.html'. Fisheye: No comparison available. Pass `N' to diff?