January 2009 - Aur-dev - lists.archlinux.org

[aur-dev] [Less]/[More] buttons
by Gergely Imreh 23 Jan '09

23 Jan '09

Hi, I noticed that after the page number navigation I sent in was included, the [Less]/[More] buttons were removed from the template. I think I meant my change to supplement the way people can navigate, not replace. When you are looking for something specific, then the page numbers can be useful. On the other hand when someone is just browsing through a lot of results (e.g. checking all the orphan packages which one to adopt), then the [less]/[more] buttons are useful, since they always stay at the same position. Thus while navigating, one does not have to move the mouse, just PgDown...PgDown...Click (repeat). Since it we already have to code to make it work, I propose to put them back on the site. What do you think? The removal as based on purely aesthetic choice, or was there anything else behind it? Cheers, Greg

2 4

[aur-dev] FS#12791 - Faster navigation withing package search listing by page numbers
by Gergely Imreh 20 Jan '09

20 Jan '09

Hi, I attach two proposed patches (one functional, one aesthetic) for the above feature request. The first one adds page numbering functionality to the pkg_search_results template. The second one switches the order of the "Legend" field and the "Showing results: ...", since it seem to make more sense like that if there's page numbering. Let me know what you think of it, or if it should be implemented in another way. I only checked it with operating the site with the current buttons (search, more, less), no manual setting of the parameters in the URL. Cheers, Greg

2 2

[aur-dev] [Patch] FS#12698
by Gergely Imreh 15 Jan '09

15 Jan '09

Hi, Attached is a proposed fix to AUR bug #12698. I tested it with the official kernel26 PKGBUILD (among others) that would show this bug in the current version. Cheers, Greg

3 4

[aur-dev] [PATCH] Cache all front page stats in APC if available
by Dan McGee 10 Jan '09

10 Jan '09

Use the APC cache to store all of the counts and the recently updated package list in a cache, which cuts down on the number of database queries needed. If the data isn't perfectly up to date we will survive. This version of the patch will also cache the relevant counts for individual logged-in users and is more careful about checking whether the value actually exists in the cache by using the status reference to apc_fetch(). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Sorry I keep tweaking this patch, but I've extensively tested this version locally with APC both on and off and it seems to work quite well. We even cache some user-specific stuff now for what its worth. Since our cache expires relatively quickly, this isn't going to be a used a lot but when it is it will save some database load. -Dan web/lib/stats.inc | 53 +++++++++++++++++++++++----------- web/template/stats/updates_table.php | 5 +-- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/web/lib/stats.inc b/web/lib/stats.inc index 6fbc033..e2b7f90 100644 --- a/web/lib/stats.inc +++ b/web/lib/stats.inc @@ -2,10 +2,39 @@ include_once('aur.inc'); +# Check if APC extension is loaded +if (!defined('EXTENSION_LOADED_APC')) + define('EXTENSION_LOADED_APC', extension_loaded('apc')); +$apc_prefix = 'aur:'; + +# run a simple db query, retrieving and/or caching the value if APC +# is available for use +# +function db_cache_value($dbq, $dbh, $key) +{ + if(!(EXTENSION_LOADED_APC && ($ret = apc_fetch($key)))) { + $result = db_query($dbq, $dbh); + $row = mysql_fetch_row($result); + $ret = $row[0]; + # set the TTL here in seconds: 300 seconds = 5 minutes + apc_store($key, $ret, 300); + } + return $ret; +} + function updates_table($dbh) { - $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; - $newest_packages = db_query($q, $dbh); + $key = $apc_prefix . 'recent_updates'; + if(!(EXTENSION_LOADED_APC && ($newest_packages = apc_fetch($key)))) { + $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; + $result = db_query($q, $dbh); + + $newest_packages = new ArrayObject(); + while ($row = mysql_fetch_assoc($result)) { + $newest_packages->append($row); + } + apc_store($key, $newest_packages, 300); + } include('stats/updates_table.php'); } @@ -42,30 +71,20 @@ function general_stats_table($dbh) { # AUR statistics $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'unsupported'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $unsupported_count = $row[0]; + $unsupported_count = db_cache_value($q, $dbh, $apc_prefix . 'unsupported_count'); $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'community'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $community_count = $row[0]; + $community_count = db_cache_value($q, $dbh, $apc_prefix . 'community_count'); $q = "SELECT count(*) from Users"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $user_count = $row[0]; + $user_count = db_cache_value($q, $dbh, $apc_prefix . 'user_count'); $q = "SELECT count(*) from Users,AccountTypes WHERE Users.AccountTypeID = AccountTypes.ID AND AccountTypes.AccountType = 'Trusted User'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $tu_count = $row[0]; + $tu_count = db_cache_value($q, $dbh, $apc_prefix . 'tu_count'); $targstamp = intval(strtotime("-7 days")); $q = "SELECT count(*) from Packages WHERE (Packages.SubmittedTS >= $targstamp OR Packages.ModifiedTS >= $targstamp)"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $update_count = $row[0]; + $update_count = db_cache_value($q, $dbh, $apc_prefix . 'update_count'); include('stats/general_stats_table.php'); } diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index e1eb888..9d1af01 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -6,8 +6,7 @@ </th> </tr> -<?php while ($row = mysql_fetch_assoc($newest_packages)): ?> - +<?php foreach ($newest_packages->getIterator() as $row): ?> <tr> <td class="boxSoft"> <span class="f4"><span class="blue"> @@ -34,7 +33,7 @@ endif; </td> </tr> -<?php endwhile; ?> +<?php endforeach; ?> </table> -- 1.6.1

3 4

[aur-dev] yet another turkish translation fix
by Samed Beyribey 09 Jan '09

09 Jan '09

Hello, I've added two sentences to the turkish translation: Some packages may be provided as binaries in [community]. and Unsupported packages are user produced content. Any use of the provided files is at your own risk. and fixed 2 small typos. Could someone push it, please? Regards, Samed.

2 1

[aur-dev] [PATCH 1/2] Move package comments to a template.
by Loui Chang 06 Jan '09

06 Jan '09

Change layout in the process. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/lib/pkgfuncs.inc | 69 ++++++---------------------------------- web/template/pkg_comments.php | 38 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 58 deletions(-) create mode 100644 web/template/pkg_comments.php diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 9535f18..b6e93c5 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -524,71 +524,24 @@ function package_details($id=0, $SID="") { } echo " </form>\n"; + echo "<br />\n"; + + # Add Comments + echo "<form action='pkgedit.php' method='post'>\n"; + echo "<input type='hidden' name='ID' value='".$row["ID"]."'>\n"; + echo "<input type='submit' class='button' name='add_Comment' value=\""; + echo __("Add Comment")."\">\n"; + echo "</form>\n"; echo " </div>\n"; echo "</div>\n"; - echo "\n<br />\n\n"; + echo "\n<br />"; } - # Comments - # - echo "<div class=\"pgbox\">\n"; - echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Comments")."</span></div>\n"; - echo " <div class=\"pgboxbody-comment\">\n"; - echo " <table width='100%'>\n"; - if (isset($_COOKIE['AURSID'])) { - echo "<tr><td>"; - echo " <form action='pkgedit.php' method='post'>\n"; - echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n"; - echo " <input type='submit' class='button' name='add_Comment' value=\""; - echo __("Add Comment")."\">\n"; - echo " </form>\n"; - echo "</tr></td>"; - //echo "<br />\n"; - } + # Print Comments $comments = package_comments($row["ID"]); if (!empty($comments)) { - while (list($indx, $carr) = each($comments)) { - - echo " <tr>\n"; - echo " <td valign='top' style='padding-right: 10' colspan='2'>\n"; - echo " <table class='boxSoft' width='100%'>\n"; - echo " <tr>\n"; - echo " <td class='boxSoftTitle'><span class='f3'>"; - if (canDeleteComment($carr["ID"], $atype, $SID)) { - $durl = "<a href='pkgedit.php?del_Comment=1"; - $durl.= "&comment_id=".$carr["ID"]."&ID=".$row["ID"]; - $durl.= "'><img src='/images/x.png' border='0'"; - $durl.= " alt=\"".__("Delete comment")."\"></a>"; - - echo $durl . "  "; - } - if ($SID) { - echo __("Comment by: %h%s%h on %h%s%h", - array("<a href='account.php?Action=AccountInfo&ID=".$carr["UsersID"]."'><b>",$carr["UserName"],"</b></a>", - "<i>",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"</i>")); - } else { - echo __("Comment by: %h%s%h on %h%s%h", - array("<b>",$carr["UserName"],"</b>", - "<i>",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"</i>")); - } - echo "</span></td>\n"; - echo " </tr>\n"; - echo " <tr>\n"; - echo " <td class='boxSoft'>"; - echo "<code>\n"; - echo nl2br(htmlspecialchars($carr["Comments"])); - echo "</code></td>\n"; - echo " </tr>\n"; - echo " </table>\n"; - echo " </td>\n"; - echo " </tr>\n"; - } - } else { - print "<tr><td>None</td></tr>\n"; + include('pkg_comments.php'); } - echo " </table>\n"; - echo " </div>\n"; - echo "</div>\n"; } } return; diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php new file mode 100644 index 0000000..7bcf708 --- /dev/null +++ b/web/template/pkg_comments.php @@ -0,0 +1,38 @@ +<div class="pgbox"> +<table width="100%"> +<?php while (list($indx, $carr) = each($comments)) { ?> + <tr class='boxSoft'> + <td class='boxSoftTitle' valign='top' style='padding-right: 10' colspan='2'> + <span class='f3'> +<?php + if (canDeleteComment($carr['ID'], $atype, $SID)) { + $durl = '<a href="pkgedit.php?del_Comment=1'; + $durl.= '&comment_id=' . $carr['ID'] . '&ID=' . $row['ID']; + $durl.= '"><img src="images/x.png" border="0"'; + $durl.= ' alt="' . __("Delete comment") . '"></a> '; + + echo $durl; + } + if ($SID) { + echo __("Comment by: %h%s%h on %s", + "<a href='account.php?Action=AccountInfo&ID=".$carr["UsersID"]."'><b>", + $carr["UserName"], "</b></a>", gmdate("Y m d [H:i:s]", $carr["CommentTS"])); + } else { + echo __("Comment by: %h%s%h on %s", + "<b>", $carr["UserName"], "</b>", + gmdate("Y m d [H:i:s]", $carr["CommentTS"])); + } +?> + </span> + </td> + </tr> + <tr> + <td class="boxSoft"> + <pre><?php echo htmlspecialchars($carr["Comments"]) ?></pre> + </td> + </tr> +<?php +} +?> +</table> +</div> -- 1.6.1

1 2

[aur-dev] [PATCH 3/5] Cache all front page stats in APC if available
by Dan McGee 05 Jan '09

05 Jan '09

Use the APC cache to store all of the counts and the recently updated package list in a cache, which cuts down on the number of database queries needed. If the data isn't perfectly up to date we will survive. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/stats.inc | 52 +++++++++++++++++++++++----------- web/template/stats/updates_table.php | 5 +-- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/web/lib/stats.inc b/web/lib/stats.inc index 6fbc033..deb246e 100644 --- a/web/lib/stats.inc +++ b/web/lib/stats.inc @@ -2,10 +2,38 @@ include_once('aur.inc'); +# Check if APC extension is loaded +if (!defined('EXTENSION_LOADED_APC')) + define('EXTENSION_LOADED_APC', extension_loaded('apc')); + +# run a simple db query, retrieving and/or caching the value if APC +# is available for use +# +function db_cache_value($dbq, $dbh, $key) +{ + if(!(EXTENSION_LOADED_APC && ($ret = apc_fetch($key)))) { + $result = db_query($dbq, $dbh); + $row = mysql_fetch_row($result); + $ret = $row[0]; + # set the TTL here in seconds: 300 seconds = 5 minutes + apc_store($key, $ret, 300); + } + return $ret; +} + function updates_table($dbh) { - $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; - $newest_packages = db_query($q, $dbh); + $key = 'aur_recent_updates'; + if(!(EXTENSION_LOADED_APC && ($newest_packages = apc_fetch($key)))) { + $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; + $result = db_query($q, $dbh); + + $newest_packages = new ArrayObject(); + while ($row = mysql_fetch_assoc($result)) { + $newest_packages->append($row); + } + apc_store($key, $newest_packages, 300); + } include('stats/updates_table.php'); } @@ -42,30 +70,20 @@ function general_stats_table($dbh) { # AUR statistics $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'unsupported'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $unsupported_count = $row[0]; + $unsupported_count = db_cache_value($q, $dbh, 'aur_unsupported_count'); $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'community'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $community_count = $row[0]; + $community_count = db_cache_value($q, $dbh, 'aur_community_count'); $q = "SELECT count(*) from Users"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $user_count = $row[0]; + $user_count = db_cache_value($q, $dbh, 'aur_user_count'); $q = "SELECT count(*) from Users,AccountTypes WHERE Users.AccountTypeID = AccountTypes.ID AND AccountTypes.AccountType = 'Trusted User'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $tu_count = $row[0]; + $tu_count = db_cache_value($q, $dbh, 'aur_tu_count'); $targstamp = intval(strtotime("-7 days")); $q = "SELECT count(*) from Packages WHERE (Packages.SubmittedTS >= $targstamp OR Packages.ModifiedTS >= $targstamp)"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $update_count = $row[0]; + $update_count = db_cache_value($q, $dbh, 'aur_update_count'); include('stats/general_stats_table.php'); } diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index e1eb888..9d1af01 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -6,8 +6,7 @@ </th> </tr> -<?php while ($row = mysql_fetch_assoc($newest_packages)): ?> - +<?php foreach ($newest_packages->getIterator() as $row): ?> <tr> <td class="boxSoft"> <span class="f4"><span class="blue"> @@ -34,7 +33,7 @@ endif; </td> </tr> -<?php endwhile; ?> +<?php endforeach; ?> </table> -- 1.6.1

3 6

[aur-dev] [PATCH 3/3] Cache all front page stats in APC if available
by Dan McGee 02 Jan '09

02 Jan '09

Use the APC cache to store all of the counts and the recently updated package list in a cache, which cuts down on the number of database queries needed. If the data isn't perfectly up to date we will survive. This version of the patch will also cache the relevant counts for individual logged-in users and is more careful about checking whether the value actually exists in the cache by using the status reference to apc_fetch(). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/stats.inc | 85 ++++++++++++++++++++++------------ web/template/stats/updates_table.php | 5 +- 2 files changed, 58 insertions(+), 32 deletions(-) diff --git a/web/lib/stats.inc b/web/lib/stats.inc index 6fbc033..986d9df 100644 --- a/web/lib/stats.inc +++ b/web/lib/stats.inc @@ -2,37 +2,73 @@ include_once('aur.inc'); +# Check if APC extension is loaded +if (!defined('EXTENSION_LOADED_APC')) + define('EXTENSION_LOADED_APC', extension_loaded('apc')); +$apc_prefix = 'aur:'; + +# run a simple db query, retrieving and/or caching the value if APC +# is available for use +# +function db_cache_value($dbq, $dbh, $key) +{ + $bool = false; + if(EXTENSION_LOADED_APC) { + $ret = apc_fetch($key, $bool); + } + if(!$bool) { + $result = db_query($dbq, $dbh); + $row = mysql_fetch_row($result); + $ret = $row[0]; + if(EXTENSION_LOADED_APC) { + # set the TTL here in seconds: 300 seconds = 5 minutes + apc_store($key, $ret, 300); + } + } + return $ret; +} + function updates_table($dbh) { - $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; - $newest_packages = db_query($q, $dbh); + global $apc_prefix; + $key = $apc_prefix . 'recent_updates'; + if(!(EXTENSION_LOADED_APC && ($newest_packages = apc_fetch($key)))) { + $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10'; + $result = db_query($q, $dbh); + + $newest_packages = new ArrayObject(); + while ($row = mysql_fetch_assoc($result)) { + $newest_packages->append($row); + } + if(EXTENSION_LOADED_APC) { + apc_store($key, $newest_packages, 300); + } + } include('stats/updates_table.php'); } function user_table($user, $dbh) { - + global $apc_prefix; + $escuser = mysql_real_escape_string($user); $base_q = 'SELECT count(*) FROM Packages,PackageLocations,Users WHERE Packages.MaintainerUID = Users.ID AND Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = "%s" AND Users.Username="' . - mysql_real_escape_string($user).'"'; + $escuser.'"'; - $result = db_query(sprintf($base_q, 'unsupported'), $dbh); - $row = mysql_fetch_row($result); - $maintainer_unsupported_count = $row[0]; + $maintainer_unsupported_count = db_cache_value(sprintf($base_q, 'unsupported'), $dbh, + $apc_prefix . 'user_unsupported_count:' . $escuser); $q = "SELECT count(*) FROM Packages,Users WHERE Packages.OutOfDate = 1 AND Packages.MaintainerUID = Users.ID AND Users.Username='" . - mysql_real_escape_string($user)."'"; + $escuser."'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $flagged_outdated = $row[0]; + $flagged_outdated = db_cache_value($q, $dbh, + $apc_prefix . 'user_flagged_outdated:' . $escuser); # If the user is a TU calculate the number of the packages $atype = account_from_sid($_COOKIE["AURSID"]); if (($atype == 'Trusted User') || ($atype == 'Developer')) { - $result = db_query(sprintf($base_q, 'community'), $dbh); - $row = mysql_fetch_row($result); - $maintainer_community_count = $row[0]; + $maintainer_community_count = db_cache_value(sprintf($base_q, 'community'), $dbh, + $apc_prefix . 'user_community_count:' . $escuser); } include('stats/user_table.php'); @@ -40,32 +76,23 @@ function user_table($user, $dbh) function general_stats_table($dbh) { + global $apc_prefix; # AUR statistics $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'unsupported'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $unsupported_count = $row[0]; + $unsupported_count = db_cache_value($q, $dbh, $apc_prefix . 'unsupported_count'); $q = "SELECT count(*) FROM Packages,PackageLocations WHERE Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'community'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $community_count = $row[0]; + $community_count = db_cache_value($q, $dbh, $apc_prefix . 'community_count'); $q = "SELECT count(*) from Users"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $user_count = $row[0]; + $user_count = db_cache_value($q, $dbh, $apc_prefix . 'user_count'); $q = "SELECT count(*) from Users,AccountTypes WHERE Users.AccountTypeID = AccountTypes.ID AND AccountTypes.AccountType = 'Trusted User'"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $tu_count = $row[0]; + $tu_count = db_cache_value($q, $dbh, $apc_prefix . 'tu_count'); $targstamp = intval(strtotime("-7 days")); $q = "SELECT count(*) from Packages WHERE (Packages.SubmittedTS >= $targstamp OR Packages.ModifiedTS >= $targstamp)"; - $result = db_query($q, $dbh); - $row = mysql_fetch_row($result); - $update_count = $row[0]; + $update_count = db_cache_value($q, $dbh, $apc_prefix . 'update_count'); include('stats/general_stats_table.php'); } diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index e1eb888..9d1af01 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -6,8 +6,7 @@ </th> </tr> -<?php while ($row = mysql_fetch_assoc($newest_packages)): ?> - +<?php foreach ($newest_packages->getIterator() as $row): ?> <tr> <td class="boxSoft"> <span class="f4"><span class="blue"> @@ -34,7 +33,7 @@ endif; </td> </tr> -<?php endwhile; ?> +<?php endforeach; ?> </table> -- 1.6.1

1 0