merge of 08b0e7058f8944b597207b5f969021dea13443c9

     and d9256d2a6f06908a4b219e63c0e662263d139874

4 files changed, 149 insertions, 91 deletions

diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
new file mode 100644
index 0000000000..0a270a8eb0
--- /dev/null
+++ b/contrib/feed-browser/includes/config.inc
@@ -0,0 +1,118 @@
+<?php
+
+define('DB_FILENAME', './feeds.db');
+
+$feeds = array(
+	array(
+		'distro_name'=>'OpenZaurus', 
+		'distro_version'=>'3.5.4',
+		'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/',
+		'feeds'=>array(
+			array(
+				'name'=>'base',
+				'url'=>'base',
+			),
+			array(
+				'name'=>'opie',
+				'url'=>'opie',
+			),
+			array(
+				'name'=>'x11',
+				'url'=>'x11',
+			),
+			array(
+				'name'=>'upgrades',
+				'url'=>'upgrades',
+			),
+			array(
+				'name'=>'perl',
+				'url'=>'perl',
+			),
+			array(
+				'name'=>'python',
+				'url'=>'python',
+			),
+			array(
+				'name'=>'Collie upgrades',
+				'url'=>'upgrades/machine/collie',
+			),
+			array(
+				'name'=>'Tosa upgrades',
+				'url'=>'upgrades/machine/tosa',
+			),
+			array(
+				'name'=>'Poodle upgrades',
+				'url'=>'upgrades/machine/poodle',
+			),
+			array(
+				'name'=>'Poodle',
+				'url'=>'machine/poodle',
+			),
+			array(
+				'name'=>'Collie',
+				'url'=>'machine/collie',
+			),
+			array(
+				'name'=>'Tosa',
+				'url'=>'machine/tosa',
+			)
+		)
+	),
+	array(
+		'distro_name'=>'OpenZaurus', 
+		'distro_version'=>'3.5.4.1',
+		'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/',
+		'feeds'=>array(
+			array(
+				'name'=>'base',
+				'url'=>'base',
+			),
+			array(
+				'name'=>'opie',
+				'url'=>'opie',
+			),
+			array(
+				'name'=>'perl',
+				'url'=>'perl',
+			),
+			array(
+				'name'=>'python',
+				'url'=>'python',
+			),
+			array(
+				'name'=>'upgrades',
+				'url'=>'upgrades',
+			),
+			array(
+				'name'=>'x11',
+				'url'=>'x11',
+			),
+			array(
+				'name'=>'C7x0',
+				'url'=>'machine/c7x0',
+			),
+			array(
+				'name'=>'Spitz',
+				'url'=>'machine/spitz',
+			),
+			array(
+				'name'=>'Akita',
+				'url'=>'machine/akita',
+			),
+			array(
+				'name'=>'Akita upgrades',
+				'url'=>'upgrades/machine/akita',
+			),
+			array(
+				'name'=>'C7x0 upgrades',
+				'url'=>'upgrades/machine/c7x0',
+			),
+			array(
+				'name'=>'Spitz upgrades',
+				'url'=>'upgrades/machine/spitz',
+			)
+		)
+	)
+);
+
+?>
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index d18b129650..77afca6f5e 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -20,8 +20,6 @@
 
 error_reporting(E_ALL);
 
-define('DB_FILENAME', './feeds.db');
-
 function db_query($query)
 {
     $result = FALSE;
@@ -36,7 +34,6 @@ function db_query($query)
     return $result;
 }
 
-
 function db_query_n($query)
 {
     $result = FALSE;
@@ -76,88 +73,29 @@ function db_table_exists ($db, $mytable)
 	return FALSE;
 }
 
-function test_insert_ipkgs ($db) 
+function insert_feeds ($db) 
 {
+	global $feeds;
 
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,           f_uri)
-		VALUES             ('3541-base',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/base')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-opie',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/opie')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-perl',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/perl')
-		");
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-python',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/python')
-		");
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-upgrades',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/upgrades')
-		");
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-x11',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/x11')
-		");
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-machine-c7x0',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/machine/c7x0')
-		");
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-machine-spitz',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/machine/spitz')
-		");
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-machine-akita',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/machine/akita')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-upgrades-machine-akita',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/upgrades/machine/akita')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-upgrades-machine-c7x0',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/upgrades/machine/c7x0')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-upgrades-machine-spitz',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/upgrades/machine/spitz')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('3541-upgrades-machine-tosa',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/upgrades/machine/tosa')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,           f_uri)
-		VALUES             ('354-base',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/base')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('354-opie',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/opie')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('354-x11',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/x11')
-		");
-
-	sqlite_query($db,
-		"INSERT INTO feeds (f_name,             f_uri)
-		VALUES             ('354-upgrades',    'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/upgrades')
-		");
+	if(isset($feeds))
+	{
+		$id = 1;
 
+		foreach($feeds as $distro)
+		{
+			foreach($distro['feeds'] as $feed)
+			{
+				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++;
+			}
+		}
+	}
 }
 
 function searchletter($searchletter = '')
@@ -233,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
@@ -492,7 +430,7 @@ function check_database()
 				f_uri        varchar(100),
 				f_comments    varchar(500))");
 
-			test_insert_ipkgs ($db) ;
+			insert_feeds ($db) ;
 		}
 
 		sqlite_close($db);
diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php
index b3fb41bcd8..df7282db7d 100644
--- a/contrib/feed-browser/index.php
+++ b/contrib/feed-browser/index.php
@@ -30,6 +30,7 @@
  *
  */
 
+require_once 'includes/config.inc';
 require_once 'includes/functions.inc';
 
 check_database();
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index ed7d6e47ef..786e898494 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -16,6 +16,7 @@
  *              
  */         
 
+require_once 'includes/config.inc';
 require_once 'includes/functions.inc';
 
 /*
@@ -41,11 +42,11 @@ check_database();
 $start = time();
 $p_count = 0;
 
-$feeds = db_query("SELECT f_name, f_uri FROM feeds");
+$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
 
 foreach($feeds as $feed)
 {
-    print("Updating {$feed['f_name']}: {$feed['f_uri']}: ");
+    print("Updating {$feed['f_name']}: ");
     db_query_n("DELETE FROM packages WHERE p_feed = '{$feed['f_name']}'");
 
     $count = 0;
@@ -58,8 +59,8 @@ foreach($feeds as $feed)
 	    'name'=>'', 'version'=>'', 'arch'=>'', 'depends'=>'', 
 	    'maintainer'=>'',  'homepage'=>'',  'section'=>'',  'replaces'=>'', 
 	    'provides'=>'', 'recommends'=>'', 'conflicts'=>'', 'size'=>'',  
-	    'md5sum'=>'', 'source'=>'', 'feed'=>'', 'file'=>'', 'desc'=>''
-	    );
+	    'md5sum'=>'', 'source'=>'', 'feed'=>$feed['f_id'], 'file'=>'', 'desc'=>''
+	);
 
 	while (!feof($packagesgz_h)) 
 	{
@@ -74,7 +75,7 @@ foreach($feeds as $feed)
 		    'name'=>'', 'version'=>'', 'arch'=>'', 'depends'=>'', 
 		    'maintainer'=>'',  'homepage'=>'',  'section'=>'',  'replaces'=>'', 
 		    'provides'=>'', 'recommends'=>'', 'conflicts'=>'', 'size'=>'',  
-		    'md5sum'=>'', 'source'=>'', 'feed'=>'', 'file'=>'', 'desc'=>''
+		    'md5sum'=>'', 'source'=>'', 'feed'=>$feed['f_id'], 'file'=>'', 'desc'=>''
 		);
 	    }
 
@@ -160,7 +161,7 @@ function insert_ipkgs(&$package_info)
 {
     db_query_n("INSERT INTO packages VALUES (
 	'{$package_info['name']}', '{$package_info['version']}',
-       	'{$package_info['arch']}', '{$package_info['depends']}',
+	'{$package_info['arch']}', '{$package_info['depends']}',
 	'{$package_info['maintainer']}',  '{$package_info['homepage']}',
 	'{$package_info['section']}',  '{$package_info['replaces']}',
 	'{$package_info['provides']}', '{$package_info['recommends']}',
@@ -168,7 +169,7 @@ function insert_ipkgs(&$package_info)
 	'{$package_info['md5sum']}', '{$package_info['source']}',
 	'{$package_info['feed']}', '{$package_info['file']}',
 	'{$package_info['desc']}'
-	)");
+    )");
 }
 
 ?>