Index: openacs-4/packages/acs-admin/acs-admin.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-admin/acs-admin.info 27 Apr 2001 04:06:02 -0000 1.3 +++ openacs-4/packages/acs-admin/acs-admin.info 27 Apr 2001 17:39:15 -0000 1.4 @@ -11,95 +11,151 @@ oracle postgresql - Bryan Quinn + Don Baccus Provides an interface for administering the Arsdigita Community System Installation. - 2001-03-06 - ArsDigita Corporation + 2001-04-27 00:00:00-07 + OpenACS A UI for administering the ACS system. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/Attic/apm-admin-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs-oracle.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs-oracle.xql 27 Apr 2001 17:39:15 -0000 1.2 @@ -6,14 +6,11 @@ - declare - v_version_name varchar(4000); - begin - select version_name into v_version_name - from apm_package_versions where - version_id = apm_package.highest_version(:package_key); - :1 := apm_package_version.version_name_greater(:version_name, v_version_name); - end; + select apm_package_version.version_name_greater(:version_name, highest.version_name) + from (select version_name + from apm_package_versions + where version_id = apm_package.highest_version(:package_key) + ) as highest Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/Attic/apm-admin-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs-postgresql.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs-postgresql.xql 27 Apr 2001 17:39:15 -0000 1.2 @@ -5,15 +5,12 @@ - FIX ME PLSQL - declare - v_version_name varchar(4000); - begin - select version_name into v_version_name - from apm_package_versions where - version_id = apm_package.highest_version(:package_key); - :1 := apm_package_version.version_name_greater(:version_name, v_version_name); - end; + + select apm_package_version__version_name_greater(:version_name, highest.version_name) + from (select version_name + from apm_package_versions + where version_id = apm_package__highest_version(:package_key) + ) as highest Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 27 Apr 2001 17:39:15 -0000 1.2 @@ -187,15 +187,8 @@ @param version_name The name of the currently installed version. } { - return [db_exec_plsql apm_higher_version_installed_p { - declare - v_version_name varchar(4000); - begin - select version_name into v_version_name - from apm_package_versions where - version_id = apm_package.highest_version(:package_key); - :1 := apm_package_version.version_name_greater(:version_name, v_version_name); - end; - }] + # DRB: I turned this into a simple select by rearranging the code and + # stuck the result into queryfiles. + return [db_string apm_higher_version_installed_p {}] } Index: openacs-4/packages/acs-admin/www/apm/version-edit-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit-2.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/version-edit-2.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-edit-2.xql 27 Apr 2001 17:39:15 -0000 1.2 @@ -13,7 +13,7 @@ - select version_name old_version_name, version_uri old_version_uri + select version_name as old_version_name, version_uri as old_version_uri from apm_package_versions where version_id = $version_id Index: openacs-4/packages/acs-admin/www/apm/version-parameters-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-parameters-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-admin/www/apm/version-parameters-oracle.xql 27 Apr 2001 17:39:15 -0000 1.1 @@ -0,0 +1,15 @@ + + + + oracle8.1.6 + + + + select parameter_name, nvl(description, 'No Description') description, datatype, + default_value, parameter_id, nvl(section_name, 'No Section') section_name + from apm_parameters + where package_key = :package_key + $sql_clauses + + + Index: openacs-4/packages/acs-admin/www/apm/version-parameters-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-parameters-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-admin/www/apm/version-parameters-postgresql.xql 27 Apr 2001 17:39:15 -0000 1.1 @@ -0,0 +1,17 @@ + + + + postgresql7.1 + + + + select parameter_name, coalesce(description, 'No Description') as description, datatype, + default_value, parameter_id, coalesce(section_name, 'No Section') as section_name + from apm_parameters + where package_key = :package_key + $sql_clauses + + + + + Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl 27 Apr 2001 17:39:15 -0000 1.2 @@ -25,16 +25,12 @@ [list datatype "Type"] \ [list description "Description" {} {[ad_quotehtml $description]}]] -set sql " - select parameter_name, nvl(description, 'No Description') description, datatype, - default_value, parameter_id, nvl(section_name, 'No Section') section_name - from apm_parameters - where package_key = :package_key -" +#DRB: sql_clauses must not contain RDBMS-specific query clauses. +set sql_clauses "" if { [exists_and_not_null dimensional_list] } { lappend table_def [list section_name "Section:"] - append sql [ad_dimensional_sql $dimensional_list] + append sql_clauses [ad_dimensional_sql $dimensional_list] } lappend table_def [list parameter_id "Actions" no_sort \ @@ -43,7 +39,7 @@ edit\] }] -append sql [ad_order_by_from_sort_spec $orderby $table_def] +append sql_clauses [ad_order_by_from_sort_spec $orderby $table_def] doc_body_append "[apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Parameters"]
@@ -57,7 +53,7 @@ -bind [ad_tcl_vars_to_ns_set version_id package_key] \ -Textra_vars {version_id} \ -Tmissing_text "No parameters registered in this section." \ - parameter_table $sql $table_def] + parameter_table "" $table_def]
Add a new parameter
Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 19 Apr 2001 01:17:17 -0000 1.11 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 27 Apr 2001 17:39:15 -0000 1.12 @@ -2408,7 +2408,7 @@ -- function edit -create function apm_package_version__edit (integer,integer,varchar,varchar,varchar,varchar,varchar,timestamp,varchar,varchar,char,char) +create function apm_package_version__edit (integer,integer,varchar,varchar,varchar,varchar,varchar,timestamp,varchar,varchar,boolean,boolean) returns integer as ' declare edit__new_version_id alias for $1; -- default null 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 -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs-oracle.xql 24 Apr 2001 23:59:24 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs-oracle.xql 27 Apr 2001 17:39:16 -0000 1.3 @@ -5,7 +5,6 @@ - update apm_package_versions set distribution_tarball = empty_blob(), distribution_uri = null, 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 -r1.6 -r1.7 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs-postgresql.xql 24 Apr 2001 23:59:24 -0000 1.6 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs-postgresql.xql 27 Apr 2001 17:39:16 -0000 1.7 @@ -6,7 +6,8 @@ - FIX ME LOB + FIX ME LOB (DRB - *all* large objects should be handled by the content + repository so I'm leaving this wart for now. update apm_package_versions set distribution_tarball = empty_blob(), distribution_uri = null, 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 -r1.5 -r1.6 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 27 Apr 2001 03:04:08 -0000 1.5 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 27 Apr 2001 17:39:16 -0000 1.6 @@ -66,7 +66,7 @@ update apm_package_versions - set installed_p = (case when version_id = :version_id then 't' else 'f' end)::boolean + set installed_p = (version_id = :version_id) where package_key = :package_key @@ -89,9 +89,9 @@ select apm__register_application ( :package_key, - :package_uri, :pretty_name, :pretty_plural, + :package_uri, :singleton_p, :spec_file_path, :spec_file_mtime