Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql 19 Nov 2001 18:17:46 -0000 1.9
+++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql 23 Dec 2001 00:58:58 -0000 1.10
@@ -13,13 +13,3 @@
@@workflow-case-package-head.sql
@@workflow-case-package-body.sql
-
---
--- schedule processing of the notification queue
---
-
-begin
- nt.schedule_process(1,'localhost',25);
-end;
-/
-show errors;
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.tcl 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.tcl 23 Dec 2001 00:58:58 -0000 1.2
@@ -3,6 +3,7 @@
} {
workflow_key:notnull
place_name:notnull
+ {sort_order:integer ""}
{special ""}
} -validate {
place_name_unique -requires { workflow_key:notnull place_name:notnull } {
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.xql 3 May 2001 01:14:21 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add-2.xql 23 Dec 2001 00:58:58 -0000 1.2
@@ -35,8 +35,8 @@
- insert into wf_places (place_key, place_name, workflow_key)
- values (:place_key, :place_name, :workflow_key)
+ insert into wf_places (place_key, place_name, workflow_key, sort_order)
+ values (:place_key, :place_name, :workflow_key, :sort_order)
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp 23 Dec 2001 00:58:58 -0000 1.2
@@ -16,6 +16,11 @@
|
+
+| Sort order |
+ |
+
+
| Special place |
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.tcl 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.tcl 23 Dec 2001 00:58:58 -0000 1.2
@@ -4,6 +4,7 @@
workflow_key
place_key
place_name
+ {sort_order:integer ""}
{return_url "define?[export_url_vars workflow_key place_key]"}
}
@@ -16,4 +17,4 @@
wf_workflow_changed $workflow_key
-ad_returnredirect $return_url
\ No newline at end of file
+ad_returnredirect $return_url
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.xql 3 May 2001 01:14:21 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit-2.xql 23 Dec 2001 00:58:58 -0000 1.2
@@ -5,7 +5,8 @@
update wf_places
- set place_name = :place_name
+ set place_name = :place_name,
+ sort_order = :sort_order
where workflow_key = :workflow_key
and place_key = :place_key
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp 13 Mar 2001 22:59:27 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp 23 Dec 2001 00:58:58 -0000 1.2
@@ -17,6 +17,11 @@
+| Sort order |
+ |
+
+
+
|
|
@@ -25,4 +30,4 @@
-
\ No newline at end of file
+
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.xql 3 May 2001 01:14:21 -0000 1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.xql 23 Dec 2001 00:58:58 -0000 1.2
@@ -4,7 +4,7 @@
- select p.place_name,
+ select p.place_name, p.sort_order,
ot.pretty_name as workflow_name
from wf_places p, acs_object_types ot
where p.place_key = :place_key
Index: openacs-4/packages/glossary/sql/oracle/glossary-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/sql/oracle/glossary-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/glossary/sql/oracle/glossary-create.sql 16 Nov 2001 03:11:08 -0000 1.2
+++ openacs-4/packages/glossary/sql/oracle/glossary-create.sql 23 Dec 2001 00:58:58 -0000 1.3
@@ -77,7 +77,6 @@
as
function new(
owner_id in parties.party_id%TYPE,
- name in cr_items.name%TYPE,
title in cr_revisions.title%TYPE,
description in cr_revisions.description%TYPE default null,
package_id in apm_packages.package_id%TYPE,
@@ -88,15 +87,14 @@
is_live in char default 'f'
) return cr_items.item_id%TYPE;
-end;
+end glossary;
/
show errors
create or replace package body glossary
as
function new(
owner_id in parties.party_id%TYPE,
- name in cr_items.name%TYPE,
title in cr_revisions.title%TYPE,
description in cr_revisions.description%TYPE default null,
package_id in apm_packages.package_id%TYPE,
@@ -106,12 +104,26 @@
context_id in acs_objects.context_id%TYPE default null,
is_live in char default 'f'
) return cr_items.item_id%TYPE is
- v_item_id integer;
- v_revision_id integer;
+ v_item_id integer;
+ v_revision_id integer;
+ v_name varchar(1000);
+ v_package_key apm_packages.package_key%TYPE;
begin
+ -- Get the object_id for the glossary to be created.
+ select acs_object_id_seq.nextval into v_item_id from dual;
+
+ -- Get the package_key that glossary is created in
+ select package_key into v_package_key from apm_packages where package_id = new.package_id;
+
+ -- Concatenate the two to form the name of the glossary.
+ v_name := v_package_key || v_item_id;
+
+ -- Create the glossary
+
v_item_id := content_item.new(
- name => name,
+ item_id => v_item_id,
+ name => v_name,
content_type => 'glossary',
creation_date => creation_date,
creation_user => creation_user,
@@ -263,4 +275,101 @@
/
show errors
+create or replace package glossary_term
+as
+ function new(
+ term in cr_revisions.title%TYPE,
+ definition in cr_revisions.description%TYPE default null,
+ mime_type in varchar,
+ package_id in apm_packages.package_id%TYPE,
+ creation_date in date default sysdate,
+ creation_user in acs_objects.creation_user%TYPE default null,
+ creation_ip in acs_objects.creation_ip%TYPE default null,
+ context_id in acs_objects.context_id%TYPE default null,
+ publish_status in cr_items.publish_status%TYPE
+ ) return cr_items.item_id%TYPE;
+
+end glossary_term;
+/
+show errors
+
+create or replace package body glossary_term
+as
+ function new(
+ term in cr_revisions.title%TYPE,
+ definition in cr_revisions.description%TYPE default null,
+ mime_type in varchar,
+ package_id in apm_packages.package_id%TYPE,
+ creation_date in date default sysdate,
+ creation_user in acs_objects.creation_user%TYPE default null,
+ creation_ip in acs_objects.creation_ip%TYPE default null,
+ context_id in acs_objects.context_id%TYPE default null,
+ publish_status in cr_items.publish_status%TYPE
+ ) return cr_items.item_id%TYPE is
+ v_revision_id integer;
+ v_name varchar(1000);
+ v_item_id cr_items.item_id%TYPE;
+ v_package_key apm_packages.package_key%TYPE;
+ v_rel_id acs_objects.object_id%TYPE;
+ begin
+
+ -- Get the object_id for the term to be created.
+ select acs_object_id_seq.nextval into v_item_id from dual;
+
+ -- Get the package_key that term is created in
+ select package_key into v_package_key from apm_packages where package_id = new.package_id;
+
+ -- Concatenate the two to form the name of the term.
+ v_name := v_package_key || v_item_id;
+
+ -- Create the glossary
+
+ v_item_id := content_item.new(
+ item_id => v_item_id,
+ name => v_name,
+ content_type => 'glossary_term',
+ creation_date => creation_date,
+ creation_user => creation_user,
+ creation_ip => creation_ip,
+ context_id => context_id
+ );
+
+ v_revision_id := content_revision.new(
+ item_id => v_item_id,
+ title => term,
+ mime_type => mime_type,
+ text => definition,
+ creation_date => creation_date,
+ creation_user => creation_user,
+ creation_ip => creation_ip
+ );
+
+ insert into glossary_terms (term_id) values (v_revision_id);
+
+
+ update cr_items
+ set publish_status = new.publish_status,
+ live_revision = v_revision_id
+ where item_id =v_item_id;
+
+ v_rel_id := acs_object.new (
+ object_type => 'cr_item_child_rel',
+ creation_date => creation_date,
+ creation_user => creation_user,
+ creation_ip => creation_ip
+ );
+
+ insert into cr_child_rels
+ (rel_id, parent_id, child_id, relation_tag)
+ values
+ (v_rel_id, context_id, v_item_id, 'parent glossary');
+
+ return v_item_id;
+
+ end new;
+
+end glossary_term;
+/
+show errors
+
@@ glossary-workflows.sql
Index: openacs-4/packages/glossary/sql/oracle/glossary-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/sql/oracle/glossary-drop.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/glossary/sql/oracle/glossary-drop.sql 25 Oct 2001 01:52:19 -0000 1.3
+++ openacs-4/packages/glossary/sql/oracle/glossary-drop.sql 23 Dec 2001 00:58:58 -0000 1.4
@@ -13,6 +13,7 @@
-- drop the glossary data model
drop package glossary;
+drop package glossary_term;
begin
content_folder.unregister_content_type( -100, 'glossary_term', 't');
Index: openacs-4/packages/glossary/sql/postgresql/glossary-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/sql/postgresql/glossary-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/glossary/sql/postgresql/glossary-create.sql 18 Dec 2001 02:54:09 -0000 1.4
+++ openacs-4/packages/glossary/sql/postgresql/glossary-create.sql 23 Dec 2001 00:58:58 -0000 1.5
@@ -267,8 +267,8 @@
/* object_id => */ NULL,
/* object_type => */ ''cr_item_child_rel'',
/* creation_date => */ current_timestamp,
- /* creation_user => */ NULL,
- /* creation_ip => */ NULL,
+ /* creation_user => */ p_creation_user,
+ /* creation_ip => */ p_creation_ip,
/* context_id => */ p_context_id
);
Index: openacs-4/packages/glossary/www/glossary-add-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/glossary-add-edit-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/glossary/www/glossary-add-edit-oracle.xql 27 Oct 2001 00:11:04 -0000 1.2
+++ openacs-4/packages/glossary/www/glossary-add-edit-oracle.xql 23 Dec 2001 00:58:58 -0000 1.3
@@ -61,7 +61,6 @@
begin
:1 := glossary.new (
owner_id => :owner_id,
- name => :name,
title => :title,
description => :description,
package_id => :package_id,
Index: openacs-4/packages/glossary/www/term-add-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/term-add-edit-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/glossary/www/term-add-edit-oracle.xql 27 Oct 2001 00:11:04 -0000 1.2
+++ openacs-4/packages/glossary/www/term-add-edit-oracle.xql 23 Dec 2001 00:58:58 -0000 1.3
@@ -65,65 +65,21 @@
-
-
+
-
- begin
- :1 := content_item.new (
- name => :name,
- content_type => 'glossary_term',
- context_id => :glossary_item_id,
- creation_user => :user_id,
- creation_ip => :peeraddr
- );
- end;
-
+ begin
+ :1 := glossary_term.new (
+ term => :term,
+ definition => :definition,
+ mime_type => :mime_type,
+ package_id => :package_id,
+ creation_user => :user_id,
+ creation_ip => :peeraddr,
+ context_id => :glossary_item_id,
+ publish_status => :publish_status
+ );
+ end;
-
-
-
-
- begin
- :1 := content_revision.new(
- item_id => :new_item_id,
- title => :term,
- mime_type => :mime_type,
- creation_user => :user_id,
- creation_ip => :peeraddr
- );
- end;
-
-
-
-
-
-
-
-
- update cr_revisions
- set content = empty_blob()
- where revision_id = :new_revision_id
- returning content into :1
-
-
-
-
-
-
-
-
- begin
- :1 := acs_object.new(
- object_type => 'cr_item_child_rel',
- context_id => :glossary_item_id
- );
- end;
-
-
-
-
-