[oe-commits] org.oe.dev feed-browser: feeds has a type now: normal/upgrades.

[hrw commit]

feed-browser: feeds has a type now: normal/upgrades.
Type is used by updater to update only 'upgrades' feeds:
"php update.php upgrades"

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b7799ca5f38be5d5b31eafe3229e04bd95f48e05
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b7799ca5f38be5d5b31eafe3229e04bd95f48e05
Files:
1
contrib/feed-browser/includes/config.inc
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/update.php
Diffs:

#
# mt diff -r249b7bb84d2f217e9e03a60cdbeb55cc0d179e03 -rb7799ca5f38be5d5b31eafe3229e04bd95f48e05
#
# 
# 
# patch "contrib/feed-browser/includes/config.inc"
#  from [b9cc912cccd389ab3fd35b7e33a4d704448447bf]
#    to [9bcb9f854ff6728529de402c08d7094a7ca86dd5]
# 
# patch "contrib/feed-browser/includes/functions.inc"
#  from [482988de50e062c8bce4ddab1590bf8466fa5d8b]
#    to [f33374987037202cd21d7f82a93b7da3f0c573a9]
# 
# patch "contrib/feed-browser/update.php"
#  from [31b3a5f79c19f140ae0a4673c353ff7f7cbb2fb5]
#    to [0a6696349338576e60018f0f8fbbf645cec91913]
# 
============================================================
--- contrib/feed-browser/includes/config.inc	b9cc912cccd389ab3fd35b7e33a4d704448447bf
+++ contrib/feed-browser/includes/config.inc	9bcb9f854ff6728529de402c08d7094a7ca86dd5
@@ -11,50 +11,62 @@ $feeds = array(
 			array(
 				'name'=>'base',
 				'url'=>'base',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'opie',
 				'url'=>'opie',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'x11',
 				'url'=>'x11',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'upgrades',
 				'url'=>'upgrades',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'perl',
 				'url'=>'perl',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'python',
 				'url'=>'python',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'Collie upgrades',
 				'url'=>'upgrades/machine/collie',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'Tosa upgrades',
 				'url'=>'upgrades/machine/tosa',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'Poodle upgrades',
 				'url'=>'upgrades/machine/poodle',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'Poodle',
 				'url'=>'machine/poodle',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'Collie',
 				'url'=>'machine/collie',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'Tosa',
 				'url'=>'machine/tosa',
+				'type'=>'normal',
 			)
 		)
 	),
@@ -66,50 +78,62 @@ $feeds = array(
 			array(
 				'name'=>'base',
 				'url'=>'base',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'opie',
 				'url'=>'opie',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'perl',
 				'url'=>'perl',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'python',
 				'url'=>'python',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'upgrades',
 				'url'=>'upgrades',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'x11',
 				'url'=>'x11',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'C7x0',
 				'url'=>'machine/c7x0',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'Spitz',
 				'url'=>'machine/spitz',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'Akita',
 				'url'=>'machine/akita',
+				'type'=>'normal',
 			),
 			array(
 				'name'=>'Akita upgrades',
 				'url'=>'upgrades/machine/akita',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'C7x0 upgrades',
 				'url'=>'upgrades/machine/c7x0',
+				'type'=>'upgrades',
 			),
 			array(
 				'name'=>'Spitz upgrades',
 				'url'=>'upgrades/machine/spitz',
+				'type'=>'upgrades',
 			)
 		)
 	)
============================================================
--- contrib/feed-browser/includes/functions.inc	482988de50e062c8bce4ddab1590bf8466fa5d8b
+++ contrib/feed-browser/includes/functions.inc	f33374987037202cd21d7f82a93b7da3f0c573a9
@@ -85,11 +85,12 @@ function insert_feeds ($db) 
 		{
 			foreach($distro['feeds'] as $feed)
 			{
-				sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri) VALUES
+				sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri, f_type) VALUES
 					(
 						{$id},
 						'{$distro['distro_name']} {$distro['distro_version']} {$feed['name']}',
-						'{$distro['feed_base_url']}{$feed['url']}'
+						'{$distro['feed_base_url']}{$feed['url']}',
+						'{$feed['type']}'
 					)");
 
 				$id++;
@@ -441,7 +442,8 @@ function check_database()
 				f_id         int(8),
 				f_name       varchar(32),
 				f_uri        varchar(100),
-				f_comments   varchar(500))");
+				f_type		 varchar(16)
+		)");
 
 			insert_feeds ($db) ;
 		}
============================================================
--- contrib/feed-browser/update.php	31b3a5f79c19f140ae0a4673c353ff7f7cbb2fb5
+++ contrib/feed-browser/update.php	0a6696349338576e60018f0f8fbbf645cec91913
@@ -39,11 +39,16 @@ check_database();
 
 check_database();
 
+$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
+
+if($argc > 1 AND $argv[1] == 'upgrades')
+{
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'");
+}
+
 $start = time();
 $p_count = 0;
 
-$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
-
 foreach($feeds as $feed)
 {
     print("Updating {$feed['f_name']}: ");