Commit bb229004 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Update store_tools to fix module imports

parent 957bf16a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
""" """
import re import re
from store_tools import (is_conference, from .base import (is_conference,
is_institute, is_institute,
is_thesis, is_thesis,
MSG_INV_CONF, MSG_INV_CONF,
...@@ -12,12 +12,12 @@ from store_tools import (is_conference, ...@@ -12,12 +12,12 @@ from store_tools import (is_conference,
REG_CONF) REG_CONF)
from datetime import datetime from datetime import datetime
from store_tools import CdsException from .exception import CdsException
from store_tools import CDS, INS, InvenioStore from .inveniostore import CDS, INS, InvenioStore
from store_tools import RecordConf from .recordconf import RecordConf
from store_tools import RecordInst from .recordinst import RecordInst
from store_tools import RecordPubli from .recordpubli import RecordPubli
from store_tools import RecordThesis from .recordthesis import RecordThesis
REX_T = "\$\$t([\w, ]+)" REX_T = "\$\$t([\w, ]+)"
REX_U = "\$\$u([\w, ]+)" REX_U = "\$\$u([\w, ]+)"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
""" """
import requests import requests
from store_tools import CdsException from .exception import CdsException
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
from builtins import getattr from builtins import getattr
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
""" """
import pprint import pprint
from .base import OAI, OAI_URL, REG_OAI
from store_tools import OAI, OAI_URL, REG_OAI
class Record(dict): class Record(dict):
...@@ -110,6 +109,7 @@ class Record(dict): ...@@ -110,6 +109,7 @@ class Record(dict):
information masking the ``field`` and the ``subfield`` codification. information masking the ``field`` and the ``subfield`` codification.
""" """
def __init__(self, *args): def __init__(self, *args):
dict.__init__(self, *args) dict.__init__(self, *args)
......
""" store_tools.recordconf """ store_tools.recordconf
""" """
from store_tools import REG_CONF, REG_YEAR from .base import REG_CONF, REG_YEAR
from plugin_dbui import CLEAN_SPACES from plugin_dbui import CLEAN_SPACES
from store_tools import RecordPubli from .recordpubli import RecordPubli
class RecordConf(RecordPubli): class RecordConf(RecordPubli):
...@@ -26,6 +26,7 @@ class RecordConf(RecordPubli): ...@@ -26,6 +26,7 @@ class RecordConf(RecordPubli):
+----------------+-----------------------------------------------+ +----------------+-----------------------------------------------+
""" """
def conference_country(self): def conference_country(self):
"""The country where the conference took place. """The country where the conference took place.
......
""" store_tools.recordinst """ store_tools.recordinst
""" """
from store_tools import is_institute from .base import is_institute
from store_tools import RecordException from .exception import RecordException
from store_tools import Record from .record import Record
MSG_INVALID_HOST = "Invalid record host" MSG_INVALID_HOST = "Invalid record host"
MSG_INVALID_RECORD = "Invalid record, it is not describing an institute" MSG_INVALID_RECORD = "Invalid record, it is not describing an institute"
...@@ -66,6 +66,7 @@ class RecordInst(Record): ...@@ -66,6 +66,7 @@ class RecordInst(Record):
institute data (MarcJSON) institute data (MarcJSON)
""" """
def __init__(self, recjson): def __init__(self, recjson):
if not is_institute(recjson): if not is_institute(recjson):
......
...@@ -9,12 +9,12 @@ from store_tools import (ARXIV, ...@@ -9,12 +9,12 @@ from store_tools import (ARXIV,
REG_ARXIV_NUMBER, REG_ARXIV_NUMBER,
REG_YEAR) REG_YEAR)
from store_tools import RecordException from .exception import RecordException
from filters import CLEAN_COLLABORATION from filters import CLEAN_COLLABORATION
from numpy import NaN from numpy import NaN
from pandas import concat, DataFrame from pandas import concat, DataFrame
from plugin_dbui import as_list, CLEAN_SPACES from plugin_dbui import as_list, CLEAN_SPACES
from store_tools import Record from .record import Record
AUTHOR_FORMATS = [ AUTHOR_FORMATS = [
"First, Last", "First, Last",
......
""" store_tools.recordthesis """ store_tools.recordthesis
""" """
from store_tools import THESIS_DIR from .base import THESIS_DIR
from filters import CLEAN_THESIS_DEFENSE from filters import CLEAN_THESIS_DEFENSE
from store_tools import RecordPubli from .recordpubli import RecordPubli
class RecordThesis(RecordPubli): class RecordThesis(RecordPubli):
...@@ -17,6 +17,7 @@ class RecordThesis(RecordPubli): ...@@ -17,6 +17,7 @@ class RecordThesis(RecordPubli):
+-------------------+-----------------------------------+ +-------------------+-----------------------------------+
""" """
def authors_as_list(self, sort=False): def authors_as_list(self, sort=False):
"""The list of author(s) signing the publication. """The list of author(s) signing the publication.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment