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

Improve the UI realted to the harvester/controller and publication.

parent 3a1a46ad
......@@ -41,6 +41,7 @@
'auth_permission': 'auth_permission',
'auth_user': 'auth_user',
'Author': 'Auteur',
"author's rescue list": "liste de secours pour les auteurs",
'Authors': 'Auteurs',
'Authors Cppm': 'Auteurs du CPPM',
'authors_roles': 'rôles des auteurs',
......@@ -217,7 +218,8 @@
'Group ID': 'Group ID',
'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
'groups': 'groupes',
'Harvest': 'Moissonner',
'Harvest': 'Harvest',
'Harvester': 'Moissonneur',
'Harvester parameters not defined in the database.': 'Les paramètres du moissoneur ne sont pas définis dans la base de données.',
'Harvester took %s seconds': 'La moisson à durée %s secondes',
'Harvester(s)': 'Moissonneur(s)',
......@@ -367,8 +369,7 @@
'properties': 'propriétés',
'Property': 'Propriété',
'Publication': 'Publication',
'Publication category associated to the found records.': 'Publication category associated to the found records.',
'Publication category associated to the record.': 'Catégorie associée à cet enregistrement.',
'Publication category associated to the found records.': 'Catégorie associée aux enregistrements.',
'publications': 'publications',
'Publications': 'Publications',
'Publisher': 'Revue',
......@@ -417,7 +418,7 @@
'Reject to many year': 'Rejeté plusieurs année',
'Reject XML is not well formed': "Rejeté la chaine XML n'est pas correcte",
'Rejected': 'Rejeté',
'Relation controller / categories': 'Relation controlleur / catégories',
'relation harvesters / categories': 'relation moissoneurs / catégories',
'Relation team / projects': 'Relation équipe / projets',
'relation user / groups': 'relation utilisateur / groupes',
'Removing affiliation failed. Rules might be missing for the given string. Contact the author.': 'Removing affiliation failed. Rules might be missing for the given string. Contact the author.',
......@@ -501,6 +502,7 @@
'The cppm authors contains the team name?': "Le champ autheurs du CPPM contiens le nom de l'équipe ?",
'The field "%s" is missing.': 'Le champ "%s" est manquant.',
'The name of the first author: J. Doe': 'Nom du premier auteur : J. Doe',
'The name of the harvester.': 'Le nom du moissoneur.',
'The name of the speaker: P.-Y. Smith': "Nom de l'orateur : P.-Y. Smith",
'The name of the web2py controller running the search: articles, proceedings,...': 'Nom du controller web2py qui effectut la recherche : articles, proceedings,...',
'The name of the web2py controller to run a search: articles, proceedings,...': 'The name of the web2py controller to run a search: articles, proceedings,...',
......@@ -515,7 +517,7 @@
'The URL of the publication (open access): http://arxiv.org/abs/1103.2465': "L'URL de la publication (open access): http://arxiv.org/abs/1103.2465",
'The volume number: 123 or 64-65': 'Numéro du volume : 123 ou 64-65',
'The XML string describing the MARC12 record. It Starts with "<?xml" and ends with "</collection>"': 'Chaîne de charactère XML définissant un enregistrement MARC12. Elle commence par "<?xml" et fini par "</collection>"',
'Thesis': 'Thèses',
'Thesis': 'Mémoire',
'This email already has an account': 'This email already has an account',
'Ticket': 'Ticket',
'Time': 'Temps',
......
......@@ -12,11 +12,25 @@ tp_category = \
T("Publication category associated to the found records.")
tp_controller = \
T("The name of the web2py controller to run a search: articles, proceedings,...")
T("The name of the harvester.")
db.define_table("controllers",
Field("controller", "string", length=255, comment=tp_controller, notnull=True),
Field("controller", "string", length=255, comment=tp_controller, label='Harvester', notnull=True),
Field("id_categories", "reference categories", comment=tp_category, default=undef_id, label='Category'),
migrate="controllers.table")
db.controllers.controller.filter_in = dbui.CLEAN_SPACES
\ No newline at end of file
db.controllers.controller.filter_in = dbui.CLEAN_SPACES
# NOTE:
#
# the list of controllers corresponds to those defined in the harvest_tools.
# The method get_harvester_tool defines the relation between the controller
# and the harvester class.
#
db.controllers.controller.requires = IS_IN_SET(['articles',
'notes',
'preprints',
'proceedings',
'reports',
'talks',
'theses'])
\ No newline at end of file
......@@ -17,7 +17,7 @@ T("Parameter for fuzzy string search.")
db.define_table("harvesters",
Field("id_teams", "reference teams", label='Team', notnull=True),
Field("id_projects", "reference projects", label='Project', notnull=True),
Field("controller", "string", length=255, comment=tp_controller, label='Harvest', notnull=True),
Field("controller", "string", length=255, comment=tp_controller, label='Harvester', notnull=True),
Field("host", "string", length=255, comment=tp_host, default='cds.cern.ch', label='Store', notnull=True),
Field("collections", "string", length=255, comment=tp_collections, notnull=True),
Field("ratio", "double", comment=tp_ratio, default=1.0, notnull=True),
......@@ -29,4 +29,5 @@ db.harvesters.controller.filter_in = dbui.CLEAN_SPACES
db.harvesters.host.filter_in = dbui.CLEAN_SPACES
db.harvesters.controller.requires = IS_IN_DB(db, 'controllers.controller')
db.harvesters.host.requires = IS_IN_SET(['cds.cern.ch', 'inspirehep.net'])
db.harvesters.ratio.requires = IS_FLOAT_IN_RANGE(0., 1.0)
\ No newline at end of file
......@@ -84,7 +84,7 @@ formModifier.merge_fields('authors_cppm',
formModifier.set_mapper(dbui.map_tabpanel)
formModifier.configure(buttonAlign='right',
width=425)
width=450)
#-------------------------------------------------------------------------------
#
......
......@@ -43,15 +43,11 @@ if session.role == ADMIN:
confHarvesterNode = None
if session.role in (ADMIN, USER):
leaves = ('cppm_authors', 'harvesters')
if session.role == USER:
leaves = ('cppm_authors', 'harvesters')
confHarvesterNode = Node(T('Configure harvesters'))
confHarvesterNode.add_children(leaves, func=to_grid)
confHarvesterNode.add_child(T('Relation controller / categories'), to_grid('controllers'))
confHarvesterNode.add_child(T('harvesters'), to_grid('harvesters'))
confHarvesterNode.add_child(T('relation harvesters / categories'), to_grid('controllers'))
confHarvesterNode.add_child(T("author's rescue list"), to_grid('cppm_authors'))
#-------------------------------------------------------------------------------
#
......
......@@ -7,6 +7,7 @@ HEAD
Validation and corrections of each record is performed at only one place.
Should improve code stability and maintenance.
- Review class naming of the invenio and harvester tools modules.
- Improve the UI related to the harvester/controller and publication.
0.8.7.2 (Sep 2014)
- Migrate to plugin_dbui 0.6.1.7.
......
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