use mysql_query_package_version() even more often

1 files changed, 5 insertions, 9 deletions

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`," .