From 3c3c88e207a0c38c81c88855cf2a36ca7a622006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Mon, 12 Dec 2005 23:41:45 +0000 Subject: [PATCH] minor improvements --- pisi/api.py | 10 +++------- pisi/search/__init__.py | 7 +++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index d9731d7c..f7e83250 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -246,20 +246,16 @@ def info_name(package_name): def search_package_terms(terms, lang = None): if not lang: lang = pisi.pxml.autoxml.LocalText.get_lang() - def search(self, id, terms): - return pisi.search.query(id, lang, terms) r1 = pisi.search.query_terms('summary', lang, terms) r2 = pisi.search.query_terms('description', lang, terms) r = r1.union(r2) return r -def search_package(terms, lang = None): +def search_package(query, lang = None): if not lang: lang = pisi.pxml.autoxml.LocalText.get_lang() - def search(self, id, terms): - return pisi.search.query(id, lang, terms) - r1 = pisi.search.query('summary', lang, terms) - r2 = pisi.search.query('description', lang, terms) + r1 = pisi.search.query('summary', lang, query) + r2 = pisi.search.query('description', lang, query) r = r1.union(r2) return r diff --git a/pisi/search/__init__.py b/pisi/search/__init__.py index 7f0c17fc..dd996ef1 100644 --- a/pisi/search/__init__.py +++ b/pisi/search/__init__.py @@ -24,7 +24,7 @@ class Exception(pisi.Exception): # API from invertedindex import InvertedIndex -from preprocess import preprocess +import preprocess as p def init(ids, langs): "initialize databases" @@ -48,17 +48,16 @@ def finalize(): ctx.invidx = {} def add_doc(id, lang, docid, str, txn = None): - terms = preprocess(lang, str) + terms = p.preprocess(lang, str) ctx.invidx[id][lang].add_doc(docid, terms, txn) def remove_doc(id, lang, docid, str, txn = None): ctx.invidx[id][lang].remove_doc(docid, txn) def query_terms(id, lang, terms, txn = None): - import preprocess as p terms = map(lambda x: p.lower(lang, x), terms) return ctx.invidx[id][lang].query(terms, txn) def query(id, lang, str, txn = None): - terms = preprocess(lang, str) + terms = p.preprocess(lang, str) return query_terms(id, lang, terms, txn)