valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new option: FRESH_ARTICLE_MAX_AGE (bump schema)

This commit is contained in:
Andrew Dolgov 2007-08-23 09:05:40 +01:00
parent 2d24f03266
commit c1d7e6c344
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
functions.php
View File

@ -1648,11 +1648,13 @@
if ($feed == -3) { if ($feed == -3) {
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$match_part .= " AND date_entered > NOW() - INTERVAL '1 day' "; $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
} else { } else {
$match_part .= " AND date_entered > DATE_SUB(NOW(), $match_part .= " AND date_entered > DATE_SUB(NOW(),
INTERVAL 1 DAY) "; INTERVAL $intl HOUR) ";
} }
db_query($link, "UPDATE ttrss_user_entries db_query($link, "UPDATE ttrss_user_entries
@ -1856,10 +1858,12 @@
} else if ($n_feed == -3) { } else if ($n_feed == -3) {
$match_part = "unread = true"; $match_part = "unread = true";
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$match_part .= " AND date_entered > NOW() - INTERVAL '1 day' "; $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
} else { } else {
$match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL 1 DAY) "; $match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
} }
} else if ($n_feed > 0) { } else if ($n_feed > 0) {
@ -2637,10 +2641,12 @@
} else if ($feed == -3) { // fresh virtual feed } else if ($feed == -3) { // fresh virtual feed
$query_strategy_part = "unread = true"; $query_strategy_part = "unread = true";
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$query_strategy_part .= " AND date_entered > NOW() - INTERVAL '1 day' "; $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
} else { } else {
$query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL 1 DAY) "; $query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
} }
$vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,";

2
sanity_check.php
View File

@ -2,7 +2,7 @@
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 8); define('EXPECTED_CONFIG_VERSION', 8);
define('SCHEMA_VERSION', 20); define('SCHEMA_VERSION', 21);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print __("<b>Fatal Error</b>: You forgot to copy print __("<b>Fatal Error</b>: You forgot to copy

4
schema/ttrss_schema_mysql.sql
View File

@ -196,7 +196,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) TYPE=InnoDB; create table ttrss_version (schema_version int not null) TYPE=InnoDB;
insert into ttrss_version values (20); insert into ttrss_version values (21);
create table ttrss_prefs_types (id integer not null primary key, create table ttrss_prefs_types (id integer not null primary key,
type_name varchar(100) not null) TYPE=InnoDB; type_name varchar(100) not null) TYPE=InnoDB;
@ -294,6 +294,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
create table ttrss_user_prefs ( create table ttrss_user_prefs (
owner_uid integer not null, owner_uid integer not null,
pref_name varchar(250), pref_name varchar(250),

4
schema/ttrss_schema_pgsql.sql
View File

@ -177,7 +177,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
create table ttrss_version (schema_version int not null); create table ttrss_version (schema_version int not null);
insert into ttrss_version values (20); insert into ttrss_version values (21);
create table ttrss_prefs_types (id integer not null primary key, create table ttrss_prefs_types (id integer not null primary key,
type_name varchar(100) not null); type_name varchar(100) not null);
@ -271,6 +271,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
create table ttrss_user_prefs ( create table ttrss_user_prefs (
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

3
schema/versions/mysql/21.sql Normal file
View File

@ -0,0 +1,3 @@
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
update ttrss_version set schema_version = 21;

3
schema/versions/pgsql/21.sql Normal file
View File

@ -0,0 +1,3 @@
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
update ttrss_version set schema_version = 21;