use mysql_query_package_version() even more often

3 files changed, 11 insertions, 21 deletions

diff --git a/buildmaster/dependencies.php b/buildmaster/dependencies.php
index 1c81745..a8beb5d 100644
--- a/buildmaster/dependencies.php
+++ b/buildmaster/dependencies.php
@@ -135,10 +135,8 @@ $pkgfile_query =
   "CONCAT(".
     "`repositories`.`name`,\"/\"," .
     "`binary_packages`.`pkgname`,\"-\"," .
-    "IF(`binary_packages`.`epoch`=0,\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
-    "`binary_packages`.`pkgver`,\"-\"," .
-    "`binary_packages`.`pkgrel`,\".\"," .
-    "`binary_packages`.`sub_pkgrel`,\"-\"," .
+    mysql_query_package_version("binary_packages") .
+    ",\"-\"," .
     "`architectures`.`name`" .
   ") AS `filename`";
 
diff --git a/buildmaster/mysql-issues.php b/buildmaster/mysql-issues.php
index 0c27608..1397141 100644
--- a/buildmaster/mysql-issues.php
+++ b/buildmaster/mysql-issues.php
@@ -30,10 +30,8 @@ require_once BASE . "/lib/mysql.php";
     "`r_a`.`name`,\"/\"," .
     "`repositories`.`name`,\"/\"," .
     "`binary_packages`.`pkgname`,\"-\"," .
-    "IF(`binary_packages`.`epoch`=0,\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
-    "`binary_packages`.`pkgver`,\"-\"," .
-    "`binary_packages`.`pkgrel`,\".\"," .
-    "`binary_packages`.`sub_pkgrel`,\"-\"," .
+    mysql_query_package_version("binary_packages") .
+    ",\"-\"," .
     "`architectures`.`name`) AS `pkgfile`," .
     "`install_targets`.`name` AS `install_target`," .
     "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`," .
@@ -109,10 +107,8 @@ require_once BASE . "/lib/mysql.php";
     "`r_a`.`name`,\"/\"," .
     "`repositories`.`name`,\"/\"," .
     "`binary_packages`.`pkgname`,\"-\"," .
-    "IF(`binary_packages`.`epoch`=0,\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
-    "`binary_packages`.`pkgver`,\"-\"," .
-    "`binary_packages`.`pkgrel`,\".\"," .
-    "`binary_packages`.`sub_pkgrel`,\"-\"," .
+    mysql_query_package_version("binary_packages") .
+    ",\"-\"," .
     "`architectures`.`name`) AS `pkgfile`," .
     "`install_targets`.`name` AS `install_target`," .
     "`repository_stabilities`.`name` AS `stability`," .
diff --git a/packages/index.php b/packages/index.php
index d712423..1d3acca 100644
--- a/packages/index.php
+++ b/packages/index.php
@@ -129,10 +129,8 @@ require_once BASE . "/lib/format.php";
     "`package_sources`.`pkgbase`," .
     "CONCAT(`r_a`.`name`,\"/\",`repositories`.`name`) AS `repo`," .
     "`architectures`.`name` AS `arch`," .
-    "CONCAT(IF(`binary_packages`.`epoch`=\"0\",\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
-    "`binary_packages`.`pkgver`,\"-\"," .
-    "`binary_packages`.`pkgrel`,\".\"," .
-    "`binary_packages`.`sub_pkgrel`) AS `version`," .
+    mysql_query_package_version("binary_packages") .
+    " AS `version`," .
     "IF(`binary_packages`.`has_issues`,1,0) AS `has_issues`," .
     "`build_assignments`.`return_date` AS `build_date`," .
     "`binary_packages_in_repositories`.`last_moved` AS `move_date`," .
@@ -165,7 +163,7 @@ require_once BASE . "/lib/format.php";
     "pkgver" => array(
       "title" => "package version",
       "label" => "Version",
-      "mysql" => "CONCAT(`binary_packages`.`epoch`,\":\",`binary_packages`.`pkgver`,\"-\",`binary_packages`.`pkgrel`,\".\",`binary_packages`.`sub_pkgrel`)"
+      "mysql" => mysql_query_package_version("binary_packages")
     ),
     "bugs" => array(
       "title" => "bug status",
@@ -226,10 +224,8 @@ require_once BASE . "/lib/format.php";
     "`package_sources`.`pkgbase`," .
     "CONCAT(`r_a`.`name`,\"/\",`repositories`.`name`) AS `repo`," .
     "`architectures`.`name` AS `arch`," .
-    "CONCAT(IF(`binary_packages`.`epoch`=\"0\",\"\",CONCAT(`binary_packages`.`epoch`,\":\"))," .
-    "`binary_packages`.`pkgver`,\"-\"," .
-    "`binary_packages`.`pkgrel`,\".\"," .
-    "`binary_packages`.`sub_pkgrel`) AS `version`," .
+    mysql_query_package_version("binary_packages") .
+    " AS `version`," .
     "IF(`binary_packages`.`has_issues`,1,0) AS `has_issues`," .
     "`build_assignments`.`return_date` AS `build_date`," .
     "`binary_packages_in_repositories`.`last_moved` AS `move_date`," .