From 73936002f7d5685a9063683f68d4e8c2e01be0ac Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Thu, 17 Apr 2014 19:49:26 +0200 Subject: Store {make,check,opt}depends in the database In addition to parsing and storing dependencies of packages, store makedepends, checkdepends and optdepends. Every dependency (of any type) is displayed on the package details page. Signed-off-by: Lukas Fleischer --- web/lib/pkgfuncs.inc.php | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'web/lib/pkgfuncs.inc.php') diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c6b4a27..153e2a8 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -131,6 +131,21 @@ function pkg_dependencies($pkgid) { return $deps; } +/** + * Get the ID of a dependency type given its name + * + * @param string $name The name of the dependency type + * + * @return int The ID of the dependency type + */ +function pkg_dependency_type_id_from_name($name) { + $dbh = DB::connect(); + $q = "SELECT ID FROM DependencyTypes WHERE Name = "; + $q.= $dbh->quote($name); + $result = $dbh->query($q); + return $result->fetch(PDO::FETCH_COLUMN, 0); +} + /** * Determine packages that depend on a package * @@ -653,18 +668,20 @@ function pkg_create($base_id, $pkgname, $license, $pkgver, $pkgdesc, $pkgurl) { * Add a dependency for a specific package to the database * * @param int $pkgid The package ID to add the dependency for + * @param string $type The type of dependency to add * @param string $depname The name of the dependency to add * @param string $depcondition The type of dependency for the package * * @return void */ -function pkg_add_dep($pkgid, $depname, $depcondition) { +function pkg_add_dep($pkgid, $type, $depname, $depcondition) { $dbh = DB::connect(); - $q = sprintf("INSERT INTO PackageDepends (PackageID, DepName, DepCondition) VALUES (%d, %s, %s)", - $pkgid, - $dbh->quote($depname), - $dbh->quote($depcondition)); - + $q = sprintf("INSERT INTO PackageDepends (PackageID, DepTypeID, DepName, DepCondition) VALUES (%d, %d, %s, %s)", + $pkgid, + pkg_dependency_type_id_from_name($type), + $dbh->quote($depname), + $dbh->quote($depcondition) + ); $dbh->exec($q); } -- cgit v1.2.3-54-g00ecf