[oe-commits] org.oe.dev feed-browser: show links to all depends/provides/conflicts, show packages not only by Name: but also by Provides:

[hrw commit]

feed-browser: show links to all depends/provides/conflicts, show packages not only by Name: but also by Provides:

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

#
# mt diff -r043ace40a9327f7588e6e43bd3ee1516edbc972c -rcb284cc9ca4986d048f98c485b7aaed1e1a7ea27
#
# 
# 
# patch "contrib/feed-browser/index.php"
#  from [05218723e793268cd3bf247734b79680c4a99cba]
#    to [4d0c16d9f74b979379fb2505c2beea86b29c3b3d]
# 
============================================================
--- contrib/feed-browser/index.php	05218723e793268cd3bf247734b79680c4a99cba
+++ contrib/feed-browser/index.php	4d0c16d9f74b979379fb2505c2beea86b29c3b3d
@@ -288,7 +288,8 @@ function pkgdetails ($package)
 function pkgdetails ($package)
 {
 	$result = db_query("SELECT * FROM packages,feeds
-				WHERE packages.p_name='$package' AND feeds.f_name = packages.p_feed 
+				WHERE (packages.p_name='$package' OR packages.p_provides='$package')
+				    AND feeds.f_name = packages.p_feed 
 				ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
 	
 	// display first result
@@ -410,20 +411,17 @@ function addlinks ($input)
 function addlinks ($input)
 {
 	// split input elements up
-	$elements = preg_split ('/[\s,]+/', $input);
+	$elements = explode (', ', $input);
 
 	$offset = 0;
 
 	foreach ($elements as $element)
 	{
-		// skip version information and empty elements (shouldn't happend)
-		if (!eregi('^([0-9a-z\-]*)$', $element) OR empty($element))
-		{ 
-			continue;
-		}
+		// strip version number
+		$element = ereg_replace('^(.*)( \((.*)\))+$', '\\1', $element);
 
 		// do we have this package in the db?
-		$result =  db_query ("SELECT DISTINCT p_name FROM packages WHERE p_name='{$element}'");    
+		$result =  db_query ("SELECT DISTINCT p_name FROM packages WHERE p_name='{$element}' OR p_provides='{$element}'");    
 
 		if(isset($result[0]['p_name']))
 		{
@@ -443,7 +441,6 @@ function addlinks ($input)
 		}
 	}
 
-
 	return $input;
 }