further updates to xml import ui

This commit is contained in:
Andrew Dolgov 2005-12-02 09:33:03 +01:00
parent 8fb9aceee2
commit fa16f30b87
1 changed files with 8 additions and 6 deletions

View File

@ -93,15 +93,16 @@
updated, updated,
guid, guid,
link, link,
date_entered, SUBSTRING(date_entered,1,16) AS date_entered,
last_read, SUBSTRING(last_read,1,16) AS last_read,
comments, comments,
ttrss_feeds.feed_url AS feed_url, ttrss_feeds.feed_url AS feed_url,
ttrss_feeds.title AS feed_title ttrss_feeds.title AS feed_title
FROM FROM
ttrss_entries,ttrss_feeds ttrss_entries,ttrss_feeds
WHERE WHERE
feed_id = ttrss_feeds.id $marked_qpart $unread_qpart"); feed_id = ttrss_feeds.id $marked_qpart $unread_qpart
ORDER BY ttrss_entries.id");
} else if ($schema_version == 2) { } else if ($schema_version == 2) {
@ -113,8 +114,8 @@
updated, updated,
guid, guid,
link, link,
date_entered, SUBSTRING(date_entered,1,16) AS date_entered,
last_read, SUBSTRING(last_read,1,16) AS last_read,
comments, comments,
ttrss_feeds.feed_url AS feed_url, ttrss_feeds.feed_url AS feed_url,
ttrss_feeds.title AS feed_title ttrss_feeds.title AS feed_title
@ -123,7 +124,8 @@
WHERE WHERE
ttrss_user_entries.owner_uid = '$owner_uid' AND ttrss_user_entries.owner_uid = '$owner_uid' AND
ref_id = ttrss_entries.id AND ref_id = ttrss_entries.id AND
feed_id = ttrss_feeds.id $marked_qpart $unread_qpart"); feed_id = ttrss_feeds.id $marked_qpart $unread_qpart
ORDER BY ttrss_entries.id");
} else { } else {