diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-03-02 17:44:52 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-03-02 17:44:52 +0100 |
| commit | fd945ffb9314f3613a96cfe3aa4fbc389b702d7a (patch) | |
| tree | 3178e16a2d7719f4991c349963c81e110cd146d4 | |
| parent | 467ca9d0deea511700656d4433dbd915b137b748 (diff) | |
Fix XPath context for tags (#4246)
#fix https://github.com/FreshRSS/FreshRSS/issues/4245
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/4220
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/Models/Feed.php | 2 | ||||
| -rw-r--r-- | app/SQL/install.sql.mysql.php | 2 | ||||
| -rw-r--r-- | app/SQL/install.sql.pgsql.php | 2 | ||||
| -rw-r--r-- | app/SQL/install.sql.sqlite.php | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c7640ee..5641b9c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 2022-0X-XX FreshRSS 1.20.0-dev +* Features + * New Web scraping feature *HTML+XPath* for Web pages without any RSS/ATOM feed [#4220](https://github.com/FreshRSS/FreshRSS/pull/4220) + ## 2022-02-04 FreshRSS 1.19.2 diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 0e02194ef..934036845 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -605,7 +605,7 @@ class FreshRSS_Feed extends Minz_Model { $item['timestamp'] = $xPathItemTimestamp == '' ? '' : @$xpath->evaluate('normalize-space(' . $xPathItemTimestamp . ')', $node); $item['thumbnail'] = $xPathItemThumbnail == '' ? '' : @$xpath->evaluate('normalize-space(' . $xPathItemThumbnail . ')', $node); if ($xPathItemCategories != '') { - $itemCategories = @$xpath->query($xPathItemCategories); + $itemCategories = @$xpath->query($xPathItemCategories, $node); if ($itemCategories) { foreach ($itemCategories as $itemCategory) { $item['categories'][] = $itemCategory->textContent; diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php index c52b58f65..b41b93dfc 100644 --- a/app/SQL/install.sql.mysql.php +++ b/app/SQL/install.sql.mysql.php @@ -16,7 +16,7 @@ ENGINE = INNODB; CREATE TABLE IF NOT EXISTS `_feed` ( `id` SMALLINT NOT NULL AUTO_INCREMENT, -- v0.7 `url` VARCHAR(511) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, - `kind` SMALLINT DEFAULT 0, -- 0.20.0 + `kind` SMALLINT DEFAULT 0, -- 1.20.0 `category` SMALLINT DEFAULT 0, -- v0.7 `name` VARCHAR(191) NOT NULL, `website` VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_bin, diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php index 0a8298d29..aa9fbbc3f 100644 --- a/app/SQL/install.sql.pgsql.php +++ b/app/SQL/install.sql.pgsql.php @@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `_category` ( CREATE TABLE IF NOT EXISTS `_feed` ( "id" SERIAL PRIMARY KEY, "url" VARCHAR(511) UNIQUE NOT NULL, - "kind" SMALLINT DEFAULT 0, -- 0.20.0 + "kind" SMALLINT DEFAULT 0, -- 1.20.0 "category" SMALLINT DEFAULT 0, "name" VARCHAR(255) NOT NULL, "website" VARCHAR(255), diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php index 44bf6fb33..5fb8f099c 100644 --- a/app/SQL/install.sql.sqlite.php +++ b/app/SQL/install.sql.sqlite.php @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `category` ( CREATE TABLE IF NOT EXISTS `feed` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` VARCHAR(511) NOT NULL, - `kind` SMALLINT DEFAULT 0, -- 0.20.0 + `kind` SMALLINT DEFAULT 0, -- 1.20.0 `category` SMALLINT DEFAULT 0, `name` VARCHAR(255) NOT NULL, `website` VARCHAR(255), |