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 -N -r1.5 -r1.6 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql 27 Aug 2001 03:59:17 -0000 1.5 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/workflow-case-package.sql 3 Sep 2001 05:28:28 -0000 1.6 @@ -369,6 +369,7 @@ v_journal_id number; begin /* Add an entry to the journal */ + dbms_output.put_line('creating journal entry'); v_journal_id := journal_entry.new( object_id => start_case.case_id, action => 'case start', @@ -380,13 +381,15 @@ update wf_cases set state = 'active' where case_id = start_case.case_id; + dbms_output.put_line('adding token'); add_token( case_id => start_case.case_id, place_key => 'start', journal_id => v_journal_id ); /* Turn the wheels */ + dbms_output.put_line('sweeping transitions'); sweep_automatic_transitions( case_id => start_case.case_id, journal_id => v_journal_id @@ -1067,6 +1070,7 @@ * 3. otherwise, if there is an attribute, we use that */ + dbms_output.put_line('exec of case_deadline callback'); /* wf_case_deadlines */ open case_deadline_cur; fetch case_deadline_cur into v_deadline; @@ -1206,7 +1210,7 @@ v_workflow_key varchar2(100); begin select wf_token_id_seq.nextval into v_token_id from dual; - + dbms_output.put_line('case_id = ' || case_id || ', place_key = ' || place_key || ', journal_id = ' || journal_id); select workflow_key into v_workflow_key from wf_cases c where c.case_id = add_token.case_id; @@ -1315,7 +1319,7 @@ v_done_p char(1); v_finished_p char(1); begin - + dbms_output.put_line('enabling transitions'); enable_transitions(case_id => sweep_automatic_transitions.case_id); loop @@ -1520,7 +1524,9 @@ and tr.transition_key = ta.transition_key; /* Default values */ - v_party_from := -1; /* This default value should probably be pulled from somewhere */ + -- changed to null from -1 since acs-mail references users instead of + -- parties. DanW (dcwickstrom@earthlink.net) + v_party_from := null; /* This default value should probably be pulled from somewhere */ v_subject := 'Assignment: '||v_transition_name||' '||v_object_name; v_body := 'You have been assigned to a task. '||' Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/test/workflow-case-package-test.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/test/workflow-case-package-test.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/test/workflow-case-package-test.sql 2 Sep 2001 17:35:44 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/test/workflow-case-package-test.sql 3 Sep 2001 05:28:28 -0000 1.4 @@ -6,8 +6,56 @@ -- -- exec utplsql.setdir('/web/lars-dev2/packages/acs-kernel/sql'); -exec utplsql.autocompile (false); +-- exec utplsql.autocompile (false); +create or replace package utassert +as + procedure eq ( + msg_in in varchar2, + check_this_in in integer, + against_this_in in integer + ); + procedure eq ( + msg_in in varchar2, + check_this_in in varchar2, + against_this_in in varchar2 + ); +end utassert; +/ +show errors; + +create or replace package body utassert +as + + procedure eq ( + msg_in in varchar2, + check_this_in in integer, + against_this_in in integer + ) + is + begin + if check_this_in <> against_this_in then + dbms_output.put_line('ERROR ' || msg_in || ' failed'); + end if; + end eq; + + procedure eq ( + msg_in in varchar2, + check_this_in in varchar2, + against_this_in in varchar2 + ) + is + begin + if check_this_in <> against_this_in then + dbms_output.put_line('ERROR ' || msg_in || ' failed'); + end if; + end eq; + +end utassert; +/ +show errors; + + create or replace package ut#workflow_case as @@ -39,8 +87,8 @@ - utplsql.setpkg('workflow_case'); - utplsql.addtest('run'); + -- utplsql.setpkg('workflow_case'); + -- utplsql.addtest('run'); end; procedure teardown @@ -506,11 +554,18 @@ against_this_in => v_state ); - utresult.show; + -- utresult.show; end; end ut#workflow_case; / show errors -exec utplsql.test('workflow_case'); \ No newline at end of file +-- exec utplsql.test('workflow_case'); + +begin + ut#workflow_case.setup; + ut#workflow_case.run; +end; +/ +show errors Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql 1 Sep 2001 02:46:33 -0000 1.3 +++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-nt-create.sql 3 Sep 2001 05:28:28 -0000 1.4 @@ -165,7 +165,7 @@ ); -- get the sender email address - select email into v_header_from + select max(email) into v_header_from from parties where party_id = party_from; -- get the recipient email address Index: openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql 2 Sep 2001 14:24:58 -0000 1.4 +++ openacs-4/packages/cms/www/modules/sitemap/index-oracle.xql 3 Sep 2001 05:28:28 -0000 1.5 @@ -12,7 +12,7 @@ 'content_folder', f.label, nvl(v.title, i.name)) title, decode(r.item_id, :index_page_id, 't', 'f') is_index_page, - nvl(to_char(round(v.content_length / 1000, 1)), '-') file_size + nvl(to_char(round(v.content_length / 1000, 2)), '-') file_size from cr_resolved_items r, cr_items i, cr_folders f, cr_revisions v, cr_revisions u, acs_objects o, acs_object_types t @@ -53,7 +53,7 @@ o.object_type, t.pretty_name content_type, to_char(o.last_modified, 'MM/DD/YYYY HH24:MI') last_modified_date, decode(r.item_id, :index_page_id, 't', 'f') is_index_page, - nvl(to_char(round(v.content_length / 1000, 1)), '-') file_size + nvl(to_char(round(v.content_length / 1000, 2)), '-') file_size from cr_resolved_items r, cr_items i, cr_folders f, cr_revisions v, cr_revisions u, acs_objects o, acs_object_types t Index: openacs-4/packages/cms/www/modules/templates/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/templates/index-oracle.xql 8 Jun 2001 01:44:53 -0000 1.1 +++ openacs-4/packages/cms/www/modules/templates/index-oracle.xql 3 Sep 2001 05:28:28 -0000 1.2 @@ -37,7 +37,7 @@ select t.template_id, i.name, to_char(o.last_modified, 'MM/DD/YY HH:MI AM') modified, - nvl(round(r.content_length / 1000), 0) || ' KB' as file_size + nvl(round(r.content_length / 1000, 2), 0) || ' KB' as file_size from cr_templates t, cr_items i, acs_objects o, cr_revisions r where Index: openacs-4/packages/cms/www/modules/templates/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/templates/index.tcl 2 Sep 2001 14:24:58 -0000 1.3 +++ openacs-4/packages/cms/www/modules/templates/index.tcl 3 Sep 2001 05:28:28 -0000 1.4 @@ -89,7 +89,7 @@ select t.template_id, i.name, to_char(o.last_modified, 'MM/DD/YY HH:MI AM') modified, - nvl(round(r.content_length / 1000), 0) || ' KB' as file_size + nvl(round(r.content_length / 1000, 2), 0) || ' KB' as file_size from cr_templates t, cr_items i, acs_objects o, cr_revisions r where Index: openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql 2 Sep 2001 14:24:58 -0000 1.2 +++ openacs-4/packages/cms/www/modules/templates/revisions-oracle.xql 3 Sep 2001 05:28:28 -0000 1.3 @@ -9,7 +9,7 @@ select revision_id, to_char(o.creation_date, 'MM/DD/YY HH:MI AM') modified, - round(r.content_length / 1000) || ' KB' as file_size, + round(r.content_length / 1000, 2) || ' KB' as file_size, decode(NVL(p.person_id, 0), 0, '-', substr(p.first_names, 1, 1) || substr(p.last_name, 1, 1)) modified_by, Index: openacs-4/packages/cms/www/modules/templates/revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/revisions.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/templates/revisions.tcl 2 Sep 2001 14:24:58 -0000 1.3 +++ openacs-4/packages/cms/www/modules/templates/revisions.tcl 3 Sep 2001 05:28:28 -0000 1.4 @@ -19,7 +19,7 @@ select revision_id, to_char(o.creation_date, 'MM/DD/YY HH:MI AM') modified, - round(r.content_length / 1000) || ' KB' as file_size, + round(r.content_length / 1000, 2) || ' KB' as file_size, decode(NVL(p.person_id, 0), 0, '-', substr(p.first_names, 1, 1) || substr(p.last_name, 1, 1)) modified_by, Index: openacs-4/packages/cms/www/modules/workflow/case-create-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-create-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/workflow/case-create-oracle.xql 25 May 2001 23:49:05 -0000 1.1 +++ openacs-4/packages/cms/www/modules/workflow/case-create-oracle.xql 3 Sep 2001 05:28:28 -0000 1.2 @@ -39,7 +39,7 @@ begin workflow_case.add_manual_assignment( case_id => :case_id, - tranisition_key => :transition, + transition_key => :transition, party_id => :new_value ); end; Index: openacs-4/packages/cms/www/modules/workflow/case-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-create.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/cms/www/modules/workflow/case-create.tcl 12 Jun 2001 04:13:46 -0000 1.6 +++ openacs-4/packages/cms/www/modules/workflow/case-create.tcl 3 Sep 2001 05:28:28 -0000 1.7 @@ -241,7 +241,7 @@ begin workflow_case.add_manual_assignment( case_id => :case_id, - tranisition_key => :transition, + transition_key => :transition, party_id => :new_value ); end;