Index: openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,30 @@ + + + + + + + select 1 as admin_exists_p + from dual + where exists (select 1 + from acs_object_party_privilege_map m, users u + where m.object_id = 0 + and m.party_id = u.user_id + and m.privilege = 'admin') + + + + + + + + select case when count(object_id) = 0 then 0 else 1 end + from site_nodes + where object_id = (select package_id + from apm_packages + where package_key = 'acs-admin') + + + + + Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,24 @@ + + + + oracle8.1.6 + + + + + select count(*) + from dual + where acs_permission.permission_p(:object_id, :user_id, :privilege) = 't' + + + + + + + + select acs_object.name(:object_id) from dual + + + + + Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + select count(*) + from acs_privileges + where privilege = :privilege + + + + + + Index: openacs-4/packages/acs-tcl/tcl/admin-init-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-init-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/admin-init-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,15 @@ + + + oracle8.1.6 + + + + + select package_id, site_node.url(node_id) as url from apm_packages p, site_nodes n + where p.package_id = n.object_id + + + + + + Index: openacs-4/packages/acs-tcl/tcl/admin-init-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-init-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/admin-init-postgresql.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,15 @@ + + + postgresql7.1 + + + + + select package_id, site_node__url(node_id) as url from apm_packages p, site_nodes n + where p.package_id = n.object_id + + + + + + Index: openacs-4/packages/acs-tcl/tcl/admin-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/admin-procs.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,14 @@ + + + + + + + select sql_post_select + from user_classes where user_class_id = [ns_dbquotevalue $user_class_id] + + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,58 @@ + + + + oracle8.1.6 + + + + select distribution_tarball from apm_package_versions where version_id = :version_id + + + + + + + + update apm_package_versions + set distribution_tarball = empty_blob(), + distribution_uri = null, + distribution_date = sysdate + where version_id = :version_id + returning distribution_tarball into :1 + + + + + + + + + begin + :1 := apm_package_version.add_file( + file_id => :file_id, + version_id => :version_id, + path => :path, + file_type => :file_type, + db_type => :db_type + ); + end; + + + + + + + + + begin + apm_package_version.remove_file( + path => :path, + version_id => :version_id + ); + end; + + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs-postgresql.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs-postgresql.xql 17 Apr 2001 22:59:51 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs-postgresql.xql 24 Apr 2001 06:02:26 -0000 1.5 @@ -1,26 +1,54 @@ + -postgresql7.1 + postgresql7.1 - - -select apm_package_version__add_file( - NULL, - :version_id, - :path, - :file_type, - :db_type -) - + + + FIX ME LOB select distribution_tarball from apm_package_versions where version_id = :version_id + - - -select apm_package_version__remove_file ( - :path, - :version_id -) - + + + + FIX ME LOB + update apm_package_versions + set distribution_tarball = empty_blob(), + distribution_uri = null, + distribution_date = sysdate + where version_id = :version_id + returning distribution_tarball into :1 + + + + + + + select apm_package_version__add_file( + :file_id, + :version_id, + :path, + :file_type, + :db_type + ) + + + + + + + + + select apm_package_version__remove_file( + :path, + :version_id + ) + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,68 @@ + + + + + + select file_type_key from apm_package_file_types + + + + + + + select db_type_key from apm_package_db_types + + + + + + + select package_key from apm_package_version_info where version_id = :version_id + + + + + + + + select version_id from apm_package_files + where file_id = :file_id + + + + + + + + + select package_key from apm_package_versions + where version_id = :version_id + + + + + + + + + select f.file_id, f.path + from apm_package_files f + where f.version_id = :version_id + order by path + + + + + + + + + select path from apm_package_files + where version_id = :version_id + $type_sql $db_type_sql order by path + + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,281 @@ + + + + oracle8.1.6 + + + + + declare + instance_id apm_packages.package_id%TYPE; + begin + instance_id := apm_package.new( + instance_name => :package_name, + package_key => :package_key, + context_id => acs.magic_object_id('default_context') + ); + end; + + + + + + + + + begin + :1 := apm_package_version.new( + version_id => :version_id, + package_key => :package_key, + version_name => :version_name, + version_uri => :version_uri, + summary => :summary, + description_format => :description_format, + description => :description, + release_date => :release_date, + vendor => :vendor, + vendor_uri => :vendor_uri, + installed_p => 't', + data_model_loaded_p => 't' + ); + end; + + + + + + + + + begin + apm_package_type.drop_type( + package_key => :package_key, + cascade_p => 't' + ); + end; + + + + + + + + + begin + apm_package_version.delete(version_id => :version_id); + end; + + + + + + + + + update apm_package_versions + set installed_p = decode(version_id, :version_id, 't', 'f') + where package_key = :package_key + + + + + + + + + begin + apm_package_version.enable( + version_id => :version_id + ); + end; + + + + + + + + begin + apm_package_version.disable( + version_id => :version_id + ); + end; + + + + + + + + + begin + apm.register_application ( + package_key => :package_key, + package_uri => :package_uri, + pretty_name => :pretty_name, + pretty_plural => :pretty_plural, + singleton_p => :singleton_p, + spec_file_path => :spec_file_path, + spec_file_mtime => :spec_file_mtime + ); + end; + + + + + + + + + begin + apm.register_service ( + package_key => :package_key, + package_uri => :package_uri, + pretty_name => :pretty_name, + pretty_plural => :pretty_plural, + singleton_p => :singleton_p, + spec_file_path => :spec_file_path, + spec_file_mtime => :spec_file_mtime + ); + end; + + + + + + + + + begin + :1 := apm_package_version.edit( + version_id => :version_id, + version_name => :version_name, + version_uri => :version_uri, + summary => :summary, + description_format => :description_format, + description => :description, + release_date => :release_date, + vendor => :vendor, + vendor_uri => :vendor_uri, + installed_p => 't', + data_model_loaded_p => 't' + ); + end; + + + + + + + + + declare + main_site_id site_nodes.node_id%TYPE; + instance_id apm_packages.package_id%TYPE; + node_id site_nodes.node_id%TYPE; + begin + main_site_id := site_node.node_id('/'); + + instance_id := apm_package.new( + package_key => :package_key, + context_id => main_site_id + ); + + node_id := site_node.new( + parent_id => main_site_id, + name => :package_key, + directory_p => 't', + pattern_p => 't', + object_id => instance_id + ); + end; + + + + + + + + + begin + apm_package_version.upgrade(version_id => :version_id); + end; + + + + + + + + + + begin + :1 := apm_package_version.upgrade_p( + path => :path, + initial_version_name => :initial_version_name, + final_version_name => :final_version_name + ); + end; + + + + + + + + + begin + :1 := apm_package_version.sortable_version_name('$f1_version_from'); + end; + + + + + + + + + begin + :1 := apm_package_version.sortable_version_name('$f1_version_from'); + end; + + + + + + + + select apm_package_version.version_name_greater(service_version, :dependency_version) as version_p + from apm_package_dependencies d, apm_package_types a, apm_package_versions v + where d.dependency_type = 'provides' + and d.version_id = v.version_id + and d.service_uri = :dependency_uri + and v.installed_p = 't' + and a.package_key = v.package_key + + + + + + + + select version_id + from apm_package_versions + where package_key = :package_key + and version_id = apm_package.highest_version(:package_key) + + + + + + + + select apm_package_version.version_name_greater(:version_name, version_name) upgrade_p + from apm_package_versions + where package_key = :package_key + and version_id = apm_package.highest_version (:package_key) + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 17 Apr 2001 22:59:51 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 24 Apr 2001 06:02:26 -0000 1.4 @@ -1,92 +1,267 @@ + -postgresql7.1 + postgresql7.1 - - -select apm_package_version__version_name_greater(service_version, :dependency_version) as version_p - from apm_package_dependencies d, apm_package_types a, apm_package_versions v - where d.dependency_type = 'provides' - and d.version_id = v.version_id - and d.service_uri = :dependency_uri - and v.installed_p = 't' - and a.package_key = v.package_key - + + + + select apm_package__new( + null, + :package_name, + :package_key, + 'apm_package', + now(), + null, + null, + acs__magic_object_id('default_context') + ); + + - - -SELECT apm_package_version__enable(:version_id); - + + + + select apm_package_version__new( + :version_id, + :package_key, + :version_name, + :version_uri, + :summary, + :description_format, + :description, + :release_date, + :vendor, + :vendor_uri, + 't', + 't' + ); + - - -SELECT apm__register_application ( - :package_key, - :pretty_name, - :pretty_plural, - :package_uri, - :singleton_p, - :spec_file_path, - :spec_file_mtime); - + + + + + select apm_package_type__drop_type( + :package_key, + 't' + ); + + - - -SELECT apm__register_service ( - :package_key, - :pretty_name, - :pretty_plural, - :package_uri, - :singleton_p, - :spec_file_path, - :spec_file_mtime); - + + + + + select apm_package_version__delete(:version_id); + + - - -select version_id -from apm_package_versions -where package_key = :package_key -and version_id = apm_package__highest_version(:package_key) - + + + + + update apm_package_versions + set installed_p = (case when version_id = :version_id then 't' else 'f' end) + where package_key = :package_key + + - - -select apm_package_version__new( - :version_id, - :package_key, - :version_name, - :version_uri, - :summary, - :description_format, - :description, - :release_date, - :vendor, - :vendor_uri, - 't', - 't'); - + + + + + select apm_package_version__disable( + :version_id + ); + + - - -select apm_package__new( - NULL, - :package_name, - :package_key, - 'apm_package', - now(), - NULL, - NULL, - acs__magic_object_id('default_context') -) - + + + + + select apm__register_application ( + :package_key, + :package_uri, + :pretty_name, + :pretty_plural, + :singleton_p, + :spec_file_path, + :spec_file_mtime + ); + + + + + + select apm__register_service ( + :package_key, + :pretty_name, + :pretty_plural, + :package_uri, + :singleton_p, + :spec_file_path, + :spec_file_mtime + ); + + + + + + + + + select apm_package_version__edit( + null, + :version_id, + :version_name, + :version_uri, + :summary, + :description_format, + :description, + :release_date, + :vendor, + :vendor_uri, + 't', + 't' + ); + + + + + + + + + declare + main_site_id site_nodes.node_id%TYPE; + instance_id apm_packages.package_id%TYPE; + node_id site_nodes.node_id%TYPE; + begin + main_site_id := site_node__node_id('/',null); + + instance_id := apm_package__new( + null, + null, + :package_key, + 'apm_package', + now(), + null, + null, + main_site_id + ); + + node_id := site_node__new( + null + main_site_id, + :package_key, + instance_id, + 't', + 't', + null, + null + ); + + return null; + end; + + + + + + + + + select apm_package_version__upgrade(:version_id); + + + + + + + + + select apm_package_version__upgrade_p( + :path, + :initial_version_name, + :final_version_name + ); + + + + + + + + + select apm_package_version__sortable_version_name('$f1_version_from'); + + + + + + + + + select apm_package_version__sortable_version_name('$f1_version_from'); + + + + + + + + select apm_package_version__version_name_greater(service_version, :dependency_version) as version_p + from apm_package_dependencies d, apm_package_types a, apm_package_versions v + where d.dependency_type = 'provides' + and d.version_id = v.version_id + and d.service_uri = :dependency_uri + and v.installed_p = 't' + and a.package_key = v.package_key + + + + + + + + select version_id + from apm_package_versions + where package_key = :package_key + and version_id = apm_package__highest_version(:package_key) + + + + + + + + select apm_package_version__version_name_greater(:version_name, version_name) upgrade_p + from apm_package_versions + where package_key = :package_key + and version_id = apm_package__highest_version (:package_key) + + + + + + + + select apm_package_version__enable( + :version_id + ); + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,120 @@ + + + + + + + + update apm_package_versions + set installed_p = 'f', enabled_p = 'f' + where package_key = :package_key + + + + + + + + + select count(*) from apm_package_versions + where package_key = :package_key + + + + + + + + + select parameter_id from apm_parameters + where parameter_name = :parameter_name + and package_key = :package_key + + + + + + + + + select parameter_id, parameter_name + from apm_parameters + where package_key =:package_key + + + + + + + + + select dependency_id from apm_package_dependencies + where version_id = :version_id + + + + + + + + + delete from apm_package_owners where version_id = :version_id + + + + + + + + + insert into apm_package_owners(version_id, owner_uri, owner_name, sort_key) + values(:version_id, :owner_uri, :owner_name, :counter) + + + + + + + + + delete from apm_package_files where version_id = :version_id + + + + + + + + + select package_key, version_id + from apm_package_version_info + where version_id = :version_id + + + + + + + + + select path + from apm_package_files + where version_id = :version_id + and file_type = 'package_spec' + and path = :info_file_name + + + + + + + + + update apm_package_types + set spec_file_path = :path + where package_key = :package_key + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-procs-oracle.xql 24 Apr 2001 06:02:26 -0000 1.1 @@ -0,0 +1,161 @@ + + + + oracle8.1.6 + + + + + begin + :1 := apm_package.highest_version ( + package_key => :package_key + ); + end; + + + + + + + + + begin + :1 := apm_package.num_instances( + package_key => :package_key + ); + end; + + + + + + + + + begin + :1 := apm.register_parameter( + parameter_id => :parameter_id, + parameter_name => :parameter_name, + package_key => :package_key, + description => :description, + datatype => :datatype, + default_value => :default_value, + section_name => :section_name, + min_n_values => :min_n_values, + max_n_values => :max_n_values + ); + end; + + + + + + + + + select v.package_id, p.parameter_name, nvl(p.default_value, v.attr_value) attr_value + from apm_parameters p, apm_parameter_values v + where p.package_key = :package_key + and p.parameter_id = v.parameter_id (+) + + + + + + + + + begin + :1 := apm_package_version.add_dependency( + dependency_id => :dependency_id, + version_id => :version_id, + dependency_uri => :dependency_uri, + dependency_version => :dependency_version + ); + end; + + + + + + + + + begin + apm_package_version.remove_dependency( + dependency_id => :dependency_id + ); + end; + + + + + + + + + begin + :1 := apm_package_version.add_interface( + interface_id => :interface_id, + version_id => :version_id, + interface_uri => :interface_uri, + interface_version => :interface_version + ); + end; + + + + + + + + + begin + apm_package_version.remove_interface( + interface_id => :interface_id + ); + end; + + + + + + + + + select decode(count(*), 0, 0, 1) from apm_package_versions + where package_key = :package_key + and version_name = :version_name + + + + + + + + + select decode(count(*), 0, 0, 1) from apm_package_versions + where package_key = :package_key + and version_name = :version_name + + + + + + + + + begin + :1 := apm_package.new( + package_id => :package_id, + instance_name => :instance_name, + package_key => :package_key, + context_id => :context_id + ); + end; + + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql 17 Apr 2001 22:59:51 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/apm-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.4 @@ -1,58 +1,168 @@ + -postgresql7.1 + postgresql7.1 - - -select apm__register_parameter ( - NULL, - :package_key, - :parameter_name, - :description, - :datatype, - :default_value, - :section_name, - :min_n_values, - :max_n_values); - + + + + select apm_package__highest_version ( + :package_key + ); + + - - -select v.package_id, p.parameter_name, coalesce(p.default_value, v.attr_value) as attr_value -from apm_parameters p LEFT JOIN apm_parameter_values v using (parameter_id) -where p.package_key = :package_key - + + + + + select apm_package__num_instances( + :package_key + ); + + - - -select apm_package_version__add_interface( - :interface_id, - :version_id, - :interface_uri, - :interface_version -) - + + + + + select apm__register_parameter( + :parameter_id, + :package_key, + :parameter_name, + :description, + :datatype, + :default_value, + :section_name, + :min_n_values, + :max_n_values + ); + + - - -select apm_package_version__remove_interface( + + + + + select v.package_id, p.parameter_name, + coalesce(p.default_value, v.attr_value) as attr_value + from apm_parameters p left outer join apm_parameter_values v + using (parameter_id) + where p.package_key = :package_key + + + + + + + + + select apm_package_version__add_dependency( + :dependency_id, + :version_id, + :dependency_uri, + :dependency_version + ); + + + + + + + + + select apm_package_version__remove_dependency( + :dependency_id + ); + + + + + + + + + select apm_package_version__add_interface( + :interface_id, + :version_id, + :interface_uri, + :interface_version + ); + + + + + + + + + select apm_package_version__remove_interface( :interface_id -); - + ); + + - - -select apm_package_version__add_dependency( - :dependency_id, - :version_id, - :dependency_uri, - :dependency_version -) - + + + + + select case when count(*) = 0 then 0 else 1 end + from apm_package_versions + where package_key = :package_key + and version_name = :version_name + + + + + + + select case when count(*) = 0 then 0 else 1 end + from apm_package_versions + where package_key = :package_key + and version_name = :version_name + + + + + + + + + select apm_package__new( + :package_id, + :instance_name, + :package_key, + 'apm_package', + now(), + null, + null, + :context_id + ); + + + + + + + + + begin + delete from apm_parameter_values + where parameter_id = :parameter_id; + delete from apm_parameters + where parameter_id = :parameter_id; + PERFORM acs_object__delete(:parameter_id); + + return null; + end; + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 23 Apr 2001 21:50:49 -0000 1.8 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 24 Apr 2001 06:02:27 -0000 1.9 @@ -658,7 +658,7 @@ return } - db_dml parameter_unregister { + db_exec_plsql parameter_unregister { begin delete from apm_parameter_values where parameter_id = :parameter_id; Index: openacs-4/packages/acs-tcl/tcl/apm-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,202 @@ + + + + + + select package_key from apm_package_version_info where version_id = :version_id + + + + + + + + select file_id, path + from apm_package_files + where version_id = :version_id + and file_type = 'tcl_procs' + order by path + + + + + + + + + select package_key + from apm_package_version_info + where version_id = :version_id + + + + + + + + + select distinct package_key + from apm_package_versions + where enabled_p='t' + + + + + + + + + select distinct package_key + from apm_package_versions + where enabled_p='t' + + + + + + + + + select distinct package_key + from apm_package_versions + where enabled_p='t' + + + + + + + + select pretty_name + from apm_package_file_types + where file_type_key = :type + + + + + + + + + select pretty_db_name + from apm_package_db_types + where db_type_key = :db_type + + + + + + + + + select parameter_name from apm_parameters + where package_key = :package_key + + + + + + + + + select 1 from apm_package_types + where package_key = :package_key + + + + + + + + + select 1 from apm_package_versions + where package_key = :package_key + and installed_p = 't' + + + + + + + + + select 1 from apm_package_versions + where version_id = :version_id + and installed_p = 't' + + + + + + + + + update apm_parameters + set parameter_name = :parameter_name, + default_value = :default_value, + datatype = :datatype, + description = :description, + section_name = :section_name, + min_n_values = :min_n_values, + max_n_values = :max_n_values + where parameter_id = :parameter_id + + + + + + + + + select package_id, parameter_id, parameter_name + from apm_packages p, apm_parameters ap + where p.package_key = ap.package_key + and ap.parameter_id = :parameter_id + + + + + + + + + + select package_key from apm_packages where package_id = :package_id + + + + + + + + + select package_id from apm_packages where package_key = :package_key + + + + + + + + + select pretty_name, version_name, package_key, installed_p, distribution_uri, tagged_p + from apm_package_version_info where version_id = :version_id + + + + + + + + + select parameter_name, attr_value + from apm_parameters p, apm_parameter_values v, apm_packages a + where p.parameter_id = v.parameter_id + and a.package_id = v.package_id + and a.package_id = :package_id + + + + + + Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,70 @@ + + + + + + + select t.package_key, t.package_uri, t.pretty_name, t.pretty_plural, t.package_type, + t.singleton_p, v.* + from apm_package_versions v, apm_package_types t + where v.version_id = :version_id + and v.package_key = t.package_key + + + + + + + + + select unique db_type + from apm_package_files + where db_type is not null + + + + + + + + + select owner_uri, owner_name + from apm_package_owners + where version_id = :version_id + order by sort_key + + + + + + + + + select dependency_type, service_uri, service_version + from apm_package_dependencies + where version_id = :version_id + order by dependency_type, service_uri + + + + + + + + select path, file_type, db_type from apm_package_files where version_id = :version_id order by path + + + + + + + + select parameter_name, description, datatype, section_name, default_value, min_n_values, max_n_values + from apm_parameters + where package_key = :package_key + + + + + + Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,28 @@ + + + + oracle8.1.6 + + + + + begin + :1 := acs.add_user(user_id => :user_id, + email => :email, + url => :url, + first_names => :first_names, + last_name => :last_name, + password => :hashed_password, + salt => :salt, + password_question => :password_question, + password_answer => :password_answer, + creation_ip => :peeraddr, + email_verified_p => :email_verified_p, + member_state => :member_state); + end; + + + + + + Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.4 @@ -1,27 +1,31 @@ + -postgresql7.1 + postgresql7.1 - - -select acs__add_user( - :user_id, - 'user', - now(), - NULL, - :peeraddr, - :email, - :url, - :first_names, - :last_name, - :hashed_password, - :salt, - :password_question, - :password_answer, - NULL, - :email_verified_p, - :member_state) - + + + + select acs__add_user( + :user_id, + 'user', + now(), + null, + :peeraddr, + :email, + :url, + :first_names, + :last_name, + :hashed_password, + :salt, + :password_question, + :password_answer, + null, + :email_verified_p, + :member_state); + + + Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,40 @@ + + + + + + + select user_id from cc_users where upper(screen_name) = upper(:screen_name) + + + + + + + + + select user_id from cc_users where upper(screen_name) = upper(:screen_name) + + + + + + + + + select email from parties where party_id = :party_id + + + + + + + + + select group_id from groups where group_name = :name + + + + + + Index: openacs-4/packages/acs-tcl/tcl/defs-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/defs-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/defs-procs-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,32 @@ + + + + oracle8.1.6 + + + + + insert into query_strings + (query_date, query_string, subsection, n_results, user_id) values + (sysdate, :query_string, :subsection, :n_results, :user_id) + + + + + + + + + begin + apm.set_value( + package_id => :package_id, + parameter_name => :name, + attr_value => :set + ); + end; + + + + + + Index: openacs-4/packages/acs-tcl/tcl/defs-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/defs-procs-postgresql.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/defs-procs-postgresql.xql 17 Apr 2001 22:59:51 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/defs-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.3 @@ -1,14 +1,30 @@ + -postgresql7.1 + postgresql7.1 - - -select apm__set_value( - :package_id, - :name, - :set) - + + + + insert into query_strings + (query_date, query_string, subsection, n_results, user_id) values + (now(), :query_string, :subsection, :n_results, :user_id) + + + + + + + select apm__set_value( + :package_id, + :name, + :set + ); + + + + + Index: openacs-4/packages/acs-tcl/tcl/defs-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/defs-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/defs-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,27 @@ + + + + + + + select first_names, last_name, email + from persons, parties + where person_id = :user_id + and person_id = party_id + + + + + + + + + select v.package_id, p.parameter_name, v.attr_value + from apm_parameters p, apm_parameter_values v + where p.parameter_id = v.parameter_id + + + + + + Index: openacs-4/packages/acs-tcl/tcl/deprecated-utilities-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/deprecated-utilities-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/deprecated-utilities-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,18 @@ + + + + + + update id_numbers set :id_name = :id_name + 1 + + + + + + + select unique :id_name from id_numbers + + + + + Index: openacs-4/packages/acs-tcl/tcl/navigation-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/navigation-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/navigation-procs-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,19 @@ + + + oracle8.1.6 + + + + select site_node.url(node_id) as url, object_id, + acs_object.name(object_id) as object_name, + level + from site_nodes + start with node_id = :node_id + connect by prior parent_id = node_id + order by level desc + + + + + + Index: openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/navigation-procs-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.2 @@ -1,17 +1,22 @@ -postgresql7.1 - - - + postgresql7.1 + + + select site_node__url(node_id) as url, object_id, acs_object__name(object_id) as object_name, - tree_level(tree_sortkey) as level - from site_nodes - where tree_sortkey like (select tree_sortkey from site_nodes where -node_id = :node_id) || '%' - order by level desc - + tree_level(n2.tree_sortkey) as level + from site_nodes n1, site_nodes n2 + where n1.tree_sortkey = (select tree_sortkey + from site_nodes + where node_id = :node_id) + and n2.tree_sortkey <= n1.tree_sortkey + and n1.tree_sortkey like (n2.tree_sortkey || '%') + order by level desc + + + Index: openacs-4/packages/acs-tcl/tcl/object-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/object-procs-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,15 @@ + + + + oracle8.1.6 + + + + + begin :1 := acs_object.name(:object_id); end; + + + + + + Index: openacs-4/packages/acs-tcl/tcl/object-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-procs-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/object-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,15 @@ + + + + postgresql7.1 + + + + + select acs_object__name(:object_id); + + + + + + Index: openacs-4/packages/acs-tcl/tcl/object-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/object-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,24 @@ + + + + + + + select object_id from acs_magic_objects where name = :name + + + + + + + + + select object_type + from acs_objects + where object_id = :object_id + + + + + + Index: openacs-4/packages/acs-tcl/tcl/object-type-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/object-type-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/object-type-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,11 @@ + + + + + + $sql + + + + + Index: openacs-4/packages/acs-tcl/tcl/request-processor-init.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/request-processor-init.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/request-processor-init.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,24 @@ + + + + + + + select package_id from apm_packages + where package_key = 'acs-admin' + + + + + + + + + select package_id from apm_packages + where package_key = 'acs-admin' + + + + + + Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/request-processor-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,24 @@ + + + + + + + select package_id from apm_packages + where package_key = 'acs-kernel' + + + + + + + + + select package_id from apm_packages + where package_key = 'acs-admin' + + + + + + Index: openacs-4/packages/acs-tcl/tcl/security-init-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/security-init-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/security-init-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,13 @@ + + + + oracle8.1.6 + + + + select decode(count(*),0,0,1) from secret_tokens + + + + + Index: openacs-4/packages/acs-tcl/tcl/security-init-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/security-init-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/security-init-postgresql.xql 18 Apr 2001 02:00:59 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/security-init-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.2 @@ -1,11 +1,15 @@ + -postgresql7.1 + postgresql7.1 - - -select case when count(*)=0 then 0 else 1 end from secret_tokens - + + + + select case when count(*) = 0 then 0 else 1 end from secret_tokens + + + Index: openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,55 @@ + + + + oracle8.1.6 + + + + + update users + set second_to_last_visit = last_visit, + last_visit = sysdate, + n_sessions = n_sessions + 1 + where user_id = :user_id + + + + + + + + select test_sql('select 1 from dual where 1=[DoubleApos $value]') from dual + + + + + + + select test_sql('select 1 from dual where 1=[DoubleApos "'$value'"]') from dual + + + + + + + + insert /*+ APPEND */ into secret_tokens(token_id, token, timestamp) + values(sec_security_token_id_seq.nextval, :random_token, sysdate) + + + + + + + + + select * from ( + select token_id, token + from secret_tokens + sample(15) + ) where rownum < :num_tokens + + + + + Index: openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.5 +++ openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.6 @@ -1,33 +1,55 @@ - - - postgresql - 7.1 - + postgresql7.1 - - - insert into secret_tokens(token_id, token, timestamp) - values (sec_security_token_id_seq.nextval, :random_token, now()) - - - - - select token_id, token - from secret_tokens, - (select trunc(random()*(select count(*)-15 from secret_tokens))::integer as first) r - where token_id >= r.first and r.first+15 > token_id; - - - - + + + update users set second_to_last_visit = last_visit, last_visit = now(), n_sessions = n_sessions + 1 where user_id = :user_id - - + + + + + + + + select test_sql('select 1 where 1=[DoubleApos $value]') + + + + + + + select test_sql('select 1 where 1=[DoubleApos "'$value'"]') + + + + + + + + insert into secret_tokens(token_id, token, timestamp) + values(sec_security_token_id_seq.nextval, :random_token, now()) + + + + + + + + + select token_id, token + from secret_tokens, + (select trunc(random()*(select count(*)-15 from secret_tokens))::integer as first) r + where token_id >= r.first and r.first+15 > token_id; + + + + + Index: openacs-4/packages/acs-tcl/tcl/security-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/security-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,72 @@ + + + + + + + delete from sec_session_properties + where :current_time - last_hit > :property_life + + + + + + + + select password, salt from users where user_id = :user_id + + + + + + + update users set password = :new_password, salt = :salt where user_id = :user_id + + + + + + + + select property_value, secure_p + from sec_session_properties + where session_id = :id + and module = :module + and property_name = :name + + + + + + + + + delete from sec_session_properties + where session_id = :session_id + and module = :module + and property_name = :name + + + + + + + + + insert into sec_session_properties + (session_id, module, property_name, property_value, secure_p, last_hit) + values ( :session_id, :module, :name, :value, :secure, :last_hit ) + + + + + + + + select token from secret_tokens + where token_id = :token_id + + + + + Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,51 @@ + + + + oracle8.1.6 + + + + + select site_node.url(n.node_id) as url, n.node_id, n.directory_p, + n.pattern_p, n.object_id, o.object_type, n.package_key, n.package_id + from acs_objects o, (select n.node_id, n.directory_p, n.pattern_p, n.object_id, p.package_key, p.package_id + from site_nodes n, apm_packages p + where n.object_id = p.package_id) n + where n.object_id = o.object_id (+) + + + + + + + + + begin + :1 := site_node.new ( + parent_id => :parent_node_id, + name => :instance_name, + directory_p => 't', + pattern_p => 't' + ); + end; + + + + + + + + select site_node.url(node_id) from site_nodes where object_id=:subsite_pkg_id + + + + + + + + begin site_node.delete(:node_id); end; + + + + + Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 24 Apr 2001 06:02:27 -0000 1.3 @@ -1,16 +1,56 @@ + -postgresql7.1 + postgresql7.1 - - - select site_node__url(n.node_id) as url, n.node_id, n.directory_p, + + + + select site_node.url(n.node_id) as url, n.node_id, n.directory_p, n.pattern_p, n.object_id, o.object_type, n.package_key, n.package_id - from acs_objects o left outer join (select n.node_id, n.directory_p, n.pattern_p, n.object_id, p.package_key, p.package_id - from site_nodes n, apm_packages p - where n.object_id = p.package_id) n - on n.object_id = o.object_id - + from acs_objects o left outer join + (select n.node_id, n.directory_p, n.pattern_p, n.object_id, + p.package_key, p.package_id + from site_nodes n, apm_packages p + where n.object_id = p.package_id) n + using (object_id) + + + + + + + select site_node__new ( + null, + :parent_node_id, + :instance_name, + null, + 't', + 't', + null, + null + ); + + + + + + + + select site_node__url(node_id) from site_nodes where object_id=:subsite_pkg_id + + + + + + + + select site_node__delete(:node_id); + + + + + Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,36 @@ + + + + + + + update site_nodes + set object_id = :package_id + where node_id = :node_id + + + + + + + + + select object_id as context_id + from site_nodes + where node_id = :parent_node_id + + + + + + + + + update site_nodes + set object_id = null + where node_id = :node_id + + + + + Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,27 @@ + + + + + + + + select 1 as one + from $table_name + where $id_column_name = :generated_id + + + + + + + + + select 1 + from dual + where exists (select 1 + from zip_codes + where zip_code like :zip_5) + + + + Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/widgets-procs.xql 24 Apr 2001 06:02:27 -0000 1.1 @@ -0,0 +1,34 @@ + + + + + + + select state_name, usps_abbrev from states order by state_name + + + + + + + + + select country_name, iso from country_codes order by country_name + + + + + + + + + select currency_name, iso + from currency_codes + where supported_p='t' + order by currency_name + + + + + +