Merge lp:~kamstrup/software-center/fix-topapps-util into lp:software-center

Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 2404
Proposed branch: lp:~kamstrup/software-center/fix-topapps-util
Merge into: lp:software-center
Diff against target: 30 lines (+5/-8)
1 file modified
utils/topapps.py (+5/-8)
To merge this branch: bzr merge lp:~kamstrup/software-center/fix-topapps-util
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+76343@code.launchpad.net

Description of the change

The utils/topapps.py script was not ported to the new API in softwarecenter.enums

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utils/topapps.py'
--- utils/topapps.py 2011-05-18 07:44:26 +0000
+++ utils/topapps.py 2011-09-21 07:50:27 +0000
@@ -6,10 +6,7 @@
6import xapian6import xapian
77
8sys.path.insert(0, "../")8sys.path.insert(0, "../")
9from softwarecenter.enums import (XAPIAN_VALUE_PKGNAME, 9from softwarecenter.enums import XapianValues
10 XAPIAN_VALUE_APPNAME,
11 XAPIAN_VALUE_SUMMARY,
12 XAPIAN_VALUE_POPCON)
13from softwarecenter.paths import XAPIAN_BASE_PATH10from softwarecenter.paths import XAPIAN_BASE_PATH
1411
15if __name__ == "__main__":12if __name__ == "__main__":
@@ -24,10 +21,10 @@
24 heap = []21 heap = []
25 for m in db.postlist(""):22 for m in db.postlist(""):
26 doc = db.get_document(m.docid)23 doc = db.get_document(m.docid)
27 pkgname = doc.get_value(XAPIAN_VALUE_PKGNAME)24 pkgname = doc.get_value(XapianValues.PKGNAME)
28 appname = doc.get_value(XAPIAN_VALUE_APPNAME)25 appname = doc.get_value(XapianValues.APPNAME)
29 summary = doc.get_value(XAPIAN_VALUE_SUMMARY)26 summary = doc.get_value(XapianValues.SUMMARY)
30 popcon = xapian.sortable_unserialise(doc.get_value(XAPIAN_VALUE_POPCON))27 popcon = xapian.sortable_unserialise(doc.get_value(XapianValues.POPCON))
31 heapq.heappush(heap, (popcon, appname, pkgname, summary))28 heapq.heappush(heap, (popcon, appname, pkgname, summary))
3229
33 for (popcon, appname, pkgname, summary) in heapq.nlargest(topn, heap):30 for (popcon, appname, pkgname, summary) in heapq.nlargest(topn, heap):