[oe-commits] org.oe.dev feed-browser: feeds adding improved, updater more silent
hrw commit
openembedded-commits at lists.openembedded.org
Fri Aug 25 10:58:30 UTC 2006
feed-browser: feeds adding improved, updater more silent
- includes/config.inc contain array with all feeds
- check_database() adds feeds if they are not present
- updater does not show feed URL
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: df229e8fdb521adfc364395363401a190529731c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df229e8fdb521adfc364395363401a190529731c
Files:
1
contrib/feed-browser/includes/config.inc
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php
Diffs:
#
# mt diff -r6651fb704192756bf7c80d213d5cb1e48a1541dd -rdf229e8fdb521adfc364395363401a190529731c
#
#
#
# add_file "contrib/feed-browser/includes/config.inc"
# content [90939bb1aee8cd268f77d95595e1ffa5883afc1b]
#
# patch "contrib/feed-browser/includes/functions.inc"
# from [ea5e0aac07bbfe62d662139e7603b067a56b99ed]
# to [1b66a4e8829b5f9cc196756c8771bc210cb3f705]
#
# patch "contrib/feed-browser/index.php"
# from [32b775d76e714c05a2cd6fa3a69801ffde3ac05f]
# to [8986ff1e5ad62fa9af0819b7ac2c25ba7e3cc4bc]
#
# patch "contrib/feed-browser/update.php"
# from [e5c87a5a24c8572e70d27e5d2f941ac4715e3221]
# to [b307949c960db63393f3fabf809c487c2232f205]
#
============================================================
--- contrib/feed-browser/includes/config.inc 90939bb1aee8cd268f77d95595e1ffa5883afc1b
+++ contrib/feed-browser/includes/config.inc 90939bb1aee8cd268f77d95595e1ffa5883afc1b
@@ -0,0 +1,118 @@
+<?php
+
+define('DB_FILENAME', './feeds2.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',
+ )
+ )
+ )
+);
+
+?>
============================================================
--- contrib/feed-browser/includes/functions.inc ea5e0aac07bbfe62d662139e7603b067a56b99ed
+++ contrib/feed-browser/includes/functions.inc 1b66a4e8829b5f9cc196756c8771bc210cb3f705
@@ -20,8 +20,6 @@ error_reporting(E_ALL);
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,24 @@ 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))
+ {
+ foreach($feeds as $distro)
+ {
+ foreach($distro['feeds'] as $feed)
+ {
+ sqlite_query($db, "INSERT INTO feeds (f_name, f_uri) VALUES
+ (
+ '{$distro['distro_name']} {$distro['distro_version']} {$feed['name']}',
+ '{$distro['feed_base_url']}{$feed['url']}'
+ )");
+ }
+ }
+ }
}
function searchletter($searchletter = '')
@@ -492,7 +425,7 @@ function check_database()
f_uri varchar(100),
f_comments varchar(500))");
- test_insert_ipkgs ($db) ;
+ insert_feeds ($db) ;
}
sqlite_close($db);
============================================================
--- contrib/feed-browser/index.php 32b775d76e714c05a2cd6fa3a69801ffde3ac05f
+++ contrib/feed-browser/index.php 8986ff1e5ad62fa9af0819b7ac2c25ba7e3cc4bc
@@ -30,6 +30,7 @@
*
*/
+require_once 'includes/config.inc';
require_once 'includes/functions.inc';
check_database();
============================================================
--- contrib/feed-browser/update.php e5c87a5a24c8572e70d27e5d2f941ac4715e3221
+++ contrib/feed-browser/update.php b307949c960db63393f3fabf809c487c2232f205
@@ -16,6 +16,7 @@
*
*/
+require_once 'includes/config.inc';
require_once 'includes/functions.inc';
/*
@@ -45,7 +46,7 @@ foreach($feeds as $feed)
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;
More information about the Openembedded-commits
mailing list