appdb/include appData.php
WineHQ
wineowner at wine.codeweavers.com
Tue Aug 7 19:55:27 CDT 2007
ChangeSet ID: 31320
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2007/08/07 19:55:27
Modified files:
include : appData.php
Log message:
Chris Morgan <cmorgan at alum.wpi.edu>
Order appData entries by the application name, otherwise the order is based on when the
application was added to the database and this grouping doesn't work well for screenshots.
Patch: http://cvs.winehq.org/patch.py?id=31320
Old revision New revision Changes Path
1.33 1.34 +35 -29 appdb/include/appData.php
Index: appdb/include/appData.php
diff -u -p appdb/include/appData.php:1.33 appdb/include/appData.php:1.34
--- appdb/include/appData.php:1.33 8 Aug 2007 0:55:27 -0000
+++ appdb/include/appData.php 8 Aug 2007 0:55:27 -0000
@@ -366,7 +366,8 @@ class appData
AND
appData.queued = '?'
AND
- appData.type = '?'";
+ appData.type = '?'
+ ORDER BY appFamily.appName";
if(!$iRows && !$iStart)
{
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
@@ -386,37 +387,42 @@ class appData
if($iStart || $iRows)
$sLimit = " LIMIT ?,?";
- $sQuery = "(SELECT DISTINCT appData.* FROM appData,
- appFamily, appVersion WHERE
- appFamily.appId = appVersion.appId
- AND
- (
+ $sQuery =
+ "(
+ SELECT DISTINCT appData.* FROM appData,
+ appFamily, appVersion WHERE
+ appFamily.appId = appVersion.appId
+ AND
+ (
appData.appId = appFamily.appId
+ )
+ AND
+ appVersion.queued = 'false'
+ AND
+ appFamily.queued = 'false'
+ AND
+ appData.queued = '?'
+ AND
+ appData.type = '?' ORDER BY appFamily.appName $sLimit
)
- AND
- appVersion.queued = 'false'
- AND
- appFamily.queued = 'false'
- AND
- appData.queued = '?'
- AND
- appData.type = '?'$sLimit) UNION
- (
- SELECT DISTINCT appData.* FROM appData,
- appFamily, appVersion WHERE
- appFamily.appId = appVersion.appId
- AND
+ UNION
(
- appData.versionId = appVersion.versionId
- )
- AND
- appVersion.queued = 'false'
- AND
- appFamily.queued = 'false'
- AND
- appData.queued = '?'
- AND
- appData.type = '?'$sLimit)";
+ SELECT DISTINCT appData.* FROM appData,
+ appFamily, appVersion WHERE
+ appFamily.appId = appVersion.appId
+ AND
+ (
+ appData.versionId = appVersion.versionId
+ )
+ AND
+ appVersion.queued = 'false'
+ AND
+ appFamily.queued = 'false'
+ AND
+ appData.queued = '?'
+ AND
+ appData.type = '?' ORDER BY appFamily.appName $sLimit
+ )";
if(!$iRows && !$iStart)
{
$hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType,
More information about the wine-cvs
mailing list