From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 15:31:22 +0000 (+0000) Subject: feed-browser: include architecture selector X-Git-Tag: Release-2010-05/1~8868^2~222 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66f69d475f74260170e0703e670a9870ab087f29;p=openembedded.git feed-browser: include architecture selector --- diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 2532dd7c08..5549aa578d 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -129,6 +129,17 @@ function searchpkg ($searchword) } } + +function searchpkgarch ($searchword, $searcharch) +{ + if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' AND p_arch LIKE '$searcharch' ORDER BY p_name ASC")) + { + return generate_list_of_packages($result); + } +} + + + function generate_list_of_packages($query_result) { $ipkgoutput = "\n"; @@ -443,7 +454,7 @@ function check_database() f_name varchar(32), f_uri varchar(100), f_type varchar(16) - )"); + f_comments varchar(500))"); insert_feeds ($db) ; } diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php index 1c902ac66e..afa4c1a36a 100644 --- a/contrib/feed-browser/index.php +++ b/contrib/feed-browser/index.php @@ -49,6 +49,12 @@ if(isset($_GET['action'])) $action = $_GET['action']; } +if(isset($_GET['arch'])) +{ + $arch = $_GET['arch']; +} + + switch($action) { case "details": @@ -56,7 +62,12 @@ switch($action) break; case "search": - $ipkgoutput = searchpkg ("%{$name}%"); + if ( $arch == "" ) { + $ipkgoutput = searchpkg ("%{$name}%"); + } + else { + $ipkgoutput = searchpkgarch ("%{$name}%", "{$arch}"); + } break; case "section": @@ -65,8 +76,13 @@ switch($action) case "letter": $letter = $_GET['g']; - $ipkgoutput = searchpkg ("{$letter}%"); - break; + if ( $arch == "" ) { + $ipkgoutput = searchpkg ("{$letter}%"); + } + else { + $ipkgoutput = searchpkgarch ("{$letter}%", "{$arch}"); + } + break; default: $ipkgoutput = searchpkg("a"); @@ -89,6 +105,23 @@ switch($action)
+