Index: openacs-4/packages/news/news.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/news.info,v
diff -u -r1.18.2.3 -r1.18.2.4
--- openacs-4/packages/news/news.info 6 Sep 2005 06:11:33 -0000 1.18.2.3
+++ openacs-4/packages/news/news.info 26 Sep 2005 09:08:48 -0000 1.18.2.4
@@ -26,6 +26,7 @@
+
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/news/catalog/news.en_AU.ISO-8859-1.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/news/catalog/news.es_CO.ISO-8859-1.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/news/catalog/news.ms_my.utf-8.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/news/sql/oracle/upgrade/upgrade-5.0d1-5.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/sql/oracle/upgrade/upgrade-5.0d1-5.0d2.sql,v
diff -u -r1.1 -r1.1.8.1
--- openacs-4/packages/news/sql/oracle/upgrade/upgrade-5.0d1-5.0d2.sql 8 Oct 2003 16:59:23 -0000 1.1
+++ openacs-4/packages/news/sql/oracle/upgrade/upgrade-5.0d1-5.0d2.sql 26 Sep 2005 09:08:49 -0000 1.1.8.1
@@ -67,7 +67,8 @@
function status (
- news_id in cr_news.news_id%TYPE
+ publish_date in cr_revisions.publish_date%TYPE,
+ archive_date in cr_news.archive_date%TYPE
) return varchar2;
@@ -359,42 +360,27 @@
-- the status function returns information on the puplish or archive status
-- it does not make any checks on the order of publish_date and archive_date
function status (
- news_id in cr_news.news_id%TYPE
+ publish_date in cr_revisions.publish_date%TYPE,
+ archive_date in cr_news.archive_date%TYPE
) return varchar2
is
- v_archive_date date;
- v_publish_date date;
begin
- -- populate variables
- select archive_date into v_archive_date
- from cr_news
- where news_id = news.status.news_id;
- --
- select publish_date into v_publish_date
- from cr_revisions
- where revision_id = news.status.news_id;
-
- -- if publish_date is not null the item is approved, otherwise it is not
- if v_publish_date is not null then
- if v_publish_date > sysdate then
+
+ if publish_date is not null then
+ if publish_date > sysdate then
-- to be published (2 cases)
- -- archive date could be null if it has not been decided when to archive
- if v_archive_date is null then
- return 'going live in ' ||
- round(to_char(v_publish_date - sysdate),1) || ' days';
+ if archive_date is null then
+ return 'going_live_no_archive';
else
- return 'going live in ' ||
- round(to_char(v_publish_date - sysdate),1) || ' days' ||
- ', archived in ' || round(to_char(v_archive_date - sysdate),1) || ' days';
+ return 'going_live_with_archive';
end if;
else
-- already released or even archived (3 cases)
- if v_archive_date is null then
- return 'published, not scheduled for archive';
+ if archive_date is null then
+ return 'published_no_archive';
else
- if v_archive_date - sysdate > 0 then
- return 'published, archived in ' ||
- round(to_char(v_archive_date - sysdate),1) || ' days';
+ if archive_date - sysdate > 0 then
+ return 'published_with_archive';
else
return 'archived';
end if;
@@ -583,6 +569,3 @@
end news;
/
show errors
-
-
-
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/news/sql/postgresql/news-sc-create.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/news/sql/postgresql/news-sc-drop.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/news/tcl/news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v
diff -u -r1.20.2.4 -r1.20.2.5
--- openacs-4/packages/news/tcl/news-procs.tcl 6 Sep 2005 06:11:34 -0000 1.20.2.4
+++ openacs-4/packages/news/tcl/news-procs.tcl 26 Sep 2005 09:08:49 -0000 1.20.2.5
@@ -401,4 +401,4 @@
-notif_subject "Latest News" \
-notif_text $new_content
-}
\ No newline at end of file
+}
Index: openacs-4/packages/news/tcl/news-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.xql,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/news/tcl/news-procs.xql 19 Jul 2005 22:01:28 -0000 1.8.2.2
+++ openacs-4/packages/news/tcl/news-procs.xql 26 Sep 2005 09:08:49 -0000 1.8.2.3
@@ -20,10 +20,12 @@
-
-SELECT live_revision AS image_id
-FROM cr_items
-WHERE content_type = 'image' AND parent_id = :item_id
-
+
+
+ SELECT live_revision AS image_id
+ FROM cr_items
+ WHERE content_type = 'image' AND parent_id = :item_id
+
+
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/news/www/item-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/news/www/item-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.13.2.1 refers to a dead (removed) revision in file `openacs-4/packages/news/www/item.tcl'.
Fisheye: No comparison available. Pass `N' to diff?