From 15fe10f53b83794d42ff5d59b9006e21cc3f7652 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 25 Aug 2006 10:45:56 +0000
Subject: feed-browser: FIX: feed structure was changed - database NEED to be
 rebuilt - package.p_feed is now int -> feeds.f_id

---
 contrib/feed-browser/includes/config.inc    | 2 +-
 contrib/feed-browser/includes/functions.inc | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'contrib/feed-browser/includes')

diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index 1397d2c947..0a270a8eb0 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -1,6 +1,6 @@
 <?php
 
-define('DB_FILENAME', './feeds2.db');
+define('DB_FILENAME', './feeds.db');
 
 $feeds = array(
 	array(
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index 4edf3f4369..77afca6f5e 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -79,15 +79,20 @@ function insert_feeds ($db)
 
 	if(isset($feeds))
 	{
+		$id = 1;
+
 		foreach($feeds as $distro)
 		{
 			foreach($distro['feeds'] as $feed)
 			{
-				sqlite_query($db, "INSERT INTO feeds (f_name, f_uri) VALUES
+				sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri) VALUES
 					(
+						{$id},
 						'{$distro['distro_name']} {$distro['distro_version']} {$feed['name']}',
 						'{$distro['feed_base_url']}{$feed['url']}'
 					)");
+
+				$id++;
 			}
 		}
 	}
@@ -166,7 +171,7 @@ function pkgdetails ($package)
 {
 	$result = db_query("SELECT * FROM packages,feeds
 				WHERE (packages.p_name='$package' OR packages.p_provides='$package')
-				    AND feeds.f_name = packages.p_feed 
+				    AND feeds.f_id = packages.p_feed 
 				ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
 	
 	// display first result
-- 
cgit v1.2.3