[oe-commits] org.oe.dev feed-browser: FIX: feed structure was changed - database NEED to be rebuilt
hrw commit
openembedded-commits at lists.openembedded.org
Fri Aug 25 10:58:49 UTC 2006
feed-browser: FIX: feed structure was changed - database NEED to be rebuilt
- package.p_feed is now int -> feeds.f_id
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d9256d2a6f06908a4b219e63c0e662263d139874
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d9256d2a6f06908a4b219e63c0e662263d139874
Files:
1
contrib/feed-browser/includes/config.inc
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/update.php
Diffs:
#
# mt diff -re0b052b513b17e533813c5e89fcf251d1d8e6588 -rd9256d2a6f06908a4b219e63c0e662263d139874
#
#
#
# patch "contrib/feed-browser/includes/config.inc"
# from [90939bb1aee8cd268f77d95595e1ffa5883afc1b]
# to [b9cc912cccd389ab3fd35b7e33a4d704448447bf]
#
# patch "contrib/feed-browser/includes/functions.inc"
# from [1b66a4e8829b5f9cc196756c8771bc210cb3f705]
# to [5d994e28a93a23388c89b5a5e1e3e29076df1fde]
#
# patch "contrib/feed-browser/update.php"
# from [b307949c960db63393f3fabf809c487c2232f205]
# to [64abce9707b164c336b57e53595d56a6f0562719]
#
============================================================
--- contrib/feed-browser/includes/config.inc 90939bb1aee8cd268f77d95595e1ffa5883afc1b
+++ contrib/feed-browser/includes/config.inc b9cc912cccd389ab3fd35b7e33a4d704448447bf
@@ -1,6 +1,6 @@
<?php
-define('DB_FILENAME', './feeds2.db');
+define('DB_FILENAME', './feeds.db');
$feeds = array(
array(
============================================================
--- contrib/feed-browser/includes/functions.inc 1b66a4e8829b5f9cc196756c8771bc210cb3f705
+++ contrib/feed-browser/includes/functions.inc 5d994e28a93a23388c89b5a5e1e3e29076df1fde
@@ -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
============================================================
--- contrib/feed-browser/update.php b307949c960db63393f3fabf809c487c2232f205
+++ contrib/feed-browser/update.php 64abce9707b164c336b57e53595d56a6f0562719
@@ -42,7 +42,7 @@ $p_count = 0;
$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)
{
@@ -59,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))
{
@@ -75,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'=>''
);
}
@@ -161,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']}',
@@ -169,7 +169,7 @@ function insert_ipkgs(&$package_info)
'{$package_info['md5sum']}', '{$package_info['source']}',
'{$package_info['feed']}', '{$package_info['file']}',
'{$package_info['desc']}'
- )");
+ )");
}
?>
More information about the Openembedded-commits
mailing list