Index: openacs-4/packages/acs-subsite/tcl/email-image-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs-oracle.xql,v diff -u -r1.3.14.1 -r1.3.14.2 --- openacs-4/packages/acs-subsite/tcl/email-image-procs-oracle.xql 28 Oct 2015 09:38:33 -0000 1.3.14.1 +++ openacs-4/packages/acs-subsite/tcl/email-image-procs-oracle.xql 2 Jan 2016 12:42:03 -0000 1.3.14.2 @@ -2,14 +2,6 @@ oracle8.1.6 - - - update cr_revisions - set content_length = dbms_lob.getlength(content) - where revision_id = :revision_id - - - update cr_revisions Index: openacs-4/packages/acs-subsite/tcl/email-image-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs-postgresql.xql,v diff -u -r1.2.14.1 -r1.2.14.2 --- openacs-4/packages/acs-subsite/tcl/email-image-procs-postgresql.xql 28 Oct 2015 09:38:33 -0000 1.2.14.1 +++ openacs-4/packages/acs-subsite/tcl/email-image-procs-postgresql.xql 2 Jan 2016 12:42:03 -0000 1.2.14.2 @@ -2,14 +2,6 @@ postgresql7.1 - - - update cr_revisions - set content_length = lob_length(lob) - where revision_id = :revision_id - - - update cr_revisions Index: openacs-4/packages/acs-subsite/tcl/group-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/group-procs.xql,v diff -u -r1.8.14.1 -r1.8.14.2 --- openacs-4/packages/acs-subsite/tcl/group-procs.xql 28 Oct 2015 09:38:34 -0000 1.8.14.1 +++ openacs-4/packages/acs-subsite/tcl/group-procs.xql 2 Jan 2016 12:42:03 -0000 1.8.14.2 @@ -65,14 +65,6 @@ - - - select group_id - from groups - where group_name = :group_name - - - Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql,v diff -u -r1.3.14.1 -r1.3.14.2 --- openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql 27 Oct 2015 22:56:30 -0000 1.3.14.1 +++ openacs-4/packages/acs-subsite/tcl/rel-types-procs-oracle.xql 2 Jan 2016 12:42:03 -0000 1.3.14.2 @@ -39,5 +39,34 @@ end; - + + + + select case when exists (select 1 + from acs_object_types t + where t.object_type not in (select g.rel_type + from group_rels g + where g.group_id = :group_id) + connect by prior t.object_type = t.supertype + start with t.object_type in ('membership_rel','composition_rel')) + then 1 else 0 end + from dual + + + + + + select case when exists (select 1 + from acs_object_types t + where t.object_type not in (select g.rel_type + from group_type_rels g + where g.group_type = :group_type) + connect by prior t.object_type = t.supertype + start with t.object_type in ('membership_rel','composition_rel')) + then 1 else 0 end + from dual + + + + Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql,v diff -u -r1.8.14.1 -r1.8.14.2 --- openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql 27 Oct 2015 22:56:30 -0000 1.8.14.1 +++ openacs-4/packages/acs-subsite/tcl/rel-types-procs-postgresql.xql 2 Jan 2016 12:42:04 -0000 1.8.14.2 @@ -3,20 +3,33 @@ postgresql7.1 - - + + + select case when exists (select 1 + from acs_object_types t1, acs_object_types t2, group_type_rels g + where g.group_id = :group_id + and t2.object_type <> g.rel_type + and t1.object_type in ('membership_rel','composition_rel') + and t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey) + ) + then 1 else 0 end + + - select case when exists (select 1 - from acs_object_types t1, acs_object_types t2, group_type_rels g - where g.group_type = :group_type - and t2.object_type <> g.rel_type - and t1.object_type in ('membership_rel','composition_rel') - and t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey)) - then 1 else 0 end - - + + + select case when exists (select 1 + from acs_object_types t1, acs_object_types t2, group_type_rels g + where g.group_type = :group_type + and t2.object_type <> g.rel_type + and t1.object_type in ('membership_rel','composition_rel') + and t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey) + ) + then 1 else 0 end + + select acs_rel_type__drop_type(:rel_type, 'f') Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl,v diff -u -r1.11.2.3 -r1.11.2.4 --- openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 28 Oct 2015 09:38:34 -0000 1.11.2.3 +++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 2 Jan 2016 12:42:04 -0000 1.11.2.4 @@ -62,16 +62,7 @@ @author Michael Bryzek (mbryzek@arsdigita.com) @creation-date 12/30/2000 } { - return [db_string "group_rel_type_exists" " - select case when exists (select 1 - from acs_object_types t - where t.object_type not in (select g.rel_type - from group_rels g - where g.group_id = :group_id) - connect by prior t.object_type = t.supertype - start with t.object_type in ('membership_rel','composition_rel')) - then 1 else 0 end - from dual"] + return [db_string group_rel_type_exists {}] } ad_proc -private additional_rel_types_group_type_p { @@ -83,16 +74,7 @@ @author Michael Bryzek (mbryzek@arsdigita.com) @creation-date 12/30/2000 } { - return [db_string "group_rel_type_exists" " - select case when exists (select 1 - from acs_object_types t - where t.object_type not in (select g.rel_type - from group_type_rels g - where g.group_type = :group_type) - connect by prior t.object_type = t.supertype - start with t.object_type in ('membership_rel','composition_rel')) - then 1 else 0 end - from dual"] + return [db_string group_rel_type_exists {}] } ad_proc -public new { Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/subsite-procs.xql,v diff -u -r1.12.10.5 -r1.12.10.6 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.xql 12 Sep 2015 17:25:07 -0000 1.12.10.5 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.xql 2 Jan 2016 12:42:04 -0000 1.12.10.6 @@ -1,18 +1,6 @@ - - - - select 1 - from dual - where exists (select 1 - from application_groups - where package_id = :package_id) - - - - Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/index-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/index-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/index.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/group-types/new-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new-oracle.xql,v diff -u -r1.1.30.1 -r1.1.30.2 --- openacs-4/packages/acs-subsite/www/admin/group-types/new-oracle.xql 28 Oct 2015 09:38:35 -0000 1.1.30.1 +++ openacs-4/packages/acs-subsite/www/admin/group-types/new-oracle.xql 2 Jan 2016 12:42:04 -0000 1.1.30.2 @@ -4,12 +4,20 @@ oracle8.1.6 - + select case when exists (select 1 from acs_object_types t where t.pretty_name = :pretty_name) then 1 else 0 end from dual - - + - + + + + select replace(lpad(' ', (level - 1) * 4), ' ', ' ') || t.pretty_name, t.object_type + from acs_object_types t + connect by prior t.object_type = t.supertype + start with t.object_type = 'group' + + + Index: openacs-4/packages/acs-subsite/www/admin/group-types/new-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new-postgresql.xql,v diff -u -r1.3 -r1.3.30.1 --- openacs-4/packages/acs-subsite/www/admin/group-types/new-postgresql.xql 4 Dec 2001 00:20:47 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/new-postgresql.xql 2 Jan 2016 12:42:04 -0000 1.3.30.1 @@ -4,21 +4,17 @@ postgresql7.1 - - - select case when exists (select 1 from acs_object_types t where t.pretty_name = :pretty_name) - then 1 else 0 end - - - + + select case when exists (select 1 from acs_object_types t where t.pretty_name = :pretty_name) + then 1 else 0 end + - select repeat(' ', (tree_level(t2.tree_sortkey) - tree_level(t1.tree_sortkey)) * 4) || t2.pretty_name, t2.object_type - from acs_object_types t1, acs_object_types t2 + from acs_object_types t1, acs_object_types t2 where t2.tree_sortkey between t1.tree_sortkey and tree_right(t1.tree_sortkey) and t1.object_type = 'group' Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl,v diff -u -r1.5.6.2 -r1.5.6.3 --- openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl 27 Oct 2015 23:01:35 -0000 1.5.6.2 +++ openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl 2 Jan 2016 12:42:04 -0000 1.5.6.3 @@ -22,34 +22,30 @@ template::form create group_type template::element create group_type object_type \ - -datatype "text" \ - -label "[_ acs-subsite.Group_type]" \ - -html { size 30 maxlength 30 } + -datatype "text" \ + -label [_ acs-subsite.Group_type] \ + -html { size 30 maxlength 30 } -set supertype_options [db_list_of_lists "select_group_supertypes" { - select replace(lpad(' ', (level - 1) * 4), ' ', ' ') || t.pretty_name, t.object_type - from acs_object_types t - connect by prior t.object_type = t.supertype - start with t.object_type = 'group'}] +set supertype_options [db_list_of_lists select_group_supertypes {}] foreach opt $supertype_options { lappend supertype_options_i18n [lang::util::localize $opt] } template::element create group_type supertype \ - -datatype "text" \ - -widget select \ - -options $supertype_options_i18n \ - -label "[_ acs-subsite.Supertype]" + -datatype "text" \ + -widget select \ + -options $supertype_options_i18n \ + -label [_ acs-subsite.Supertype] template::element create group_type pretty_name \ - -datatype "text" \ - -label "[_ acs-subsite.Pretty_name]" \ - -html { size 50 maxlength 100 } + -datatype "text" \ + -label [_ acs-subsite.Pretty_name] \ + -html { size 50 maxlength 100 } template::element create group_type pretty_plural \ - -datatype "text" \ - -label "[_ acs-subsite.Pretty_plural]" \ - -html { size 50 maxlength 100 } + -datatype "text" \ + -label [_ acs-subsite.Pretty_plural] \ + -html { size 50 maxlength 100 } set approval_policy_options { { {Open: Users can create groups of this type} open } @@ -65,30 +61,34 @@ set safe_object_type [plsql_utility::generate_oracle_name -max_length 29 $object_type] if { [plsql_utility::object_type_exists_p $safe_object_type] } { - incr exception_count - append exception_text "
  • The specified object type, $object_type, already exists. -[ad_decode $safe_object_type $object_type "" "Note that we converted the object type to \"$safe_object_type\" to ensure that the name would be safe for the database."] -Please back up and choose another.
    • " + incr exception_count + append exception_text \ + "
  • The specified object type, $object_type, already exists. " \ + [ad_decode $safe_object_type $object_type "" \ + "Note that we converted the object type to \"$safe_object_type\" to ensure that the name would be safe for the database."] \ + "Please back up and choose another.
    • " } else { - # let's make sure the names are unique - if { [db_string pretty_name_unique {}] } { - incr exception_count - append exception_text "
  • The specified pretty name, $pretty_name, already exists. Please enter another
    • " - } + # let's make sure the names are unique + if { [db_string pretty_name_unique {}] } { + incr exception_count + append exception_text \ + "
  • The specified pretty name, $pretty_name, already exists. Please enter another
    • " + } - if { [db_string pretty_name_unique {}] } { - incr exception_count - append exception_text "
  • The specified pretty plural, $pretty_plural, already exists. Please enter another
    • " - } + if { [db_string pretty_name_unique {}] } { + incr exception_count + append exception_text \ + "
  • The specified pretty plural, $pretty_plural, already exists. Please enter another
    • " + } } if { $exception_count > 0 } { - ad_return_complaint $exception_count $exception_text - ad_script_abort + ad_return_complaint $exception_count $exception_text + ad_script_abort } - db_transaction { - group_type::new -group_type $object_type -supertype $supertype $pretty_name $pretty_plural + db_transaction { + group_type::new -group_type $object_type -supertype $supertype $pretty_name $pretty_plural } ad_returnredirect "" return Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/instance-delete.xql,v diff -u -r1.2 -r1.2.28.1 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql 21 Jun 2002 19:08:33 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql 2 Jan 2016 12:42:05 -0000 1.2.28.1 @@ -1,15 +1,6 @@ - - - select case when count(*) = 0 then 0 else 1 end - from apm_packages p, site_nodes s - where package_id = :package_id - and p.package_id = s.object_id - - - select case when count(*) = 0 then 0 else 1 end Fisheye: Tag 1.3.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/permissions/one.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.24.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.24.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/unsubscribe-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/unsubscribe-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/unsubscribe.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.28.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-new.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/portrait-bits-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/portrait-bits-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.30.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/portrait-bits.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v diff -u -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 10 Sep 2015 08:21:54 -0000 1.17.2.1 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 2 Jan 2016 12:42:05 -0000 1.17.2.2 @@ -15,15 +15,15 @@ set current_user_id [ad_conn user_id] -set portrait_p [db_0or1row "checkportrait" {}] +set portrait_p [db_0or1row checkportrait {}] if { $portrait_p } { set doc(title) [_ acs-subsite.upload_a_replacement_por] - set description [db_string "getstory" {}] + set description [db_string getstory {}] } else { set doc(title) [_ acs-subsite.Upload_Portrait] - set description "" - set revision_id "" + set description "" + set revision_id "" } if {$user_id eq ""} {