diff options
| author | randomdan <randomdan@localhost> | 2010-11-13 18:20:48 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2010-11-13 18:20:48 +0000 |
| commit | 4a4e3f20845e45725340e48ad171898fbb06b6a5 (patch) | |
| tree | 7a70aa4a1309a366d413234a94632e6f63489fe6 /gentoobrowse/views | |
| parent | Use package description from ebuild with highest version number, not file ID (diff) | |
| download | gentoobrowse-4a4e3f20845e45725340e48ad171898fbb06b6a5.tar.bz2 gentoobrowse-4a4e3f20845e45725340e48ad171898fbb06b6a5.tar.xz gentoobrowse-4a4e3f20845e45725340e48ad171898fbb06b6a5.zip | |
Remove most uses of files table from website, data now in ebuilds table
Diffstat (limited to 'gentoobrowse/views')
| -rw-r--r-- | gentoobrowse/views/newebuilds.xml | 23 | ||||
| -rw-r--r-- | gentoobrowse/views/newebuildsatom.xml | 12 | ||||
| -rw-r--r-- | gentoobrowse/views/package.xml | 5 |
3 files changed, 17 insertions, 23 deletions
diff --git a/gentoobrowse/views/newebuilds.xml b/gentoobrowse/views/newebuilds.xml index 92d5fbd..9a4cbf3 100644 --- a/gentoobrowse/views/newebuilds.xml +++ b/gentoobrowse/views/newebuilds.xml @@ -3,19 +3,17 @@ <xi:include href="../datasources/postgres-web.xml" /> <project2:sqlview name="newebuilds" recordname="ebuild" datasource="postgres-web"> <sql> - SELECT filename, description, moddate, p.name AS pkgname, c.name AS catname, f.firstseen sync, + SELECT description, moddate, p.name AS pkgname, c.name AS catname, e.version, e.firstseen sync, up.trackedsince IS NOT NULL AS tracked - FROM ebuilds e, files f, categories c, packages p LEFT OUTER JOIN user_packages up + FROM ebuilds e, categories c, packages p LEFT OUTER JOIN user_packages up ON up.userid = ? AND up.packageid = p.packageid - WHERE e.ebuildid = f.fileid - AND e.packageid = p.packageid + WHERE e.packageid = p.packageid AND p.categoryid = c.categoryid - AND f.firstseen IN ( - SELECT DISTINCT f.firstseen - FROM files f - WHERE f.filetypeid = 1 - ORDER BY f.firstseen + AND e.firstseen IN ( + SELECT DISTINCT e.firstseen + FROM ebuilds e + ORDER BY e.firstseen DESC LIMIT 3) ORDER BY tracked DESC, c.name, p.name, e.versioninst </sql> @@ -25,10 +23,9 @@ </project2:sqlview> <project2:sqlview name="syncs" recordname="sync" datasource="postgres-web"> <sql> - SELECT DISTINCT f.firstseen AS synctime - FROM files f - WHERE filetypeid = 1 - ORDER BY f.firstseen + SELECT DISTINCT e.firstseen AS synctime + FROM ebuilds e + ORDER BY e.firstseen DESC LIMIT 3 </sql> </project2:sqlview> diff --git a/gentoobrowse/views/newebuildsatom.xml b/gentoobrowse/views/newebuildsatom.xml index e758330..76cc414 100644 --- a/gentoobrowse/views/newebuildsatom.xml +++ b/gentoobrowse/views/newebuildsatom.xml @@ -3,17 +3,15 @@ <xi:include href="../datasources/postgres-web.xml" /> <project2:sqlview name="newebuilds" recordname="ebuild" datasource="postgres-web"> <sql> - SELECT filename, description, moddate, p.name AS pkgname, c.name AS catname, f.firstseen sync - FROM ebuilds e, files f, categories c, packages p, user_packages up, users u - WHERE e.ebuildid = f.fileid - AND e.packageid = p.packageid + SELECT version, description, moddate, p.name AS pkgname, c.name AS catname, e.firstseen sync + FROM ebuilds e, categories c, packages p, user_packages up, users u + WHERE e.packageid = p.packageid AND p.categoryid = c.categoryid AND up.userid = u.userid AND u.username = ? AND up.packageid = p.packageid - AND f.firstseen >= up.trackedsince - AND f.filetypeid = 1 - ORDER BY f.firstseen DESC, c.name, p.name, e.versioninst + AND e.firstseen >= up.trackedsince + ORDER BY e.firstseen DESC, c.name, p.name, e.versioninst LIMIT 50 </sql> <parameters> diff --git a/gentoobrowse/views/package.xml b/gentoobrowse/views/package.xml index 5b0daab..d526df4 100644 --- a/gentoobrowse/views/package.xml +++ b/gentoobrowse/views/package.xml @@ -28,10 +28,9 @@ </project2:sqlview> <project2:sqlview name="versions" recordname="version" datasource="postgres-web"> <sql> - SELECT e.ebuildid, e.version, f.moddate, e.slot, e.license - FROM ebuilds e, files f + SELECT e.ebuildid, e.version, e.moddate, e.slot, e.license + FROM ebuilds e WHERE e.packageid = ? - AND e.ebuildid = f.fileid ORDER BY versioninst desc </sql> <parameters> |