synaptic

Merge lp://staging/~jibel/synaptic/jibel into lp://staging/~mvo/synaptic/synaptic--main

  1. jibel
  2. Merge into synaptic--main
Proposed by Jean-Baptiste Lallement
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp://staging/~jibel/synaptic/jibel
Merge into: lp://staging/~mvo/synaptic/synaptic--main
Diff against target: 5713 lines (+1626/-3446)
25 files modified
common/Makefile.am (+1/-1)
common/rpackagelister.cc (+199/-12)
common/rpackagelister.h (+30/-1)
common/rpackageview.cc (+24/-1)
common/rpackageview.h (+10/-5)
common/sections_trans.cc (+3/-1)
config.h.in (+3/-0)
configure.in (+13/-0)
debian/changelog (+845/-3)
debian/control (+7/-5)
debian/patches/00list.Ubuntu (+1/-0)
debian/patches/01_ubuntu_changelog.dpatch (+21/-9)
debian/patches/10_ubuntu_maintenance_gui.dpatch (+194/-0)
debian/rules (+2/-1)
debian/synaptic.dirs (+1/-0)
gtk/Makefile.am (+2/-2)
gtk/glade/window_fetch.glade (+1/-0)
gtk/glade/window_main.glade (+83/-0)
gtk/rgdebinstallprogress.cc (+18/-8)
gtk/rgmainwindow.cc (+144/-4)
gtk/rgmainwindow.h (+10/-0)
gtk/rgpkgdetails.cc (+2/-1)
gtk/rguserdialog.cc (+1/-1)
po/Makefile.in.in (+11/-12)
po/synaptic.pot (+0/-3379)
To merge this branch: bzr merge lp://staging/~jibel/synaptic/jibel
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+20011@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

I refactored the code closer to the xapian API and removing useless loops or query expansion since it's done by xapian itself.

Now we are able to run queries such as:
(libc* OR xser* ) AND NOT (name:cups* OR section:universe*)
rip* AND dvd AND NOT net
section:gnome AND instant

The max size of the resultset is 1000 items by default but configurable. I've done few tests with a maxItems set to 5000 and the performances are quit good. The queries above takes less than 100ms.

The remaining problem is with packages names with a '-' but I think that the problem is with the indexer.

Thanks for reviewing it.
Waiting for your comments.

lp://staging/~jibel/synaptic/jibel updated
1712. By Jean-Baptiste Lallement <j-lallement@black>

* debian/patches/10_ubuntu_maintenance_gui.dpatch:
  - Fix mixed-language maintenance status when LC_TIME differs from LC_MESSAGES
    (LP: 511890)

1713. By Jean-Baptiste Lallement <j-lallement@black>

* common/rpackagelister.cc
  - workaround to allow searching for terms with an hyphen (LP: #282995)

1714. By Jean-Baptiste Lallement <j-lallement@black>

* common/rpackagelister.cc:
  - xapianSearch: do not expand the first term when replacing the hyphen
  to reduce size of the resultset

1715. By Jean-Baptiste Lallement <j-lallement@black>

* ::xapianSearch: increase weight of XP terms

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks! I merged it into the lucid branch, the next step is to merge into trunk/ and upload to debian.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: