[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm, 1.22, 1.23 Postgres.pm, 1.20, 1.21 Oracle.pm, 1.11,
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm, 1.22, 1.23 Postgres.pm, 1.20, 1.21 Oracle.pm, 1.11, 1.12
|
From: AdrianIssott <adr...@us...> - 2009-04-19 09:51:26
|
Update of /cvsroot/lxr/lxr/lib/LXR/Index In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5309/lib/LXR/Index Modified Files: Mysql.pm Postgres.pm Oracle.pm Log Message: Fix for bug 2773982 (Identifer Search Results Are Not Sorted When Shown) * MySql, Oracle and Postgres databases now sort the results in the same way. * Declarations are sorted by filename, line and then by type * References are sorted by filename and then by line Index: Mysql.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Mysql.pm 23 Mar 2009 13:29:15 -0000 1.22 +++ Mysql.pm 19 Apr 2009 09:51:18 -0000 1.23 @@ -71,7 +71,8 @@ . "where s.symid = i.symid and i.fileid = f.fileid " . "and f.fileid = r.fileid " . "and i.langid = d.langid and i.type = d.declid " - . "and s.symname = ? and r.rel = ?"); + . "and s.symname = ? and r.rel = ? " + . "order by f.filename, i.line, d.declaration"); $self->{indexes_insert} = $self->{dbh}->prepare( "insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)" @@ -103,7 +104,7 @@ . "and f.fileid = u.fileid " . "and u.fileid = r.fileid " . "and s.symname = ? and r.rel = ? " - . "order by f.filename"); + . "order by f.filename, u.line"); $self->{decl_select} = $self->{dbh}->prepare( "select declid from ${prefix}declarations where langid = ? and " . "declaration = ?"); Index: Postgres.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Postgres.pm 30 Apr 2005 01:35:54 -0000 1.20 +++ Postgres.pm 19 Apr 2009 09:51:18 -0000 1.21 @@ -72,7 +72,8 @@ . "where s.symid = i.symid and i.fileid = f.fileid " . "and f.fileid = r.fileid " . "and i.langid = d.langid and i.type = d.declid " - . "and s.symname = ? and r.release = ?"); + . "and s.symname = ? and r.release = ? " + . "order by f.filename, i.line, d.declaration"); $indexes_insert = $dbh->prepare("insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) " . "values (?, ?, ?, ?, ?, ?)"); @@ -97,7 +98,8 @@ . "where s.symid = u.symid " . "and f.fileid = u.fileid " . "and f.fileid = r.fileid and " - . "s.symname = ? and r.release = ?"); + . "s.symname = ? and r.release = ? " + . "order by f.filename, u.line"); $declid_nextnum = $dbh->prepare("select nextval('${prefix}declnum')"); Index: Oracle.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Oracle.pm 18 Oct 2004 22:19:29 -0000 1.11 +++ Oracle.pm 19 Apr 2009 09:51:18 -0000 1.12 @@ -68,7 +68,8 @@ . "where s.symid = i.symid and i.fileid = f.fileid " . "and f.fileid = r.fileid " . "and i.langid = d.langid and i.type = d.declid " - . "and s.symname = ? and r.release = ? "); + . "and s.symname = ? and r.release = ? " + . "order by f.filename, i.line, d.declaration"); $self->{indexes_insert} = $self->{dbh}->prepare( "insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)" @@ -100,7 +101,7 @@ . "and f.fileid = u.fileid " . "and u.fileid = r.fileid " . "and s.symname = ? and r.release = ? " - . "order by f.filename"); + . "order by f.filename, u.line"); $self->{decl_select} = $self->{dbh}->prepare( "select declid from ${prefix}declarations where langid = ? and declaration = ?"); |
