Commit 8bbcc3f3 authored by Frank Bergmann's avatar Frank Bergmann

- Comitting OpenACS 5.9

parent ba01eaf3
...@@ -7,22 +7,21 @@ ...@@ -7,22 +7,21 @@
<initial-install-p>t</initial-install-p> <initial-install-p>t</initial-install-p>
<singleton-p>t</singleton-p> <singleton-p>t</singleton-p>
<version name="5.7.0" url="http://openacs.org/repository/download/apm/acs-reference-5.7.0.apm"> <version name="5.10.0d1" url="http://openacs.org/repository/download/apm/acs-reference-5.10.0d1.apm">
<owner url="mailto:jon@jongriffin.com">Jon Griffin</owner> <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
<summary>Tools and API for managing refrence data.</summary> <summary>Tools and API for managing refrence data.</summary>
<release-date>2011-06-12</release-date> <release-date>2013-09-08</release-date>
<maturity>3</maturity> <maturity>3</maturity>
<vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor> <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
<license url="http://www.gnu.org/copyleft/gpl.html">GPL</license> <license url="http://www.gnu.org/copyleft/gpl.html">GPL</license>
<maturity>3</maturity>
<description format="text/html">Reference Data provides an API to support: <description format="text/html">Reference Data provides an API to support:
&lt;ul&gt; &lt;ul&gt;
&lt;li&gt; A common set of reference data. &lt;li&gt; A common set of reference data.
&lt;li&gt; Running standard reports on this data. &lt;li&gt; Running standard reports on this data.
&lt;li&gt; Monitoring the usage of reference data. &lt;li&gt; Monitoring the usage of reference data.
&lt;/ul&gt;</description> &lt;/ul&gt;</description>
<provides url="acs-reference" version="5.7.0"/> <provides url="acs-reference" version="5.10.0d1"/>
<requires url="acs-kernel" version="5.7.0"/> <requires url="acs-kernel" version="5.10.0d1"/>
<callbacks> <callbacks>
</callbacks> </callbacks>
......
...@@ -69,35 +69,40 @@ create table acs_reference_repositories ( ...@@ -69,35 +69,40 @@ create table acs_reference_repositories (
-- default for Oracle -- default for Oracle
create function acs_reference__new (integer,varchar,boolean,varchar,timestamptz,
varchar,varchar,timestamptz,timestamptz,integer,integer,varchar,varchar,
varchar,varchar,integer) -- added
returns integer as ' select define_function_args('acs_reference__new','repository_id;null,table_name,internal_data_p;"f",package_name;null,last_update;sysdate,source;null,source_url;null,effective_date;sysdate,expiry_date;null,maintainer_id;null,notes;null (not Oracle empty_blob()),first_names;null,last_name;null,creation_ip;null,object_type;"acs_reference_repository",creation_user;null');
declare
p_repository_id alias for $1; -- default null --
p_table_name alias for $2; -- -- procedure acs_reference__new/16
p_internal_data_p alias for $3; -- default "f" --
p_package_name alias for $4; -- default null CREATE OR REPLACE FUNCTION acs_reference__new(
p_last_update alias for $5; -- default sysdate p_repository_id integer, -- default null
p_source alias for $6; -- default null p_table_name varchar,
p_source_url alias for $7; -- default null p_internal_data_p boolean, -- default "f"
p_effective_date alias for $8; -- default sysdate p_package_name varchar, -- default null
p_expiry_date alias for $9; -- default null p_last_update timestamptz, -- default sysdate
p_maintainer_id alias for $10; -- default null p_source varchar, -- default null
p_notes alias for $11; -- default null (not Oracle empty_blob()) p_source_url varchar, -- default null
-- I really see no need for these as parameters p_effective_date timestamptz, -- default sysdate
-- creation_date alias for $12; -- default sysdate p_expiry_date timestamptz, -- default null
p_first_names alias for $12; -- default null p_maintainer_id integer, -- default null
p_last_name alias for $13; -- default null p_notes integer, -- default null (not Oracle empty_blob())
p_creation_ip alias for $14; -- default null p_first_names varchar, -- default null
p_object_type alias for $15; -- default "acs_reference_repository" p_last_name varchar, -- default null
p_creation_user alias for $16; -- default null p_creation_ip varchar, -- default null
p_object_type varchar, -- default "acs_reference_repository"
p_creation_user integer -- default null
) RETURNS integer AS $$
DECLARE
v_repository_id acs_reference_repositories.repository_id%TYPE; v_repository_id acs_reference_repositories.repository_id%TYPE;
v_object_type acs_objects.object_type%TYPE; v_object_type acs_objects.object_type%TYPE;
v_maintainer_id persons.person_id%TYPE; v_maintainer_id persons.person_id%TYPE;
begin BEGIN
if p_object_type is null then if p_object_type is null then
v_object_type := ''acs_reference_repository''; v_object_type := 'acs_reference_repository';
else else
v_object_type := p_object_type; v_object_type := p_object_type;
end if; end if;
...@@ -109,7 +114,7 @@ begin ...@@ -109,7 +114,7 @@ begin
p_creation_user, p_creation_user,
p_creation_ip, p_creation_ip,
null, null,
''t'', 't',
p_source, p_source,
null null
); );
...@@ -129,7 +134,7 @@ begin ...@@ -129,7 +134,7 @@ begin
-- NEEDS TO BE FIXED - jag -- NEEDS TO BE FIXED - jag
if p_first_names is not null and p_last_name is not null and p_maintainer_id is null then if p_first_names is not null and p_last_name is not null and p_maintainer_id is null then
v_maintainer_id := person__new (null, ''person'', now(), null, null, null, null, v_maintainer_id := person__new (null, 'person', now(), null, null, null, null,
p_first_names, p_last_name, null); p_first_names, p_last_name, null);
else if p_maintainer_id is not null then else if p_maintainer_id is not null then
v_maintainer_id := p_maintainer_id; v_maintainer_id := p_maintainer_id;
...@@ -149,34 +154,49 @@ begin ...@@ -149,34 +154,49 @@ begin
p_effective_date, p_expiry_date, v_maintainer_id, p_notes); p_effective_date, p_expiry_date, v_maintainer_id, p_notes);
return v_repository_id; return v_repository_id;
end; END;
' language 'plpgsql';
$$ LANGUAGE plpgsql;
-- made initially for PG -- made initially for PG
create function acs_reference__new (varchar,timestamptz,
varchar,varchar,timestamptz)
returns integer as ' --
declare -- procedure acs_reference__new/5
p_table_name alias for $1; -- --
p_last_update alias for $2; -- default sysdate CREATE OR REPLACE FUNCTION acs_reference__new(
p_source alias for $3; -- default null p_table_name varchar,
p_source_url alias for $4; -- default null p_last_update timestamptz, -- default sysdate
p_effective_date alias for $5; -- default sysdate p_source varchar, -- default null
p_source_url varchar, -- default null
p_effective_date timestamptz -- default sysdate
) RETURNS integer AS $$
DECLARE
v_repository_id acs_reference_repositories.repository_id%TYPE; v_repository_id acs_reference_repositories.repository_id%TYPE;
begin BEGIN
return acs_reference__new(null, p_table_name, ''f'', null, null, p_source, p_source_url, return acs_reference__new(null, p_table_name, 'f', null, null, p_source, p_source_url,
p_effective_date, null, null, null, null, null, null, p_effective_date, null, null, null, null, null, null,
''acs_reference_repository'', null); 'acs_reference_repository', null);
end; END;
' language 'plpgsql';
$$ LANGUAGE plpgsql;
create function acs_reference__delete (integer)
returns integer as ' -- added
declare select define_function_args('acs_reference__delete','repository_id');
p_repository_id alias for $1;
--
-- procedure acs_reference__delete/1
--
CREATE OR REPLACE FUNCTION acs_reference__delete(
p_repository_id integer
) RETURNS integer AS $$
DECLARE
v_maintainer_id acs_objects.object_id%TYPE; v_maintainer_id acs_objects.object_id%TYPE;
begin BEGIN
select maintainer_id into v_maintainer_id select maintainer_id into v_maintainer_id
from acs_reference_repositories from acs_reference_repositories
where repository_id = p_repository_id; where repository_id = p_repository_id;
...@@ -186,24 +206,34 @@ begin ...@@ -186,24 +206,34 @@ begin
perform acs_object__delete(p_repository_id); perform acs_object__delete(p_repository_id);
return 0; return 0;
end; END;
' language 'plpgsql';
$$ LANGUAGE plpgsql;
create function acs_reference__is_expired_p (integer)
returns char as ' -- added
declare select define_function_args('acs_reference__is_expired_p','repository_id');
repository_id alias for $1;
--
-- procedure acs_reference__is_expired_p/1
--
CREATE OR REPLACE FUNCTION acs_reference__is_expired_p(
repository_id integer
) RETURNS char AS $$
DECLARE
v_expiry_date acs_reference_repositories.expiry_date%TYPE; v_expiry_date acs_reference_repositories.expiry_date%TYPE;
begin BEGIN
select expiry_date into v_expiry_date select expiry_date into v_expiry_date
from acs_reference_repositories from acs_reference_repositories
where repository_id = is_expired_p.repository_id; where repository_id = is_expired_p.repository_id;
if coalesce(v_expiry_date,now()+1) < now() then if coalesce(v_expiry_date,now()+1) < now() then
return ''t''; return 't';
else else
return ''f''; return 'f';
end if; end if;
end; END;
' language 'plpgsql';
$$ LANGUAGE plpgsql;
<master> <master>
<property name="context">@context_bar;noquote@</property> <property name="context">@context_bar;literal@</property>
<property name="title">@title;noquote@</property> <property name="doc(title)">@title;literal@</property>
<h2>@title@;noquote</h2> <h2>@title@;noquote</h2>
<ul> <ul>
......
...@@ -18,6 +18,6 @@ set package_id [ad_conn package_id] ...@@ -18,6 +18,6 @@ set package_id [ad_conn package_id]
set context_bar [list $title] set context_bar [list $title]
set user_id [ad_conn user_id] set user_id [ad_conn user_id]
set admin_p [ad_permission_p $package_id admin] set admin_p [permission::permission_p -object_id $package_id -privilege admin]
ad_return_template ad_return_template
<master> <master>
<property name="context">@context_bar;noquote@</property> <property name="context">@context_bar;literal@</property>
<property name="title">@title;noquote@</property> <property name="doc(title)">@title;literal@</property>
<if @data:rowcount@ eq 0> <if @data:rowcount@ eq 0>
<i>You have no reference data in the database right now.</i><p> <i>You have no reference data in the database right now.</i><p>
......
<master> <master>
<property name="context">@context_bar;noquote@</property> <property name="context">@context_bar;literal@</property>
<property name="title">@title;noquote@</property> <property name="doc(title)">@title;literal@</property>
<master> <master>
<property name="context_bar">@context_bar;noquote@</property> <property name="context_bar">@context_bar;literal@</property>
<property name="title">@title;noquote@</property> <property name="doc(title)">@title;literal@</property>
<table> <table>
<tr><th valign=top align=right>Table Name</th> <tr><th valign="top" align="right">Table Name</th>
<td> <a href="table-detail?table_name=@table_info.table_name@">@table_info.table_name@</a> </td></tr> <td> <a href="table-detail?table_name=@table_info.table_name@">@table_info.table_name@</a> </td></tr>
<tr><th valign=top align=right>Package Name</th> <tr><th valign="top" align="right">Package Name</th>
<td> @table_info.package_name@ </td></tr> <td> @table_info.package_name@ </td></tr>
<tr><th valign=top align=right>Internal Data?</th> <tr><th valign="top" align="right">Internal Data?</th>
<td> @table_info.internal_data_p@ </td></tr> <td> @table_info.internal_data_p@ </td></tr>
<tr><th valign=top align=right>Source</th> <tr><th valign="top" align="right">Source</th>
<td> @table_info.source@ </td></tr> <td> @table_info.source@ </td></tr>
<tr><th valign=top align=right>Source URL</th> <tr><th valign="top" align="right">Source URL</th>
<td> @table_info.source_url@ </td></tr> <td> @table_info.source_url@ </td></tr>
<tr><th valign=top align=right>Last Update</th> <tr><th valign="top" align="right">Last Update</th>
<td> @table_info.last_update@ </td></tr> <td> @table_info.last_update@ </td></tr>
<tr><th valign=top align=right>Effective Date</th> <tr><th valign="top" align="right">Effective Date</th>
<td> @table_info.effective_date@ </td></tr> <td> @table_info.effective_date@ </td></tr>
<tr><th valign=top align=right>Expiry Date</th> <tr><th valign="top" align="right">Expiry Date</th>
<td> @table_info.expiry_date@ </td></tr> <td> @table_info.expiry_date@ </td></tr>
<tr><th valign=top align=right>Maintainer</th> <tr><th valign="top" align="right">Maintainer</th>
<td> @table_info.maintainer_id@ </td></tr> <td> @table_info.maintainer_id@ </td></tr>
</table> </table>
......
...@@ -6,7 +6,7 @@ ad_page_contract { ...@@ -6,7 +6,7 @@ ad_page_contract {
@creation-date 17 Sept 2001 @creation-date 17 Sept 2001
@cvs-id $Id$ @cvs-id $Id$
} { } {
repository_id:integer,notnull repository_id:naturalnum,notnull
} -properties { } -properties {
context_bar:onevalue context_bar:onevalue
package_id:onevalue package_id:onevalue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment