From ffb386103489bad55e22ec7a4d0c511d4f5d54a7 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Tue, 15 Apr 2014 18:49:30 +0200 Subject: [PATCH] Search for single compound, filename should be lowercase --- FourmiCrawler/spider.py | 7 ++----- Fourmi.py => fourmi.py | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) rename Fourmi.py => fourmi.py (93%) diff --git a/FourmiCrawler/spider.py b/FourmiCrawler/spider.py index 327de42..77b2c11 100644 --- a/FourmiCrawler/spider.py +++ b/FourmiCrawler/spider.py @@ -8,12 +8,9 @@ class FourmiSpider(Spider): __parsers = [] synonyms = [] - def __init__(self, compounds=None, *args, **kwargs): + def __init__(self, compound=None, *args, **kwargs): super(FourmiSpider, self).__init__(*args, **kwargs) - if isinstance(compounds, list): - self.synonyms.extend(compounds) - else: - self.synonyms.append(compounds) + self.synonyms.append(compound) def parse(self, reponse): for parser in self.__parsers: diff --git a/Fourmi.py b/fourmi.py similarity index 93% rename from Fourmi.py rename to fourmi.py index f0218f6..76ab2e6 100755 --- a/Fourmi.py +++ b/fourmi.py @@ -3,8 +3,8 @@ Fourmi, an webscraper build to search specific information for a given compound. Usage: - fourmi search ... - fourmi [options] search ... + fourmi search + fourmi [options] search fourmi -h | --help fourmi --version @@ -44,8 +44,8 @@ def load_parsers(rel_dir="FourmiCrawler/parsers"): return parsers -def setup_crawler(searchables): - spider = FourmiSpider(compounds=searchables) +def setup_crawler(searchable): + spider = FourmiSpider(compound=searchable) spider.add_parsers(load_parsers()) settings = get_project_settings() crawler = Crawler(settings)