diff options
Diffstat (limited to 'contrib/feed-browser')
| -rw-r--r-- | contrib/feed-browser/includes/config.inc | 24 | ||||
| -rw-r--r-- | contrib/feed-browser/includes/functions.inc | 8 | ||||
| -rw-r--r-- | contrib/feed-browser/index.php | 26 | ||||
| -rw-r--r-- | contrib/feed-browser/update.php | 13 |
4 files changed, 59 insertions, 12 deletions
diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index 0a270a8eb0..e1999b066f 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -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', ) ) ) diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 4745c75910..2532dd7c08 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -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) ; } diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php index df7282db7d..1c902ac66e 100644 --- a/contrib/feed-browser/index.php +++ b/contrib/feed-browser/index.php @@ -35,6 +35,13 @@ require_once 'includes/functions.inc'; check_database(); +$name = ''; + +if(isset($_GET['name'])) +{ + $name = $_GET['name']; +} + $action = ''; if(isset($_GET['action'])) @@ -48,10 +55,8 @@ switch($action) $ipkgoutput = pkgdetails ($_GET['pnm']); break; - case "package": - $edit = $_POST['edit']; - $searchword = $edit['searchword']; - $ipkgoutput = searchpkg ("%$searchword%"); + case "search": + $ipkgoutput = searchpkg ("%{$name}%"); break; case "section": @@ -78,7 +83,18 @@ switch($action) <style type="text/css" media="all">@import "css/feed.css";</style> </head> <body > - <div id="right"><?php echo searchletter(); echo $ipkgoutput; ?></div> + <div id="right"> + <?php echo searchletter(); ?> + <form action="" method="get"> + <fieldset> + <label for="name">Package name</label> + <input type="text" name="name" value="<?php echo $name; ?>" /> + <input type="hidden" name="action" value="search" /> + <input type="submit" value="Search" /> + </fieldset> + </form> + <?php echo $ipkgoutput; ?> + </div> <div id="left"> <h1>Sections list</h1> <?php echo sectionslist(); ?> diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index 786e898494..ed67d3b78a 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -39,15 +39,20 @@ require_once 'includes/functions.inc'; 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']}: "); - db_query_n("DELETE FROM packages WHERE p_feed = '{$feed['f_name']}'"); + db_query_n("DELETE FROM packages WHERE p_feed = '{$feed['f_id']}'"); $count = 0; @@ -104,7 +109,7 @@ foreach($feeds as $feed) $package_info['conflicts'] = $value; break; case 'Section': - $package_info['section'] = $value; + $package_info['section'] = strtolower($value); break; case 'Architecture': $package_info['arch'] = $value; |