diff options
| -rw-r--r-- | packages/index.php | 16 | ||||
| -rw-r--r-- | packages/pkginfo.php | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/index.php b/packages/index.php index d09d75f..cd1413d 100644 --- a/packages/index.php +++ b/packages/index.php @@ -50,9 +50,9 @@ $filter .= " AND NOT `binary_packages`.`has_issues`"; if ($_GET["del"] == "To Be Deleted") - $filter .= " AND `binary_packages`.`is_to_be_deleted`"; + $filter .= " AND `binary_packages_in_repositories`.`is_to_be_deleted`"; if ($_GET["del"] == "Not To Be Deleted") - $filter .= " AND NOT `binary_packages`.`is_to_be_deleted`"; + $filter .= " AND NOT `binary_packages_in_repositories`.`is_to_be_deleted`"; if (isset($_GET["q"])) { $exact_filter = " AND `binary_packages`.`pkgname` = from_base64(\"".base64_encode($_GET["q"])."\")"; @@ -84,8 +84,8 @@ "`binary_packages`.`sub_pkgrel`) AS `version`," . "IF(`binary_packages`.`has_issues`,1,0) AS `has_issues`," . "`build_assignments`.`return_date` AS `build_date`," . - "`binary_packages`.`last_moved` AS `move_date`," . - "IF(`binary_packages`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . + "`binary_packages_in_repositories`.`last_moved` AS `move_date`," . + "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . $query ); $exact_matches = array(); @@ -126,12 +126,12 @@ "move_date" => array( "title" => "last update", "label" => "Last Updated", - "mysql" => "IFNULL(`binary_packages`.`last_moved`,\"00-00-0000 00:00:00\")" + "mysql" => "IFNULL(`binary_packages_in_repositories`.`last_moved`,\"00-00-0000 00:00:00\")" ), "del" => array( "title" => "to be deleted", "label" => "Delete", - "mysql" => "`binary_packages`.`is_to_be_deleted`" + "mysql" => "`binary_packages_in_repositories`.`is_to_be_deleted`" ) ); @@ -175,8 +175,8 @@ "`binary_packages`.`sub_pkgrel`) AS `version`," . "IF(`binary_packages`.`has_issues`,1,0) AS `has_issues`," . "`build_assignments`.`return_date` AS `build_date`," . - "`binary_packages`.`last_moved` AS `move_date`," . - "IF(`binary_packages`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . + "`binary_packages_in_repositories`.`last_moved` AS `move_date`," . + "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . $query . " LIMIT " . (($page-1)*100) . ", 100" ); diff --git a/packages/pkginfo.php b/packages/pkginfo.php index 7c483f1..065d201 100644 --- a/packages/pkginfo.php +++ b/packages/pkginfo.php @@ -34,7 +34,7 @@ "`git_repositories`.`name` AS `git_repo`," . "`package_sources`.`uses_upstream`," . "`package_sources`.`uses_modification`," . - "`binary_packages`.`last_moved`" . + "`binary_packages_in_repositories`.`last_moved`" . " FROM `binary_packages`" . " JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`" . " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" . @@ -79,7 +79,7 @@ "\" \\\"repo\\\": \\\"\",`repositories`.`name`,\"\\\",\\n\"," . "\" \\\"arch\\\": \\\"\",`architectures`.`name`,\"\\\",\\n\"," . "\" \\\"pkgname\\\": \\\"\",`binary_packages`.`pkgname`,\"\\\",\\n\"," . - "\" \\\"is_to_be_deleted\\\": \\\"\",IF(`binary_packages`.`is_to_be_deleted`,\"1\",\"0\"),\"\\\"\\n\"," . + "\" \\\"is_to_be_deleted\\\": \\\"\",IF(`binary_packages_in_repositories`.`is_to_be_deleted`,\"1\",\"0\"),\"\\\"\\n\"," . "\"}\"" . ")) AS `deps`," . "`install_targets`.`name` AS `install_target`" . @@ -171,7 +171,7 @@ "`repositories`.`is_on_master_mirror`," . "`architectures`.`name` AS `arch`," . "`binary_packages`.`pkgname`," . - "IF(`binary_packages`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . + "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`" . " FROM `install_target_providers`" . " JOIN `install_targets` ON `install_targets`.`id`=`install_target_providers`.`install_target`" . " AND `install_targets`.`name` NOT IN (\"base\",\"base-devel\")" . @@ -218,7 +218,7 @@ $mysql_result = mysql_run_query( "SELECT " . "`binary_packages`.`pkgname` AS `pkgname`," . - "IF(`binary_packages`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`," . + "IF(`binary_packages_in_repositories`.`is_to_be_deleted`,1,0) AS `is_to_be_deleted`," . "`repositories`.`name` AS `repo`," . "`repositories`.`is_on_master_mirror`," . "`architectures`.`name` AS `arch`," . |