From 79add9f0b12c3998c1522540fcfec1da458d38e8 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 7 May 2020 19:59:41 -0700 Subject: update code to work with new config structure --- chocula/database.py | 4 ++-- chocula/directories/crossref.py | 2 +- chocula/directories/directory.template | 2 +- chocula/directories/doaj.py | 4 ++-- chocula/directories/entrez.py | 2 +- chocula/directories/ezb.py | 2 +- chocula/directories/gold_oa.py | 2 +- chocula/directories/norwegian.py | 4 ++-- chocula/directories/openapc.py | 2 +- chocula/directories/road.py | 2 +- chocula/directories/sherpa_romeo.py | 4 ++-- chocula/directories/szczepanski.py | 4 ++-- chocula/directories/wikidata.py | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) (limited to 'chocula') diff --git a/chocula/database.py b/chocula/database.py index 5856936..f6a000a 100644 --- a/chocula/database.py +++ b/chocula/database.py @@ -15,7 +15,6 @@ import tldextract import ftfy import stdnum.issn -from chocula.config import * from chocula.util import * @@ -749,7 +748,8 @@ class ChoculaDatabase(): ezb = json.loads(drow['extra']) extra['ezb'] = dict(ezb_id=drow['identifier'], color=ezb['ezb_color']) if drow['slug'] == 'szczepanski': - extra['szczepanski'] = dict(as_of=SZCZEPANSKI_DATE) + # XXX: pull from record + extra['szczepanski'] = dict(as_of=config.szczepanski.date) if drow['slug'] == 'doaj': extra['doaj'] = json.loads(drow['extra']) diff --git a/chocula/directories/crossref.py b/chocula/directories/crossref.py index ba47566..4208008 100644 --- a/chocula/directories/crossref.py +++ b/chocula/directories/crossref.py @@ -18,7 +18,7 @@ class CrossrefLoader(DirectoryLoader): source_slug = "crossref" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.CROSSREF_FILE)) + return csv.DictReader(open(self.config.crossref.filepath)) def parse_record(self, record) -> Optional[DirectoryInfo]: info = DirectoryInfo( diff --git a/chocula/directories/directory.template b/chocula/directories/directory.template index 49f6a79..895b67c 100644 --- a/chocula/directories/directory.template +++ b/chocula/directories/directory.template @@ -16,7 +16,7 @@ class TemplateLoader(DirectoryLoader): source_slug = "template" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.TEMPLATE_FILE)) + return csv.DictReader(open(self.config.TEMPLATE.filepath)) def parse_record(self, record) -> Optional[DirectoryInfo]: info = DirectoryInfo( diff --git a/chocula/directories/doaj.py b/chocula/directories/doaj.py index 5d1aa21..8fe62b4 100644 --- a/chocula/directories/doaj.py +++ b/chocula/directories/doaj.py @@ -74,7 +74,7 @@ class DoajLoader(DirectoryLoader): source_slug = "doaj" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.DOAJ_FILE)) + return csv.DictReader(open(self.config.doaj.filepath)) def parse_record(self, row) -> Optional[DirectoryInfo]: # TODO: Subjects, Permanent article identifiers, work_level stuff @@ -95,7 +95,7 @@ class DoajLoader(DirectoryLoader): extra: Dict[str, Any] = dict(doaj=dict()) extra['mimetypes'] = parse_mimetypes(row['Full text formats']) - extra['doaj']['as_of'] = self.config.DOAJ_DATE + extra['doaj']['as_of'] = self.config.doaj.date if row['DOAJ Seal']: extra['doaj']['seal'] = {"no": False, "yes": True}[row['DOAJ Seal'].lower()] diff --git a/chocula/directories/entrez.py b/chocula/directories/entrez.py index 821fb1d..b30f04d 100644 --- a/chocula/directories/entrez.py +++ b/chocula/directories/entrez.py @@ -23,7 +23,7 @@ class EntrezLoader(DirectoryLoader): source_slug = "entrez" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.ENTREZ_FILE)) + return csv.DictReader(open(self.config.entrez_simple.filepath)) def parse_record(self, record) -> Optional[DirectoryInfo]: if not (record.get('ISSN (Online)') or record.get('ISSN (Print)')): diff --git a/chocula/directories/ezb.py b/chocula/directories/ezb.py index c2fcb83..1573048 100644 --- a/chocula/directories/ezb.py +++ b/chocula/directories/ezb.py @@ -16,7 +16,7 @@ class EzbLoader(DirectoryLoader): source_slug = "ezb" def open_file(self) -> Iterable: - return open(self.config.EZB_FILE, 'r') + return open(self.config.ezb.filepath, 'r') def parse_record(self, row) -> Optional[DirectoryInfo]: diff --git a/chocula/directories/gold_oa.py b/chocula/directories/gold_oa.py index 08747bf..a75944d 100644 --- a/chocula/directories/gold_oa.py +++ b/chocula/directories/gold_oa.py @@ -17,7 +17,7 @@ class GoldOALoader(DirectoryLoader): source_slug = "gold_oa" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.GOLD_OA_FILE, encoding="ISO-8859-1")) + return csv.DictReader(open(self.config.gold_oa.filepath, encoding="ISO-8859-1")) def parse_record(self, row) -> Optional[DirectoryInfo]: diff --git a/chocula/directories/norwegian.py b/chocula/directories/norwegian.py index 446baed..2b83961 100644 --- a/chocula/directories/norwegian.py +++ b/chocula/directories/norwegian.py @@ -52,7 +52,7 @@ class NorwegianLoader(DirectoryLoader): source_slug = "norwegian" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.NORWEGIAN_FILE, encoding="ISO-8859-1"), delimiter=";") + return csv.DictReader(open(self.config.norwegian.filepath, encoding="ISO-8859-1"), delimiter=";") def parse_record(self, row) -> Optional[DirectoryInfo]: info = DirectoryInfo( @@ -64,7 +64,7 @@ class NorwegianLoader(DirectoryLoader): langs=[l for l in [parse_lang(row['Language'])] if l], ) - info.extra['norwegian'] = dict(as_of=self.config.NORWEGIAN_DATE) + info.extra['norwegian'] = dict(as_of=self.config.norwegian.date) if row['Level 2019']: info.extra['norwegian']['level'] = int(row['Level 2019']) diff --git a/chocula/directories/openapc.py b/chocula/directories/openapc.py index b5cc691..c2acd95 100644 --- a/chocula/directories/openapc.py +++ b/chocula/directories/openapc.py @@ -17,7 +17,7 @@ class OpenAPCLoader(DirectoryLoader): source_slug = "openapc" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.OPENAPC_FILE)) + return csv.DictReader(open(self.config.openapc.filepath)) def parse_record(self, row) -> Optional[DirectoryInfo]: diff --git a/chocula/directories/road.py b/chocula/directories/road.py index 66bd7d0..23cca65 100644 --- a/chocula/directories/road.py +++ b/chocula/directories/road.py @@ -26,7 +26,7 @@ class RoadLoader(DirectoryLoader): source_slug = "road" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.ROAD_FILE), delimiter='\t', + return csv.DictReader(open(self.config.road.filepath), delimiter='\t', fieldnames=("ISSN", "ISSN-L", "Short Title", "Title", "Publisher", "URL1", "URL2", "Region", "Lang1", "Lang2") ) diff --git a/chocula/directories/sherpa_romeo.py b/chocula/directories/sherpa_romeo.py index 618e389..e92dc69 100644 --- a/chocula/directories/sherpa_romeo.py +++ b/chocula/directories/sherpa_romeo.py @@ -27,13 +27,13 @@ class SherpaRomeoLoader(DirectoryLoader): # first load policies print("##### Loading SHERPA/ROMEO policies...", file=sys.stderr) - fixed_policy_file = ftfy.fix_file(open(self.config.SHERPA_ROMEO_POLICY_FILE, 'rb')) + fixed_policy_file = ftfy.fix_file(open(self.config.sherpa_romeo_policies_simple.filepath, 'rb')) policy_reader = csv.DictReader(fixed_policy_file) for row in policy_reader: self.sherpa_policies[row['RoMEO Record ID']] = row # then open regular file - raw_file = open(self.config.SHERPA_ROMEO_JOURNAL_FILE, 'rb').read().decode(errors='replace') + raw_file = open(self.config.sherpa_romeo_journals_simple.filepath, 'rb').read().decode(errors='replace') fixed_file = ftfy.fix_text(raw_file) return csv.DictReader(fixed_file.split('\n')) diff --git a/chocula/directories/szczepanski.py b/chocula/directories/szczepanski.py index b199c34..0d1558a 100644 --- a/chocula/directories/szczepanski.py +++ b/chocula/directories/szczepanski.py @@ -16,7 +16,7 @@ class SzczepanskiLoader(DirectoryLoader): source_slug = "szczepanski" def open_file(self) -> Iterable: - return open(self.config.SZCZEPANSKI_FILE, 'r') + return open(self.config.szczepanski.filepath, 'r') def parse_record(self, row) -> Optional[DirectoryInfo]: @@ -34,7 +34,7 @@ class SzczepanskiLoader(DirectoryLoader): publisher=clean_str(row.get('ed')), ) - info.extra['szczepanski'] = dict(as_of=self.config.SZCZEPANSKI_DATE) + info.extra['szczepanski'] = dict(as_of=self.config.szczepanski.date) if row.get('extra'): info.extra['szczepanski']['notes'] = row.get('extra') for k in ('other_titles', 'year_spans', 'ed'): diff --git a/chocula/directories/wikidata.py b/chocula/directories/wikidata.py index 278192b..d16d8df 100644 --- a/chocula/directories/wikidata.py +++ b/chocula/directories/wikidata.py @@ -16,7 +16,7 @@ class WikidataLoader(DirectoryLoader): source_slug = "wikidata" def open_file(self) -> Iterable: - return csv.DictReader(open(self.config.WIKIDATA_SPARQL_FILE), delimiter='\t') + return csv.DictReader(open(self.config.wikidata.filepath), delimiter='\t') def parse_record(self, row) -> Optional[DirectoryInfo]: -- cgit v1.2.3