Index: openacs-4/packages/news-aggregator/sql/postgresql/news-aggregator-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/sql/postgresql/news-aggregator-tables-create.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/news-aggregator/sql/postgresql/news-aggregator-tables-create.sql	31 Jul 2020 12:07:25 -0000	1.5
+++ openacs-4/packages/news-aggregator/sql/postgresql/news-aggregator-tables-create.sql	31 Jul 2020 12:36:37 -0000	1.6
@@ -11,15 +11,15 @@
 ----------------
 
 create table na_aggregators (
-        aggregator_id		integer
-				constraint na_aggregators_pk
-				primary key
-				constraint na_aggregators_aid_fk
-				references acs_objects(object_id)
+        aggregator_id           integer
+                                constraint na_aggregators_pk
+                                primary key
+                                constraint na_aggregators_aid_fk
+                                references acs_objects(object_id)
                                 on delete cascade,
-	aggregator_name		varchar(100)
-				constraint na_aggregators_name_nn
-				not null,
+        aggregator_name         varchar(100)
+                                constraint na_aggregators_name_nn
+                                not null,
         description             text,
         package_id              integer
                                 constraint na_aggregators_pid_fk
@@ -32,7 +32,7 @@
                                 references users(user_id)
                                 constraint na_aggregators_mid_nn
                                 not null,
-	public_p		boolean default true,
+        public_p                boolean default true,
         number_shown            integer
                                 default '100',
         aggregator_bottom       integer
@@ -73,15 +73,15 @@
        title                        varchar(500),
        description                  varchar(500),
        updates                      integer
-				    default '0',
+                                    default '0',
        last_scanned                 timestamptz
-				    default current_timestamp,
+                                    default current_timestamp,
        last_modified                varchar(100),
        last_modified_stamp          timestamptz,
-       last_scan_ok_p		    boolean default true,
-       stacktrace		    text,
-       rss_source		    text,
-       listed_p			    boolean default true
+       last_scan_ok_p               boolean default true,
+       stacktrace                   text,
+       rss_source                   text,
+       listed_p                     boolean default true
 );
 
 
@@ -107,63 +107,63 @@
 
 create sequence na_items_item_id_seq cache 1;
 create table na_items (
-       item_id                      integer
+        item_id                     integer
                                     default nextval('na_items_item_id_seq')
-				    constraint na_items_pk
+                                    constraint na_items_pk
                                     primary key,
-       source_id                    integer
+        source_id                   integer
                                     constraint na_items_sid_fk
                                     references na_sources(source_id)
                                     constraint na_items_sid_nn
                                     not null,
-       link                         varchar(500),
-       guid			    varchar(500),
-       original_guid    varchar(500),
-       permalink_p		    boolean 
+        link                        varchar(500),
+        guid                        varchar(500),
+        original_guid               varchar(500),
+        permalink_p                 boolean
                                     default true,
-       title                        varchar(500),
-       author                       varchar(100),
-       comment_page                 varchar(200),
-       description                  text,
-       content_encoded              text,
-       creation_date                timestamptz
-				    default current_timestamp,
-    pub_date                        timestamptz
+        title                       varchar(500),
+        author                      varchar(100),
+        comment_page                varchar(200),
+        description                 text,
+        content_encoded             text,
+        creation_date               timestamptz
+                                    default current_timestamp,
+        pub_date                    timestamptz
 );
 
 create index na_items_guid_idx on na_items(guid);
 create index na_items_source_id_idx on na_items(source_id);
 ALTER TABLE na_items ADD CONSTRAINT na_items_unique_guid UNIQUE (guid,source_id);
 
 create table na_saved_items (
-       item_id			    integer
-				    constraint na_saved_items_iid_fk
-				    references na_items(item_id),
-       aggregator_id		    integer
-		                    constraint na_saved_items_aid_fk
-				    references na_aggregators(aggregator_id)
+        item_id                     integer
+                                    constraint na_saved_items_iid_fk
+                                    references na_items(item_id),
+        aggregator_id               integer
+                                    constraint na_saved_items_aid_fk
+                                    references na_aggregators(aggregator_id)
                                     on delete cascade,
-       constraint na_saved_items_pk primary key(item_id, aggregator_id)
+        constraint na_saved_items_pk primary key(item_id, aggregator_id)
 );
 
 create table na_purges (
-       purge_id	       integer
-		       constraint na_purges_pk
-		       primary key,
-       top	       integer
-		       constraint na_purges_top_nn
-		       not null,
-       bottom	       integer
-		       constraint na_purges_bottom_nn
-		       not null,
-       aggregator_id   integer
-		       constraint na_purges_aid_fk
-		       references na_aggregators(aggregator_id)
-                       on delete cascade
-		       constraint na_purges_aid_nn
-		       not null,
-       purge_date      timestamptz
-		       default current_timestamp
+        purge_id                    integer
+                                    constraint na_purges_pk
+                                    primary key,
+        top                         integer
+                                    constraint na_purges_top_nn
+                                    not null,
+        bottom                      integer
+                                    constraint na_purges_bottom_nn
+                                    not null,
+        aggregator_id               integer
+                                    constraint na_purges_aid_fk
+                                    references na_aggregators(aggregator_id)
+                                    on delete cascade
+                                    constraint na_purges_aid_nn
+                                    not null,
+        purge_date                  timestamptz
+                                    default current_timestamp
 );
 
 create sequence na_purges_seq;
@@ -176,20 +176,20 @@
 ----------------
 
 create table na_subscriptions (
-	aggregator_id		integer
+        aggregator_id           integer
                                 constraint na_subscriptions_aid_fk
                                 references na_aggregators(aggregator_id)
                                 on delete cascade,
-	source_id		integer
+        source_id               integer
                                 constraint na_subscriptions_sid_fk
                                 references na_sources(source_id),
-    source_title        varchar(100),
-    show_description_p  boolean
-                        constraint na_subscriptions_show_description_p_nn
-                        not null
-                        default true,
-        creation_date		timestamptz
-				default current_timestamp,
+        source_title            varchar(100),
+        show_description_p      boolean
+                                constraint na_subscriptions_show_description_p_nn
+                                not null
+                                default true,
+        creation_date           timestamptz
+                                default current_timestamp,
         constraint na_subscriptions_pk primary key (aggregator_id, source_id)
 );
 
@@ -202,14 +202,14 @@
 -------------------
 
 create table na_user_preferences (
-	user_id			integer
-				constraint na_user_prefs_uid_pk
-				primary key
-				constraint na_user_prefs_uid_fk
-				references users(user_id),
-	default_aggregator	integer
-				constraint na_user_prefs_default_fk
-				references na_aggregators(aggregator_id)
+        user_id                 integer
+                                constraint na_user_prefs_uid_pk
+                                primary key
+                                constraint na_user_prefs_uid_fk
+                                references users(user_id),
+        default_aggregator      integer
+                                constraint na_user_prefs_default_fk
+                                references na_aggregators(aggregator_id)
                                 on delete set null
 );
 
@@ -245,24 +245,24 @@
 -------------------
 
 select acs_object_type__create_type (
-	'na_weblog',			-- object_type
-	'News Aggregator Weblog',	-- pretty_name
-	'News Aggregator Weblogs',	-- pretty_plural
-	'acs_object',			-- supertype
-	'na_weblogs',			-- table_name
-	'weblog_id',			-- id_column
-	'news-aggregator',		-- package_name
-	'f',				-- abstract_p
-	null,				-- type_extension_table
-	'na_weblog__name'		-- name_method
+    'na_weblog',                -- object_type
+    'News Aggregator Weblog',   -- pretty_name
+    'News Aggregator Weblogs',  -- pretty_plural
+    'acs_object',               -- supertype
+    'na_weblogs',               -- table_name
+    'weblog_id',                -- id_column
+    'news-aggregator',          -- package_name
+    'f',                        -- abstract_p
+    null,                       -- type_extension_table
+    'na_weblog__name'           -- name_method
 );
 
 create table na_weblogs (
         weblog_id               integer
                                 constraint na_weblogs_weblog_id_fk
-				references acs_objects(object_id)
-				constraint na_weblogs_weblog_id_nn
-				not null,
+                                references acs_objects(object_id)
+                                constraint na_weblogs_weblog_id_nn
+                                not null,
         package_id              integer
                                 constraint na_weblogs_pid_fk
                                 references apm_packages(package_id)
@@ -279,9 +279,9 @@
         blog_type               varchar(100)
                                 constraint na_weblogs_blog_type_nn
                                 not null,
-	base_url		varchar(500)
-				constraint na_weblogs_base_url_nn
-				not null,
+        base_url                varchar(500)
+                                constraint na_weblogs_base_url_nn
+                                not null,
         server                  varchar(500),
         port                    integer,
         path                    varchar(100),
