Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
limbra
limbra
Commits
97394346
Commit
97394346
authored
Jan 27, 2020
by
LE GAC Renaud
Browse files
Update models and modules to fix import.
parent
4703bd19
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
39 additions
and
40 deletions
+39
-40
models/main.py
models/main.py
+1
-0
modules/invenio_tools/__init__.py
modules/invenio_tools/__init__.py
+0
-1
modules/invenio_tools/exception.py
modules/invenio_tools/exception.py
+1
-1
modules/invenio_tools/factory.py
modules/invenio_tools/factory.py
+16
-16
modules/models/app.py
modules/models/app.py
+1
-1
modules/models/core.py
modules/models/core.py
+12
-12
modules/models/harvester.py
modules/models/harvester.py
+4
-4
modules/models/report.py
modules/models/report.py
+1
-1
modules/models/selector.py
modules/models/selector.py
+3
-4
No files found.
models/main.py
View file @
97394346
...
...
@@ -20,6 +20,7 @@ from _mydb import DBURIS
from
authentication
import
configure_auth
,
USER
from
gluon
import
current
from
gluon.tools
import
PluginManager
from
models.app
import
App
from
models.core
import
Core
from
models.harvester
import
Harvester
...
...
modules/invenio_tools/__init__.py
View file @
97394346
...
...
@@ -22,7 +22,6 @@ from .base import (ARXIV,
THESIS_DIR
)
from
.exception
import
(
CdsException
,
ExceptionUTF8
,
RecordException
)
from
.factory
import
build_record
...
...
modules/invenio_tools/exception.py
View file @
97394346
...
...
@@ -7,5 +7,5 @@ class CdsException(Exception):
pass
class
RecordException
(
Exception
UTF8
):
class
RecordException
(
Exception
):
pass
modules/invenio_tools/factory.py
View file @
97394346
...
...
@@ -3,22 +3,22 @@
"""
import
requests
from
base
import
(
is_conference
,
is_institute
,
is_thesis
,
MSG_INV_CONF
,
MSG_INV_CONF_KEY
,
MSG_NO_CONF
,
MSG_NO_CONF_ID_KEY
,
REG_CONF
,
REG_OAI
)
from
exception
import
CdsException
from
inveniostore
import
InvenioStore
from
recordconf
import
RecordConf
from
recordinst
import
RecordInst
from
recordpubli
import
RecordPubli
from
recordthesis
import
RecordThesis
from
.
base
import
(
is_conference
,
is_institute
,
is_thesis
,
MSG_INV_CONF
,
MSG_INV_CONF_KEY
,
MSG_NO_CONF
,
MSG_NO_CONF_ID_KEY
,
REG_CONF
,
REG_OAI
)
from
.
exception
import
CdsException
from
.
inveniostore
import
InvenioStore
from
.
recordconf
import
RecordConf
from
.
recordinst
import
RecordInst
from
.
recordpubli
import
RecordPubli
from
.
recordthesis
import
RecordThesis
def
add_affiliation_keys
(
recjson
):
...
...
modules/models/app.py
View file @
97394346
"""Definitions of the App tables
"""
from
.
callbacks
import
INHIBIT_CASCADE_DELETE
from
callbacks
import
INHIBIT_CASCADE_DELETE
from
gluon
import
current
from
gluon.storage
import
Storage
...
...
modules/models/core.py
View file @
97394346
"""Definitions of the core tables
"""
from
.
callbacks
import
(
INHIBIT_CASCADE_DELETE
,
INHIBIT_DUPLICATE_PUBLICATION
,
INHIBIT_PUBLICATION_DELETE_ON_OK
,
INHIBIT_PUBLICATION_UPDATE_ON_OK
)
from
callbacks
import
(
INHIBIT_CASCADE_DELETE
,
INHIBIT_DUPLICATE_PUBLICATION
,
INHIBIT_PUBLICATION_DELETE_ON_OK
,
INHIBIT_PUBLICATION_UPDATE_ON_OK
)
from
.
filters
import
(
CLEAN_COLLABORATION
,
CLEAN_COLLABORATION_SYNONYM
,
CLEAN_THESIS_DEFENSE
)
from
filters
import
(
CLEAN_COLLABORATION
,
CLEAN_COLLABORATION_SYNONYM
,
CLEAN_THESIS_DEFENSE
)
from
gluon
import
current
from
gluon.validators
import
(
IS_EMPTY_OR
,
...
...
@@ -27,11 +27,11 @@ from plugin_dbui import (CLEAN_COMMA,
UNDEF_ID
)
from
pydal
import
Field
from
.
regex
import
(
REG_COLLABORATION
,
REG_CONF_DATES
,
REG_DEFENSE
,
REG_SUBMITTED
,
REG_VALID_ORIGIN
)
from
regex
import
(
REG_COLLABORATION
,
REG_CONF_DATES
,
REG_DEFENSE
,
REG_SUBMITTED
,
REG_VALID_ORIGIN
)
CAT_USUAL
=
[
"article"
,
"book"
,
...
...
modules/models/harvester.py
View file @
97394346
"""Definitions of the harveser's tables
"""
from
.
callbacks
import
(
INHIBIT_CASCADE_DELETE
,
INHIBIT_CONTROLLER_INSERT
,
INHIBIT_CONTROLLER_UPDATE
,
INHIBIT_HARVESTER
)
from
callbacks
import
(
INHIBIT_CASCADE_DELETE
,
INHIBIT_CONTROLLER_INSERT
,
INHIBIT_CONTROLLER_UPDATE
,
INHIBIT_HARVESTER
)
from
gluon
import
current
...
...
modules/models/report.py
View file @
97394346
"""Definitions of the report's tables
"""
from
.
callbacks
import
INHIBIT_CASCADE_DELETE
from
callbacks
import
INHIBIT_CASCADE_DELETE
from
gluon.validators
import
IS_IN_DB
,
IS_IN_SET
from
plugin_dbui
import
(
CLEAN_SPACES
,
...
...
modules/models/selector.py
View file @
97394346
...
...
@@ -6,11 +6,10 @@ from gluon import current
from
gluon.validators
import
(
IS_IN_DB
,
IS_LENGTH
,
IS_INT_IN_RANGE
,
IS_IN_SET
,
IS_MATCH
)
IS_IN_SET
)
from
.
harvest_tools
import
DRY_RUN
from
.
model_
harvester
import
CONTROLLERS
,
STORES
from
harvest_tools
import
DRY_RUN
from
.harvester
import
CONTROLLERS
,
STORES
from
pydal
import
Field
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment