- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Change how pagination looks, add start and end buttons
by Callan Barrett 30 Jan '09

30 Jan '09

Got rid of the links in elipsis, added elips to start, changed next and prev buttons to > and <, added begin and end buttons Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/template/pkg_search_results.php | 39 ++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 71b6a63..ba0398c 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -116,6 +116,20 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php print __("Showing results %s - %s of %s", $first, $last, $total) ?> + + <?php if ($_GET['O'] != 0): ?><a href="packages.php?<?php print mkurl("O=0") ?>"><?php echo '<<' ?></a><?php endif; ?> + + <?php + if ($_GET['O'] > 0): + $O = $_GET['O'] - $_GET['PP']; + + if ($_GET['O'] < $_GET['PP']) { + $O = 0; + } + ?> + <a href="packages.php?<?php print mkurl("O=$O") ?>"><?php echo '<' ?></a> + <?php endif; ?> + <?php if ($_GET['PP'] > 0) { $pages = ceil($total / $_GET['PP']); @@ -131,6 +145,8 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { $morepages = $currentpage + 5; + print (($currentpage-5) > 1) ? '...' : ''; + # Display links for more search results. for ($i = ($currentpage - 5); $i <= $morepages && $i <= $pages; $i++) { if ($i < 1) { @@ -141,30 +157,21 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { if ($i <> $currentpage) : ?> - <a href='packages.php?<?php print mkurl('O=' . ($pagestart))?>'><?php print "$i " ?></a> + <a href='packages.php?<?php print mkurl('O=' . ($pagestart))?>'><?php print "$i" ?></a> <?php else : print "[$i] "; endif; } - # Indicate that there are more pages. - if ($pages > $morepages) { - echo "<a href=\"packages.php?" . mkurl('O=' . ($pagestart + $_GET['PP'])) . '">... </a>'; - } + print ($pages > $morepages) ? '...' : ''; - if ($_GET['O'] > 0): - $O = $_GET['O'] - $_GET['PP']; + ?> - if ($_GET['O'] < $_GET['PP']) { - $O = 0; - } - ?> - <a href="packages.php?<?php print mkurl("O=$O") ?>"><?php echo __('Previous') ?></a> - <?php endif; ?> - - <?php if ($total - $_GET['PP'] - $_GET['O'] > 0): ?> - <a href='packages.php?<?php print mkurl('O=' . ($_GET['O'] + $_GET['PP'])) ?>'><?php echo __('Next') ?></a> + <?php if ($total - $_GET['PP'] - $_GET['O'] > 0): ?> + <a href='packages.php?<?php print mkurl('O=' . ($_GET['O'] + $_GET['PP'])) ?>'><?php echo '>' ?></a> <?php endif; ?> + <?php if ($_GET['O'] < ($total-$_GET['PP'])): ?><a href="packages.php?<?php print mkurl("O=" . ($total-$_GET['PP'])) ?>"><?php echo '>>' ?></a><?php endif; ?> + </td> </tr> -- 1.6.0.4

1 0

[aur-dev] [PATCH] Update Italian translation and some improvements
by Giovanni Scafora 29 Jan '09

29 Jan '09

Hi guys, there is an update Italian translation and some improvements. Please, apply that as soon as possible. Thanks. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

2 1

[aur-dev] AUR 1.5.6 Release
by Loui Chang 29 Jan '09

29 Jan '09

Hey everyone. I'd like to do a new release by weekend. So if there are any simple patches that can't wait until the next release here's the chance. Cheers!

2 2

[aur-dev] Bugs FS#2649,FS#12645: variable substitution revisited
by Gergely Imreh 28 Jan '09

28 Jan '09

Hi, Attached a patch to do a more complete variable substitution (not just pkgver and pkgname). Also, since it seems that some of official packages like to use "eval" for multiple-replacement, let's handle that in the same time. Checked functionality with these packages: core/kernel26 (arbitrary simple substitution), extra/firefox-i18n (eval). This patch should also close bugs FS#2649 and FS#12645. There are some quirky bash variable substitution types that this cannot handle but those usually fall into the "not well formed package" category. E.g. when there's a simple variable with quotes but with extra spaces inside the quotes, like _myvar=("something "). Then if there's, say, a substitution source=(from/$_myvar/code.tar.gz), bash will give: "from/something". If there's no extra space, it will give "from/something/code.tar.gz" For properly doing this on AUR, the way quotation marks are removed has to be changed. But probably we don't need to do that, until some uses this bash "feature" in an official package (since I recently learned, that the definition of the PKGBUILD format is just one line: "whatever makepkg can handle".) Cheers, Greg

2 1

Re: [aur-dev] [aur-general] Method to get all Packages
by Loui Chang 25 Jan '09

25 Jan '09

On Sun, Jan 25, 2009 at 06:55:05PM +0100, Lukas Appelhans wrote: > Okok :) I worked on a patch for that, it's attached... > I have no clue if it works (or if everything is alright) though, never worked > with Sql-Queries :( Alright this is definitely in the aur-dev realm now. Please send patches/ideas to aur-dev(a)archlinux.org. I still don't understand why you need all packages. Maybe you can explain that first. Cheers. > diff --git a/web/html/rpc.php b/web/html/rpc.php > index 033cba5..d58a487 100644 > --- a/web/html/rpc.php > +++ b/web/html/rpc.php > @@ -19,6 +19,7 @@ if ( $_SERVER['REQUEST_METHOD'] == 'GET' ) { > echo '<ul>'; > echo '<li>search</li>'; > echo '<li>info</li>'; > + echo '<li>all_packages</li>'; > echo '</ul> '; > echo 'Each method requires the following HTTP GET syntax: '; > echo '   type=methodname&arg=data '; > diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php > index 81c0831..c30eeef 100644 > --- a/web/lib/aurjson.class.php > +++ b/web/lib/aurjson.class.php > @@ -21,7 +21,7 @@ if (!extension_loaded('json')) > **/ > class AurJSON { > private $dbh = false; > - private $exposed_methods = array('search','info'); > + private $exposed_methods = array('search','info','all_packages'); > private $fields = array('ID','Name','Version','CategoryID','Description', > 'URL','URLPath','License','NumVotes','OutOfDate'); > > @@ -147,5 +147,28 @@ class AurJSON { > return $this->json_error('No result found'); > } > } > + > + /** > + * Returns all packages > + */ > + private function all_packages() { > + $query = "SELECT " . implode(',', $this->fields) . > + " FROM Packages WHERE DummyPkg=0 "; > + > + $result = db_query($query, $this->dbh); > + > + if ( $result && (mysql_num_rows($result) > 0) ) { > + $search_data = array(); > + while ( $row = mysql_fetch_assoc($result) ) { > + array_push($search_data, $row); > + } > + > + mysql_free_result($result); > + return $this->json_results('all_packages', $search_data); > + } > + else { > + return $this->json_error('No results found'); > + } > + } > } >

1 0

[aur-dev] [PATCH] Updated Turkish translation
by Samed Beyribey 25 Jan '09

25 Jan '09

Hello, I've updated Turkish translation. Could someone push it, please? Regards, Samed.

2 1

[aur-dev] [PATCH] APC work follow-up
by Dan McGee 25 Jan '09

25 Jan '09

I managed to send an outdated patch to the mailing list that got applied, so some of these changes never made it in. A little more cleanup and a little more caching, and also increase the default time to 600 seconds (10 minutes). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/stats.inc | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/web/lib/stats.inc b/web/lib/stats.inc index 7916f05..706027c 100644 --- a/web/lib/stats.inc +++ b/web/lib/stats.inc @@ -2,7 +2,10 @@ include_once('aur.inc'); +# APC configuration variables $apc_prefix = 'aur:'; +$apc_ttl = 600; + # Check if APC extension is loaded if (!defined('EXTENSION_LOADED_APC')) define('EXTENSION_LOADED_APC', extension_loaded('apc')); @@ -12,14 +15,17 @@ if (!defined('EXTENSION_LOADED_APC')) # function db_cache_value($dbq, $dbh, $key) { - if(!(EXTENSION_LOADED_APC && ($ret = apc_fetch($key)))) { + global $apc_ttl; + $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]; - # set the TTL here in seconds: 300 seconds = 5 minutes - if (EXTENSION_LOADED_APC) { - apc_store($key, $ret, 300); + apc_store($key, $ret, $apc_ttl); } } return $ret; @@ -27,7 +33,7 @@ function db_cache_value($dbq, $dbh, $key) function updates_table($dbh) { - global $apc_prefix; + global $apc_prefix, $apc_ttl; $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'; @@ -37,9 +43,8 @@ function updates_table($dbh) while ($row = mysql_fetch_assoc($result)) { $newest_packages->append($row); } - if (EXTENSION_LOADED_APC) { - apc_store($key, $newest_packages, 300); + apc_store($key, $newest_packages, $apc_ttl); } } include('stats/updates_table.php'); @@ -47,28 +52,24 @@ function updates_table($dbh) 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='" . $escuser . "'"; - $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).'"'; - - $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)."'"; + $q = "SELECT count(*) FROM Packages,Users WHERE Packages.OutOfDate = 1 AND Packages.MaintainerUID = Users.ID AND Users.Username='" . $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'); -- 1.6.1

2 1

[aur-dev] [PATCH] Update Italian translation
by Giovanni Scafora 25 Jan '09

25 Jan '09

Hi guys, here's the update Italian translation. Could you apply that? Thanks. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

2 1

[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