Index: openacs-4/packages/cronjob/cronjob.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/cronjob.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/cronjob/cronjob.info 30 Nov 2002 17:29:31 -0000 1.4 +++ openacs-4/packages/cronjob/cronjob.info 17 May 2003 10:26:50 -0000 1.5 @@ -12,7 +12,7 @@ oracle postgresql - Tom Jackson + Tom Jackson Runs sql and tcl code on schedule similar to unix cron. Runs sql and tcl code on schedule similar to unix cron. Index: openacs-4/packages/cronjob/tcl/cronjob-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/tcl/cronjob-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/cronjob/tcl/cronjob-procs.tcl 30 Nov 2002 17:29:40 -0000 1.5 +++ openacs-4/packages/cronjob/tcl/cronjob-procs.tcl 17 May 2003 10:27:06 -0000 1.6 @@ -35,7 +35,7 @@ } { set table "No SQL" ns_log Notice "Cronjob_id is $cronjob_id" - db_1row crontab_query $sql + db_1row cronjob_query {} db_release_unused_handles if {![string match "" $run_sql]} { set table "" Index: openacs-4/packages/cronjob/tcl/cronjob-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/tcl/cronjob-procs.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cronjob/tcl/cronjob-procs.xql 30 Nov 2002 17:29:40 -0000 1.2 +++ openacs-4/packages/cronjob/tcl/cronjob-procs.xql 17 May 2003 10:27:06 -0000 1.3 @@ -16,7 +16,7 @@ - + select description, run_sql, run_tcl, email from cronjobs Index: openacs-4/packages/cronjob/www/admin/cronjob.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cronjob/www/admin/cronjob.adp 4 Sep 2002 09:17:10 -0000 1.2 +++ openacs-4/packages/cronjob/www/admin/cronjob.adp 17 May 2003 10:27:27 -0000 1.3 @@ -83,4 +83,4 @@ -Run This CronJob Now \ No newline at end of file +Run This CronJob Now Index: openacs-4/packages/cronjob/www/admin/cronjob.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/cronjob/www/admin/cronjob.tcl 30 Nov 2002 17:30:07 -0000 1.4 +++ openacs-4/packages/cronjob/www/admin/cronjob.tcl 17 May 2003 10:27:27 -0000 1.5 @@ -32,6 +32,8 @@ db_1row cronjob_query "" +set dayofweek [string trim $dayofweek] + foreach {value name} [list "\*" "Every Month" 01 January 02 February 03 March 04 April 05 May 06 June 07 July 08 August 09 September 10 October 11 November 12 December] { if {[string match $mon $value]} { append month_option " Index: openacs-4/packages/directory/directory.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/directory.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/directory/directory.info 21 Oct 2001 21:44:46 -0000 1.3 +++ openacs-4/packages/directory/directory.info 17 May 2003 10:28:04 -0000 1.4 @@ -19,7 +19,7 @@ ArsDigita Corporation This package lets you browse or search for users of an ACS site. It is subsite-aware, and allows you to view the members of the current subsite, or all users of the site. See doc/ for more information. - + Index: openacs-4/packages/download/download.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/download.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/download/download.info 16 Jan 2003 13:45:55 -0000 1.7 +++ openacs-4/packages/download/download.info 17 May 2003 10:28:31 -0000 1.8 @@ -20,7 +20,7 @@ Create an instance of the download module. Each instance has a repository_id which allows the download module to differentiate between different instances of the package. - + Index: openacs-4/packages/download/sql/postgresql/download-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/sql/postgresql/download-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/download/sql/postgresql/download-create.sql 23 Feb 2002 05:15:27 -0000 1.5 +++ openacs-4/packages/download/sql/postgresql/download-create.sql 17 May 2003 10:28:58 -0000 1.6 @@ -209,7 +209,7 @@ constraint download_ar_id_pk primary key, approved_p boolean, - approved_date timestamp, + approved_date timestamptz, approved_user integer constraint download_ar_usr_fk references users, @@ -236,7 +236,7 @@ clob_answer text, number_answer numeric, varchar_answer text, - date_answer timestamp + date_answer timestamptz ); @@ -262,7 +262,7 @@ constraint download_downloads_rev_fk references download_archive_revisions on delete cascade, - download_date timestamp not null, + download_date timestamptz not null, download_hostname varchar(400), download_ip varchar(20), user_agent varchar(200), Index: openacs-4/packages/download/sql/postgresql/download-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/sql/postgresql/download-drop.sql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/download/sql/postgresql/download-drop.sql 23 Feb 2002 05:15:35 -0000 1.7 +++ openacs-4/packages/download/sql/postgresql/download-drop.sql 17 May 2003 10:28:58 -0000 1.8 @@ -30,8 +30,8 @@ drop view download_downloads_sequence; -- Functions -- -drop function download_rep__new (integer,varchar,varchar,varchar,timestamp,integer,integer,integer,varchar); -drop function download_rep__edit (integer,varchar,varchar,varchar,timestamp,integer,varchar); +drop function download_rep__new (integer,varchar,varchar,varchar,timestamptz,integer,integer,integer,varchar); +drop function download_rep__edit (integer,varchar,varchar,varchar,timestamptz,integer,varchar); drop function download_rep__delete (integer); -- Tables -- Index: openacs-4/packages/download/sql/postgresql/download-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/sql/postgresql/download-packages.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/download/sql/postgresql/download-packages.sql 21 Dec 2002 22:29:21 -0000 1.5 +++ openacs-4/packages/download/sql/postgresql/download-packages.sql 17 May 2003 10:28:58 -0000 1.6 @@ -36,7 +36,7 @@ -- -set_metadata_value -- -downloaded_by -create function download_rep__new (integer,varchar,varchar,varchar,timestamp with time zone,integer,integer,integer,varchar) +create function download_rep__new (integer,varchar,varchar,varchar,timestamptz,integer,integer,integer,varchar) returns integer as ' declare new__repository_id alias for $1; @@ -87,7 +87,7 @@ end;' language 'plpgsql'; -create function download_rep__edit (integer,varchar,varchar,varchar,timestamp with time zone,integer,varchar) +create function download_rep__edit (integer,varchar,varchar,varchar,timestamptz,integer,varchar) returns integer as ' declare edit__repository_id alias for $1; Index: openacs-4/packages/download/tcl/download-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/download/tcl/download-procs.tcl 20 Sep 2002 22:40:41 -0000 1.9 +++ openacs-4/packages/download/tcl/download-procs.tcl 17 May 2003 10:29:27 -0000 1.10 @@ -177,36 +177,6 @@ return filter_return } -##Borrowed from file-storage -ad_proc download_maybe_create_new_mime_type { - file_name -} { - The content repository expects the MIME type to already be defined - when you upload content. We use this procedure to add a new type - when we encounter something we haven't seen before. -} { - - set mime_type [ns_guesstype $file_name] - set extension [string trimleft [file extension $file_name] "."] - - # don't know how to generate nice names like "JPEG Image" - # have to leave it blank for now - - #set pretty_mime_type ??? - - if { [db_string mime_type_exists " - select count(*) from cr_mime_types - where mime_type = :mime_type"] == 0 } { - db_dml new_mime_type " - insert into cr_mime_types - (mime_type, file_extension) - values - (:mime_type, :extension)" - } - - return $mime_type -} - # @author jbank@arsdigita.com [jbank@arsdigita.com] # @creation-date Fri Dec 15 14:07:02 2000 ad_proc download_metadata_column { data_type } { Dummy comment.} { @@ -335,7 +305,8 @@ # get the file_size for the postgres version set file_size [file size $tmpfile] - set mime_type [download_maybe_create_new_mime_type $upload_file] + set mime_type [cr_filename_to_mime_type -create $upload_file] + db_exec_plsql revision_new { declare v_revision_id integer; Index: openacs-4/packages/download/tcl/download-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/tcl/download-procs.xql 31 Oct 2001 20:42:07 -0000 1.3 +++ openacs-4/packages/download/tcl/download-procs.xql 17 May 2003 10:29:27 -0000 1.4 @@ -45,30 +45,6 @@ - - - -select count(*) from cr_mime_types -where mime_type = :mime_type - - - - - - - - - -insert into cr_mime_types -(mime_type, file_extension) -values -(:mime_type, :extension) - - - - - - Index: openacs-4/packages/ecommerce/ecommerce.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v diff -u -r1.31 -r1.32 --- openacs-4/packages/ecommerce/ecommerce.info 30 Nov 2002 17:30:42 -0000 1.31 +++ openacs-4/packages/ecommerce/ecommerce.info 17 May 2003 10:29:50 -0000 1.32 @@ -5,27 +5,26 @@ E-Commerce E-Commerce-ii f + t - - - oracle - postgresql - - Bart Teeuwisse + Janine Sisk + Bart Teeuwisse ACS 3.x based e-commerce solution.See the documentation for more information. - 2002-09-18 + 2003-03-23 furfly.net, LLC This module implements all that IT needs for a standard business-to-consumer Web service. You can find a feature summary in the documentaion. + + @@ -673,12 +672,12 @@ - - - - - - + + + + + + @@ -971,54 +970,56 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: openacs-4/packages/ecommerce/sql/postgresql/ec-product-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/ec-product-package-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/sql/postgresql/ec-product-package-create.sql 18 Jul 2001 05:39:56 -0000 1.2 +++ openacs-4/packages/ecommerce/sql/postgresql/ec-product-package-create.sql 17 May 2003 10:30:06 -0000 1.3 @@ -16,7 +16,7 @@ -- gilbertw - PostgreSQL only supports 16 parameters -- created a plpgsql block to do the update and insert -- start a transaction for the new product creation -create function ec_product__new (integer,integer,integer,varchar,numeric,varchar,varchar,varchar,varchar,boolean,char,varchar,timestamp,varchar,varchar,varchar) +create function ec_product__new (integer,integer,integer,varchar,numeric,varchar,varchar,varchar,varchar,boolean,char,varchar,timestamptz,varchar,varchar,varchar) returns integer as ' declare new__product_id alias for $1; -- default null Index: openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql,v diff -u -r1.17 -r1.18 --- openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql 10 Dec 2002 20:06:42 -0000 1.17 +++ openacs-4/packages/ecommerce/sql/postgresql/ecommerce-create.sql 17 May 2003 10:30:06 -0000 1.18 @@ -69,7 +69,7 @@ template_id integer not null primary key, template_name varchar(200), template varchar(4000), - last_modified timestamp(0) not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -78,7 +78,7 @@ template_id integer, template_name varchar(200), template varchar(4000), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -118,7 +118,7 @@ -- pretty, human-readable category_name varchar(100), sort_key numeric, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -129,7 +129,7 @@ category_id integer, category_name varchar(100), sort_key numeric, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -164,7 +164,7 @@ -- pretty, human-readable subcategory_name varchar(100), sort_key numeric, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -177,7 +177,7 @@ category_id integer, subcategory_name varchar(100), sort_key numeric, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -221,7 +221,7 @@ -- pretty, human-readable subsubcategory_name varchar(100), sort_key numeric, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -235,7 +235,7 @@ subcategory_id integer, subsubcategory_name varchar(100), sort_key numeric, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -339,7 +339,7 @@ -- integer not null primary key, sku varchar(100), product_name varchar(200), - creation_date timestamp(0)default now() not null, + creation_date timestamptz default current_timestamp not null, one_line_description varchar(400), detailed_description varchar(4000), search_keywords varchar(4000), @@ -370,9 +370,9 @@ active_p boolean default 't', -- the date the product becomes available for sale (it can be listed -- before then, it's just not buyable) - available_date timestamp(0)default now() not null, + available_date timestamptz default current_timestamp not null, announcements varchar(4000), - announcements_expire timestamp(0), + announcements_expire timestamptz, -- if there's a web site with more info about the product url varchar(300), template_id integer references ec_templates, @@ -389,7 +389,7 @@ -- email this list on purchase email_on_purchase_list varchar(4000), -- the user ID and IP address of the creator of the product - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -407,7 +407,7 @@ create table ec_products_audit ( product_id integer, product_name varchar(200), - creation_date timestamp(0), + creation_date timestamptz, one_line_description varchar(400), detailed_description varchar(4000), search_keywords varchar(4000), @@ -418,13 +418,13 @@ dirname varchar(200), present_p boolean default 't', active_p boolean default 't', - available_date timestamp(0), + available_date timestamptz, announcements varchar(4000), - announcements_expire timestamp(0), + announcements_expire timestamptz, url varchar(300), template_id integer, stock_status char(1) check (stock_status in ('o','q','m','s','i')), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -491,13 +491,13 @@ sale_price_id integer not null primary key, product_id integer not null references ec_products, sale_price numeric, - sale_begins timestamp(0)not null, - sale_ends timestamp(0)not null, + sale_begins timestamptz not null, + sale_ends timestamptz not null, -- like Introductory Price or Sale Price or Special Offer sale_name varchar(30), -- if non-null, the user has to know this code to get the sale price offer_code varchar(20), - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -515,11 +515,11 @@ sale_price_id integer, product_id integer, sale_price numeric, - sale_begins timestamp(0), - sale_ends timestamp(0), + sale_begins timestamptz, + sale_ends timestamptz, sale_name varchar(30), offer_code varchar(20), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -556,7 +556,7 @@ -- components of the above series component_id integer not null references ec_products, primary key (series_id, component_id), - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -566,7 +566,7 @@ create table ec_product_series_map_audit ( series_id integer, component_id integer, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -652,15 +652,15 @@ user_class_id integer not null primary key, -- human-readable user_class_name varchar(200), -- e.g., student - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); create table ec_user_classes_audit ( user_class_id integer, user_class_name varchar(200), -- e.g., student - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -690,7 +690,7 @@ product_id integer not null references ec_products, user_class_id integer not null references ec_user_classes, price numeric, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null, primary key (product_id, user_class_id) @@ -704,7 +704,7 @@ product_id integer, user_class_id integer, price numeric, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -747,7 +747,7 @@ category_id integer references ec_categories, subcategory_id integer references ec_subcategories, subsubcategory_id integer references ec_subsubcategories, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -767,7 +767,7 @@ category_id integer, subcategory_id integer, subsubcategory_id integer, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -834,7 +834,7 @@ user_class_id integer not null references ec_user_classes, primary key (user_id, user_class_id), user_class_approved_p boolean, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -846,7 +846,7 @@ user_id integer, user_class_id integer, user_class_approved_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -877,7 +877,7 @@ create table ec_product_links ( product_a integer not null references ec_products, product_b integer not null references ec_products, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null, primary key (product_a, product_b) @@ -888,7 +888,7 @@ create table ec_product_links_audit ( product_a integer, product_b integer, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -926,8 +926,8 @@ rating numeric, -- in some systems, the administrator will have to approve comments first approved_p boolean, - comment_date timestamp(0), - last_modified timestamp(0)not null, + comment_date timestamptz, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -944,7 +944,7 @@ one_line_summary varchar(300), rating numeric, approved_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -981,11 +981,11 @@ product_id integer not null references ec_products, author_name varchar(100), publication varchar(100), - review_date timestamp(0), + review_date timestamptz, -- in HTML format review text, display_p boolean, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -998,11 +998,11 @@ product_id integer, author_name varchar(100), publication varchar(100), - review_date timestamp(0), + review_date timestamptz, -- in HTML format review text, display_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1039,7 +1039,7 @@ product_id integer not null references ec_products, category_id integer not null references ec_categories, publisher_favorite_p boolean, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null, primary key (product_id, category_id) @@ -1052,7 +1052,7 @@ product_id integer, category_id integer, publisher_favorite_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1086,7 +1086,7 @@ product_id integer not null references ec_products, subcategory_id integer not null references ec_subcategories, publisher_favorite_p boolean, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null, primary key (product_id, subcategory_id) @@ -1100,7 +1100,7 @@ product_id integer, subcategory_id integer, publisher_favorite_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1133,7 +1133,7 @@ product_id integer not null references ec_products, subsubcategory_id integer not null references ec_subsubcategories, publisher_favorite_p boolean, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null, primary key (product_id, subsubcategory_id) @@ -1146,7 +1146,7 @@ product_id integer, subsubcategory_id integer, publisher_favorite_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1200,9 +1200,9 @@ default_value varchar(100), -- column type for oracle (i.e. text, varchar(50), integer, ...) column_type varchar(100), - creation_date timestamp(0), + creation_date timestamptz, active_p boolean default 't', - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -1212,9 +1212,9 @@ field_name varchar(100), default_value varchar(100), column_type varchar(100), - creation_date timestamp(0), + creation_date timestamptz, active_p boolean default 't', - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1250,14 +1250,14 @@ -- this table stores the values create table ec_custom_product_field_values ( product_id integer not null primary key references ec_products, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); create table ec_custom_p_field_values_audit ( product_id integer, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1291,7 +1291,7 @@ -- often will not be known user_id integer references users, ip_address varchar(20) not null, - start_time timestamp(0), + start_time timestamptz, http_user_agent varchar(4000) ); @@ -1343,11 +1343,11 @@ -- information recorded upon FSM state changes -- we need this to figure out if order is stale -- and should be offered up for removal - in_basket_date timestamp(0), - confirmed_date timestamp(0), - authorized_date timestamp(0), - voided_date timestamp(0), - expired_date timestamp(0), + in_basket_date timestamptz, + confirmed_date timestamptz, + authorized_date timestamptz, + voided_date timestamptz, + expired_date timestamptz, -- base shipping, which is added to the amount charged for each item shipping_charged numeric, shipping_refunded numeric, @@ -1399,18 +1399,18 @@ -- shipments. -- a trigger fills address_id in automatically if it's null address_id integer references ec_addresses, - shipment_date timestamp(0)not null, - expected_arrival_date timestamp(0), + shipment_date timestamptz not null, + expected_arrival_date timestamptz, carrier varchar(50), -- e.g., 'fedex' tracking_number varchar(24), -- only if we get confirmation from carrier that the goods -- arrived on a specific date - actual_arrival_date timestamp(0), + actual_arrival_date timestamptz, -- arbitrary info from carrier, e.g., 'Joe Smith signed for it' actual_arrival_detail varchar(4000), -- for things that aren't really shipped like services shippable_p boolean default 't', - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20) ); @@ -1441,13 +1441,13 @@ shipment_id integer, order_id integer, address_id integer, - shipment_date timestamp(0), - expected_arrival_date timestamp(0), + shipment_date timestamptz, + expected_arrival_date timestamptz, carrier varchar(50), tracking_number varchar(24), - actual_arrival_date timestamp(0), + actual_arrival_date timestamptz, actual_arrival_detail varchar(4000), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1488,7 +1488,7 @@ order_id integer not null references ec_orders, -- not really necessary because it's in ec_financial_transactions refund_amount numeric not null, - refund_date timestamp(0)not null, + refund_date timestamptz not null, refunded_by integer not null references users, refund_reasons varchar(4000) ); @@ -1508,13 +1508,13 @@ style_choice varchar(4000), shipment_id integer references ec_shipments, -- this is the date that user put this item into their shopping basket - in_cart_date timestamp(0), - voided_date timestamp(0), + in_cart_date timestamptz, + voided_date timestamptz, voided_by integer references users, - expired_date timestamp(0), + expired_date timestamptz, item_state varchar(50) default 'in_basket', -- NULL if not received back - received_back_date timestamp(0), + received_back_date timestamptz, -- columns for reporting (e.g., what was done, what was made) price_charged numeric, price_refunded numeric, @@ -1693,7 +1693,7 @@ -- the preloaded template) default_template integer default 1 not null references ec_templates, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -1707,7 +1707,7 @@ add_exp_amount_per_item numeric, add_exp_amount_by_weight numeric, default_template integer, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1749,7 +1749,7 @@ tax_rate numeric not null, -- charge tax on shipping? shipping_p boolean not null, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -1758,7 +1758,7 @@ usps_abbrev char(2), tax_rate numeric, shipping_p boolean, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1823,7 +1823,7 @@ price_guarantee_policy varchar(4000), delivery_policy varchar(4000), installation_policy varchar(4000), - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -1851,7 +1851,7 @@ price_guarantee_policy varchar(4000), delivery_policy varchar(4000), installation_policy varchar(4000), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -1929,7 +1929,7 @@ price_guarantee_policy varchar(4000), delivery_policy varchar(4000), installation_policy varchar(4000), - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -1956,7 +1956,7 @@ price_guarantee_policy varchar(4000), delivery_policy varchar(4000), installation_policy varchar(4000), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -2022,10 +2022,10 @@ stock_status char(1) check (stock_status in ('o','q','m','s','i')), special_offer_p boolean, special_offer_html varchar(500), - offer_begins timestamp(0)not null, - offer_ends timestamp(0)not null, + offer_begins timestamptz not null, + offer_ends timestamptz not null, deleted_p boolean default 'f', - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -2050,10 +2050,10 @@ stock_status char(1) check (stock_status in ('o','q','m','s','i')), special_offer_p boolean, special_offer_html varchar(500), - offer_begins timestamp(0), - offer_ends timestamp(0), + offer_begins timestamptz, + offer_ends timestamptz, deleted_p boolean default 'f', - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), -- This differs from the deleted_p column! @@ -2110,14 +2110,14 @@ -- entire amount is used up (to speed up -- queries) amount_remaining_p boolean default 't', - issue_date timestamp(0), - authorized_date timestamp(0), - claimed_date timestamp(0), + issue_date timestamptz, + authorized_date timestamptz, + claimed_date timestamptz, -- customer service rep who issued it issued_by integer references users, -- customer who purchased it purchased_by integer references users, - expires timestamp(0), + expires timestamptz, user_id integer references users, -- if it's unclaimed, claim_check will be filled in, -- and user_id won't be filled in @@ -2128,10 +2128,10 @@ certificate_to varchar(100), certificate_from varchar(100), recipient_email varchar(100), - voided_date timestamp(0), + voided_date timestamptz, voided_by integer references users, reason_for_void varchar(4000), - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null, check (user_id is not null or claim_check is not null) @@ -2173,21 +2173,21 @@ gift_certificate_id integer, gift_certificate_state varchar(50), amount numeric, - issue_date timestamp(0), - authorized_date timestamp(0), + issue_date timestamptz, + authorized_date timestamptz, issued_by integer, purchased_by integer, - expires timestamp(0), + expires timestamptz, user_id integer, claim_check varchar(50), certificate_message varchar(200), certificate_to varchar(100), certificate_from varchar(100), recipient_email varchar(100), - voided_date timestamp(0), + voided_date timestamptz, voided_by integer, reason_for_void varchar(4000), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -2226,7 +2226,7 @@ gift_certificate_id integer not null references ec_gift_certificates, order_id integer references ec_orders, amount_used numeric, - used_date timestamp(0), + used_date timestamptz, amount_reinstated numeric, reinstated_date timestamp ); @@ -2251,7 +2251,7 @@ -- will have to get other info in order to identify the user create table ec_user_identification ( user_identification_id integer not null primary key, - date_added timestamp(0), + date_added timestamptz, user_id integer references users, email varchar(100), first_names varchar(100), @@ -2290,7 +2290,7 @@ customer_service_rep integer references users, user_identification_id integer not null references ec_user_identification, - interaction_date timestamp(0), + interaction_date timestamptz, interaction_originator varchar(20) not null, -- e.g. customer, customer-service-rep, automatic interaction_type varchar(30) not null, -- e.g. email, phone_call -- will be filled in if the customer-originated interaction is @@ -2328,8 +2328,8 @@ order_id integer references ec_orders, -- may be null if this issue isn't associated with a gift certificate gift_certificate_id integer references ec_gift_certificates, - open_date timestamp(0)not null, - close_date timestamp(0), + open_date timestamptz not null, + close_date timestamptz, -- customer service reps who closed the issue closed_by integer references users, -- we never really delete issues @@ -2394,7 +2394,7 @@ -- which picklist this item is in picklist_name varchar(100), sort_key numeric, - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -2404,7 +2404,7 @@ picklist_item varchar(100), picklist_name varchar(100), sort_key numeric, - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -2465,7 +2465,7 @@ -- ec_cs_issue_type_map for the issue that will be created -- when the message is sent issue_type_list varchar(100), - last_modified timestamp(0)not null, + last_modified timestamptz not null, last_modifying_user integer not null references users, modified_ip_address varchar(20) not null ); @@ -2478,7 +2478,7 @@ variables varchar(1000), when_sent varchar(1000), issue_type_list varchar(100), - last_modified timestamp(0), + last_modified timestamptz, last_modifying_user integer, modified_ip_address varchar(20), delete_p boolean default 'f' @@ -2550,15 +2550,15 @@ create table ec_spam_log ( spam_id integer not null primary key, - spam_date timestamp(0), + spam_date timestamptz, spam_text varchar(4000), -- the following are all criteria used in choosing the users to be spammed mailing_list_category_id integer references ec_categories, mailing_list_subcategory_id integer references ec_subcategories, mailing_list_subsubcategory_id integer references ec_subsubcategories, user_class_id integer references ec_user_classes, product_id integer references ec_products, - last_visit_start_date timestamp(0), + last_visit_start_date timestamptz, last_visit_end_date timestamp ); @@ -2606,12 +2606,12 @@ -- the f is mainly just for reassurance; we only capture ones with t) -- There's no need to set this for refunds. Refunds are always to be captured. to_be_captured_p boolean, - inserted_date timestamp(0)not null, - authorized_date timestamp(0), + inserted_date timestamptz not null, + authorized_date timestamptz, -- set when to_be_captured_p becomes 't'; used in cron jobs - to_be_captured_date timestamp(0), - marked_date timestamp(0), - refunded_date timestamp(0), + to_be_captured_date timestamptz, + marked_date timestamptz, + refunded_date timestamptz, -- if the transaction failed, this will keep the cron jobs from continuing -- to retry it failed_p boolean default 'f', @@ -2663,13 +2663,13 @@ create table ec_problems_log ( problem_id integer not null primary key, - problem_date timestamp(0), + problem_date timestamptz, problem_details varchar(4000), -- if it's related to an order order_id integer references ec_orders, -- if it's related to a gift certificate gift_certificate_id integer references ec_gift_certificates, - resolved_date timestamp(0), + resolved_date timestamptz, resolved_by integer references users ); Index: openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities-drop.sql 9 Jul 2001 23:44:19 -0000 1.1 +++ openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities-drop.sql 17 May 2003 10:30:06 -0000 1.2 @@ -1,4 +1,4 @@ -- defined in the acs-core -- drop function logical_negation(boolean); -drop function one_if_within_n_days (timestamp, integer); +drop function one_if_within_n_days (timestamptz, integer); drop function pseudo_contains (varchar, varchar); Index: openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities.sql 26 May 2002 04:36:49 -0000 1.3 +++ openacs-4/packages/ecommerce/sql/postgresql/pl-sql-utilities.sql 17 May 2003 10:30:06 -0000 1.4 @@ -10,7 +10,7 @@ -- know whether something happened within last N days (assumes query_date -- is in the past) -create function one_if_within_n_days (timestamp, integer) +create function one_if_within_n_days (timestamptz, integer) returns integer as ' declare query_date alias for $1; Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 10 Dec 2002 20:05:50 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 17 May 2003 10:30:21 -0000 1.8 @@ -231,10 +231,22 @@ where transaction_id = :pgw_transaction_id" } - # Flag that no new transactions need to be - # created for this shipment. + # The shipment is a partial shipment but the shipment + # cost equals the order cost. This could be due to + # voiding of items. A new transaction is required if + # there are no more items awaiting shipment and this + # shipment thus completes the order. - set create_new_transaction false + if {[string equal 0 [db_string count_remaining_items " + select count(*) + from ec_items + where order_id = :order_id + and item_state = 'to_be_shipped' + and item_id not in ([join $item_id_list ", "])" -default 0]]} { + set create_new_transaction true + } else { + set create_new_transaction false + } } } else { Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql 30 Nov 2002 17:31:38 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.xql 17 May 2003 10:30:21 -0000 1.6 @@ -78,6 +78,17 @@ + + + + select count(*) + from ec_items + where order_id = :order_id + and item_state = 'to_be_shipped' + and item_id not in ([join $item_id_list ", "]) + + + update ec_financial_transactions Index: openacs-4/packages/edit-this-page/edit-this-page.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/edit-this-page/edit-this-page.info 15 Apr 2003 12:01:47 -0000 1.6 +++ openacs-4/packages/edit-this-page/edit-this-page.info 17 May 2003 10:30:36 -0000 1.7 @@ -7,7 +7,7 @@ f f - + postgresql @@ -17,7 +17,9 @@ An easy-to-use content management system. Easy to use publishing system + + Index: openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql 4 Apr 2003 15:57:04 -0000 1.6 +++ openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql 17 May 2003 10:30:52 -0000 1.7 @@ -424,42 +424,7 @@ / show errors --- add the ETP parameters to the acs-subsite package so that --- we can serve the site's home page and top level pages. --- DRB: this was trying to set the parameter values to their default value but they --- already (quite logically) are set by apm.register_parameter ... - -declare - v_parameter_id apm_parameters.parameter_id%TYPE; - -begin - v_parameter_id := apm.register_parameter( - package_key => 'acs-subsite', - parameter_name => 'application', - description => 'Name of the ETP application to use (default, faq, wiki, or create your own with the etp::define_applicaton procedure)', - datatype => 'string', - default_value => 'default', - section_name => 'EditThisPage', - min_n_values => 1, - max_n_values => 1 - ); - - v_parameter_id := apm.register_parameter( - package_key => 'acs-subsite', - parameter_name => 'subtopic_application', - description => 'Name of the ETP application to use when creating a subtopic', - datatype => 'string', - default_value => 'default', - section_name => 'EditThisPage', - min_n_values => 1, - max_n_values => 1 - ); - -end; -/ -show errors; - -- create a folder with magic folder_id of -400 where we -- will put all deleted content items so they'll be recoverable. Index: openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql 15 Apr 2003 12:02:28 -0000 1.11 +++ openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql 17 May 2003 10:31:27 -0000 1.12 @@ -378,50 +378,6 @@ --- add the ETP parameters to the acs-subsite package so that --- we can serve the site's home page and top level pages. - --- DRB: This page was setting the parameter default values explicitly. apm__register_parameter --- is supposed to do this - there was a mistake in the Oracle->PostgreSQL port of this function. --- I fixed the bug and removed the code that was here ... - -create function inline_0 () -returns integer as ' -declare - ss_package_id integer; - cur_val record; -begin - perform apm__register_parameter( - NULL, - ''acs-subsite'', - ''application'', - ''Name of the ETP application to use (default, faq, wiki, or create your own with the etp::define_applicaton procedure)'', - ''string'', - ''default'', - ''EditThisPage'', - 1, - 1 - ); - perform apm__register_parameter( - NULL, - ''acs-subsite'', - ''subtopic_application'', - ''Name of the ETP application to use when creating a subtopic'', - ''string'', - ''default'', - ''EditThisPage'', - 1, - 1 - ); - - return 0; -end; -' language 'plpgsql'; - -select inline_0 (); -drop function inline_0 (); - - -- create a folder with magic folder_id of -400 where we -- will put all deleted content items so they'll be recoverable. Index: openacs-4/packages/email-handler/email-handler.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/email-handler/email-handler.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/email-handler/email-handler.info 16 Jan 2003 13:47:02 -0000 1.3 +++ openacs-4/packages/email-handler/email-handler.info 17 May 2003 10:32:22 -0000 1.4 @@ -18,7 +18,7 @@ A service to autmatically dispatch and process incoming email messages.Email messages are tagged and inserted into a database table by an external script, and the email handler dispatches emails by tag to Tcl procedures to handle them. - + Index: openacs-4/packages/faq/faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/faq/faq.info 16 Jan 2003 13:47:28 -0000 1.7 +++ openacs-4/packages/faq/faq.info 17 May 2003 10:32:49 -0000 1.8 @@ -19,50 +19,8 @@ Ybos Corporation - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/faq/sql/postgresql/faq-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/faq/sql/postgresql/faq-create.sql 30 Nov 2002 17:33:27 -0000 1.3 +++ openacs-4/packages/faq/sql/postgresql/faq-create.sql 17 May 2003 10:33:37 -0000 1.4 @@ -75,7 +75,7 @@ sort_key integer not null ); -create function faq__new_q_and_a (integer,integer,varchar,varchar,integer,varchar,timestamp,integer,varchar,integer +create function faq__new_q_and_a (integer,integer,varchar,varchar,integer,varchar,timestamptz,integer,varchar,integer ) returns integer as ' declare @@ -121,7 +121,7 @@ end;' language 'plpgsql'; -create function faq__new_faq (integer, varchar, boolean,varchar,timestamp,integer,varchar,integer ) +create function faq__new_faq (integer, varchar, boolean,varchar,timestamptz,integer,varchar,integer ) returns integer as ' declare p_faq_id alias for $1; Index: openacs-4/packages/faq/sql/postgresql/faq-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/sql/postgresql/faq-drop.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/faq/sql/postgresql/faq-drop.sql 17 Jul 2002 20:20:17 -0000 1.2 +++ openacs-4/packages/faq/sql/postgresql/faq-drop.sql 17 May 2003 10:33:37 -0000 1.3 @@ -3,9 +3,9 @@ --openacs port @samir.symphinity.com --drop functions -drop function faq__new_q_and_a (integer,integer,varchar,varchar,integer,varchar,timestamp,integer,varchar,integer); +drop function faq__new_q_and_a (integer,integer,varchar,varchar,integer,varchar,timestamptz,integer,varchar,integer); drop function faq__delete_q_and_a (integer); -drop function faq__new_faq (integer, varchar, boolean,varchar,timestamp,integer,varchar,integer ); +drop function faq__new_faq (integer, varchar, boolean,varchar,timestamptz,integer,varchar,integer ); drop function faq__delete_faq (integer); drop function faq__name (integer); drop function faq__clone (integer,integer); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/sql/postgresql/upgrade/upgrade-4.0-4.6.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/faq/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/faq/www/index.tcl 4 Sep 2002 13:28:32 -0000 1.4 +++ openacs-4/packages/faq/www/index.tcl 17 May 2003 10:34:44 -0000 1.5 @@ -36,7 +36,8 @@ select faq_id, faq_name from acs_objects o, faqs f where object_id = faq_id - and context_id = :package_id + and context_id = :package_id + and disabled_p = 'f' order by faq_name } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/www/admin/faq-disable.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/www/admin/faq-enable.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/faq/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/faq/www/admin/index.adp 7 Nov 2002 08:13:54 -0000 1.4 +++ openacs-4/packages/faq/www/admin/index.adp 17 May 2003 10:35:15 -0000 1.5 @@ -5,19 +5,31 @@ #faq.lt_no_FAQs#

- -

- #faq.Create_a_new_FAQ# +#faq.Create_a_new_FAQ# Index: openacs-4/packages/faq/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/faq/www/admin/index.tcl 4 Sep 2002 13:28:33 -0000 1.3 +++ openacs-4/packages/faq/www/admin/index.tcl 17 May 2003 10:35:15 -0000 1.4 @@ -25,12 +25,15 @@ -db_multirow faqs faq_select { - select faq_id, faq_name +db_multirow -extend { disable_url enable_url } faqs faq_select { + select faq_id, faq_name, disabled_p from acs_objects o, faqs f where object_id = faq_id and context_id = :package_id - order by faq_name + order by disabled_p, faq_name +} { + set disable_url "faq-disable?[export_vars { faq_id }]" + set enable_url "faq-enable?[export_vars { faq_id }]" } ad_return_template Index: openacs-4/packages/file-manager/file-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/file-manager.info,v diff -u -r1.1 -r1.2 --- openacs-4/packages/file-manager/file-manager.info 20 Apr 2001 20:51:14 -0000 1.1 +++ openacs-4/packages/file-manager/file-manager.info 17 May 2003 10:35:55 -0000 1.2 @@ -16,7 +16,7 @@ 2001-01-26 ArsDigita Corporation - + Index: openacs-4/packages/file-storage/file-storage.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v diff -u -r1.20 -r1.21 --- openacs-4/packages/file-storage/file-storage.info 16 Jan 2003 13:47:41 -0000 1.20 +++ openacs-4/packages/file-storage/file-storage.info 17 May 2003 10:36:33 -0000 1.21 @@ -6,158 +6,28 @@ File Storage Areas f f - - - - oracle - postgresql - + + Jowell S. Sabino This application allows users to collaboratively maintain documents on the web server 2002-10-27 OpenACS Now allows storage of files on the filesystem or database. - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + + + +