summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-07-27 18:22:08 +0200
committerRemi Collet <fedora@famillecollet.com>2014-07-27 18:22:08 +0200
commitd699795fb839bded96c4f92c24df4eca7d029f57 (patch)
treebb482f6438a638f9a7e3a461f613748f2d1b95fa
parent7ec0a6cdb038b205b7102165556c70b1c0b2e2eb (diff)
display composer name in package form
-rw-r--r--zoom.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/zoom.php b/zoom.php
index 0f2b537..8e5dee6 100644
--- a/zoom.php
+++ b/zoom.php
@@ -95,9 +95,10 @@ if ( !isset($name) || !$name ) {
$uptable = new TableUpstream($db);
// Consider each part of ver/rel as integer except second part of rel (generally distro name)
- $sql = "SELECT rpm.*, repo.active, repo.url as repourl,
+ $sql = "SELECT rpm.*, repo.active, repo.url as repourl, packagist.pkgname,
CONCAT(repo.url ,rpm.name,'-',rpm.ver,'-',rpm.rel,'.src.rpm') as rpmurl
FROM rpm
+ LEFT JOIN packagist ON (packagist.rpmname=rpm.name)
INNER JOIN repo ON (repo.main=rpm.repo_main AND repo.sub=rpm.repo_sub)
WHERE rpm.name='$name'
ORDER BY repo.id DESC,
@@ -143,7 +144,9 @@ if ( !isset($name) || !$name ) {
if ($up && $up['type']) {
$summary['Type'] = $up['type'];
}
- if ($up && $up['channel']) {
+ if ($rpm->pkgname) {
+ $summary['Composer name'] = $rpm->pkgname;
+ } else if ($up && $up['channel']) {
$summary['Channel'] = $up['channel'];
}
if ($up && $up['stable']) {