← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/calibre/oneiric

« back to all changes in this revision

Viewing changes to src/calibre/library/database.py

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-06-21 10:18:08 UTC
  • mfrom: (1.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100621101808-aue828f532tmo4zt
Tags: 0.7.2+dfsg-1
http://bugs.debian.org/584756
http://bugs.debian.org/584915
https://launchpad.net/bugs/561958
* New major upstream version. See http://calibre-ebook.com/new-in/seven for
  details.
* Refresh patches to apply cleanly.
* debian/control: Bump python-cssutils to >= 0.9.7~ to ensure the existence
  of the CSSRuleList.rulesOfType attribute. This makes epub conversion work
  again. (Closes: #584756)
* Add debian/local/calibre-mount-helper: Simple and safe replacement for
  upstream's calibre-mount-helper, using udisks --mount and eject.
  (Closes: #584915, LP: #561958)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/library/database.py
1070
1070
        return [ (i[0], i[1]) for i in \
1071
1071
                self.conn.get('SELECT id, name FROM tags')]
1072
1072
 
 
1073
    def all_titles(self):
 
1074
        return [ (i[0], i[1]) for i in \
 
1075
                self.conn.get('SELECT id, title FROM books')]
1073
1076
 
1074
1077
    def conversion_options(self, id, format):
1075
1078
        data = self.conn.get('SELECT data FROM conversion_options WHERE book=? AND format=?', (id, format.upper()), all=False)