diff options
Diffstat (limited to 'src/generic/apt')
-rw-r--r-- | src/generic/apt/matching/match.cc | 23 | ||||
-rw-r--r-- | src/generic/apt/tags.cc | 24 | ||||
-rw-r--r-- | src/generic/apt/tags.h | 8 |
3 files changed, 0 insertions, 55 deletions
diff --git a/src/generic/apt/matching/match.cc b/src/generic/apt/matching/match.cc index 20545294..8d42fc28 100644 --- a/src/generic/apt/matching/match.cc +++ b/src/generic/apt/matching/match.cc @@ -35,15 +35,11 @@ #include <cwidget/generic/util/transcode.h> -#ifdef HAVE_EPT_TEXTSEARCH -#include <ept/textsearch/textsearch.h> -#else #ifdef HAVE_EPT_AXI #include <ept/axi/axi.h> #else #error "Don't know how to use the debtags Xapian database." #endif -#endif #include <xapian/enquire.h> @@ -65,21 +61,6 @@ namespace aptitude { namespace { -#ifdef HAVE_EPT_TEXTSEARCH - typedef ept::textsearch::TextSearch debtags_db; - - const Xapian::docid get_docid_by_name(const debtags_db &db, - const char *name) - { - return db.docidByName(name); - } - - const Xapian::Database &get_xapian_db(const debtags_db &db) - { - return db.db(); - } -#endif - #ifdef HAVE_EPT_AXI typedef Xapian::Database debtags_db; @@ -407,15 +388,11 @@ namespace aptitude { try { -#ifdef HAVE_EPT_TEXTSEARCH - db.reset(new ept::textsearch::TextSearch); -#else #ifdef HAVE_EPT_AXI db.reset(new Xapian::Database(ept::axi::path_db())); #else #error "Can't figure out how to create the debtags database." #endif -#endif } catch(...) { diff --git a/src/generic/apt/tags.cc b/src/generic/apt/tags.cc index e41dea46..0e906e98 100644 --- a/src/generic/apt/tags.cc +++ b/src/generic/apt/tags.cc @@ -412,17 +412,6 @@ namespace aptitude return std::string(name, split_pos + 2); } -#ifdef HAVE_EPT_DEBTAGS_FACET_DESCRIPTION - std::string get_facet_long_description(const tag &t) - { - return t.facet().longDescription(); - } - - std::string get_facet_short_description(const tag &t) - { - return t.facet().shortDescription(); - } -#else #ifdef HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA std::string get_facet_long_description(const tag &t) { @@ -456,19 +445,7 @@ namespace aptitude #else #error "Don't know how to retrieve facet descriptions." #endif -#endif -#ifdef HAVE_EPT_DEBTAGS_TAG_DESCRIPTION - std::string get_tag_long_description(const tag &t) - { - return t.longDescription(); - } - - std::string get_tag_short_description(const tag &t) - { - return t.shortDescription(); - } -#else #ifdef HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA std::string get_tag_long_description(const tag &t) { @@ -502,7 +479,6 @@ namespace aptitude #else #error "Don't know how to retrieve tag descriptions." #endif -#endif } } diff --git a/src/generic/apt/tags.h b/src/generic/apt/tags.h index d4d5171c..6ec61a14 100644 --- a/src/generic/apt/tags.h +++ b/src/generic/apt/tags.h @@ -233,13 +233,6 @@ namespace aptitude { namespace apt { -#ifdef HAVE_EPT_DEBTAGS_TAG - typedef ept::debtags::Tag tag; - inline std::string get_fullname(const tag &t) - { - return t.fullname(); - } -#else #ifdef EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS typedef std::string tag; inline std::string get_fullname(const std::string &t) @@ -251,7 +244,6 @@ namespace aptitude // configure checks can't recognize. #error "Don't know how to represent a debtags tag." #endif -#endif const std::set<tag> get_tags(const pkgCache::PkgIterator &pkg); |