[oe-commits] org.oe.dev feed-browser: include architecture selector

[hrw commit]

feed-browser: include architecture selector

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

#
# mt diff -r5f6bdd724d23a961c97567e1765db207fdad93f0 -r8a3c7a06c42b4765110f73e29f5adcee8821f26d
#
# 
# 
# patch "contrib/feed-browser/includes/functions.inc"
#  from [f33374987037202cd21d7f82a93b7da3f0c573a9]
#    to [00b38445616cb5505cc4fa1ab8e88eea0447a79d]
# 
# patch "contrib/feed-browser/index.php"
#  from [0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf]
#    to [08c6c70653597fff910d55ac9dc7447ecb7ba9e2]
# 
============================================================
--- contrib/feed-browser/includes/functions.inc	f33374987037202cd21d7f82a93b7da3f0c573a9
+++ contrib/feed-browser/includes/functions.inc	00b38445616cb5505cc4fa1ab8e88eea0447a79d
@@ -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 = "<table>\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) ;
 		}
============================================================
--- contrib/feed-browser/index.php	0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf
+++ contrib/feed-browser/index.php	08c6c70653597fff910d55ac9dc7447ecb7ba9e2
@@ -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)
 				<fieldset>
 					<label for="name">Package name</label>
 					<input type="text" name="name" value="<?php echo $name; ?>" />
+					<select name="arch">
+					   <option value="" selected="selected">all architectures</option>
+					   <option value="all">noarch</option>
+					   <option value="arm-oabi">arm OABI</option>
+					   <option value="armv4t">armv4t EABI</option>
+					   <option value="armv5te">armv5te EABI</option>
+					   <option value="armv5teb">armv5teb EABI</option>
+					   <option value="armv6">armv6 EABI</option>
+					   <option value="avr32">avr32</option>
+					   <option value="bfin">blackfin</option>
+					   <option value="i486">i486</option>
+					   <option value="i586">i586</option>
+					   <option value="i686">i686</option>
+					   <option value="iwmmxt">iwmmxt</option>
+					   <option value="ppc603e">ppc603e</option>
+					   <option value="sparc">sparc</option>
+					</select>
 					<input type="hidden" name="action" value="search" />
 					<input type="submit" value="Search" />
 				</fieldset>