From 817f1036349bee431eaa54d02ba3e99f8959f922 Mon Sep 17 00:00:00 2001
From: Batsien Doreau <bastien.doreau@isima.fr>
Date: Mon, 20 May 2019 16:30:40 +0200
Subject: [PATCH] fix pb depot == -> =
---
hal/create_xml2hal.py | 1 +
hal/forms.py | 48 ++++++++++++++++++------------------
hal/scripts_bibtex.py | 2 ++
hal/templates/hal/aide.html | 2 +-
hal/templates/hal/index.html | 8 ++++--
hal/views.py | 5 ++--
6 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/hal/create_xml2hal.py b/hal/create_xml2hal.py
index 3a0b249..0d19e2d 100644
--- a/hal/create_xml2hal.py
+++ b/hal/create_xml2hal.py
@@ -222,6 +222,7 @@ def createXml_sendHal(numero,listauthors, lang_title, title_publi, name_conf, nb
reponse_http = False
response = ""
+ print ("createXML bool_depot_prod ",bool_depot_prod)
# DEPOT PREPROD
if bool_depot_preprod == True :
data = open(namefile)
diff --git a/hal/forms.py b/hal/forms.py
index 6076bb1..3c2a54c 100644
--- a/hal/forms.py
+++ b/hal/forms.py
@@ -29,16 +29,16 @@ CHOICES_SOURCE_TEXT = (
class Bibtex2halForm(forms.Form):
bib_name_user = forms.CharField(required=True, max_length=40, label="Forme auteur Bibtex (*)")
- name_user = forms.CharField(required=True, max_length=20, label="Nom chercheur (*)")
- firstname_user = forms.CharField(required=True, max_length=20, label="Prénom chercheur (*)")
- labo_auth_final = forms.CharField(required=True, max_length=20, label="N° de structure (*) (Ex: 490706)", initial = 490706)
- id_hal_user = forms.CharField(required=True, max_length=20, label="IdHal chercheur (*)")
- login_user = forms.CharField(required=True, max_length=20, label="Login HAL chercheur (*)")
+ name_user = forms.CharField(required=True, max_length=40, label="Nom chercheur (*)")
+ firstname_user = forms.CharField(required=True, max_length=40, label="Prénom chercheur (*)")
+ labo_auth_final = forms.CharField(required=True, max_length=40, label="N° de structure (*) (Ex: 490706)", initial = 490706)
+ id_hal_user = forms.CharField(required=True, max_length=40, label="IdHal chercheur (*)")
+ login_user = forms.CharField(required=True, max_length=40, label="Login HAL chercheur (*)")
choice_source = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES_SOURCE_BIBTEX, label="Choix de la source", initial='DBLP' )
- login_depot = forms.CharField(required=True, max_length=20, label="Login HAL référent (*)")
- passwd_depot = forms.CharField(required=True, max_length=20, label=("Password HAL référent (*)"), widget=forms.PasswordInput())
+ login_depot = forms.CharField(required=True, max_length=40, label="Login HAL référent (*)")
+ passwd_depot = forms.CharField(required=True, max_length=40, label=("Password HAL référent (*)"), widget=forms.PasswordInput())
choice_depot = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES_DEPOT, label="Choix du dépôt", initial='NODEPOT' )
domain1 = forms.CharField(required=True, max_length=20, label="Domaine 1 (*)")
@@ -52,11 +52,11 @@ class Bibtex2halForm(forms.Form):
class BibtexXmlForm(forms.Form):
bib_name_user = forms.CharField(required=True, max_length=40, label="Forme auteur DBLP (*)")
- name_user = forms.CharField(required=True, max_length=20, label="Nom chercheur (*)")
- firstname_user = forms.CharField(required=True, max_length=20, label="Prénom chercheur (*)")
- labo_auth_final = forms.CharField(required=True, max_length=20, label="N° de structure (*) (Ex: 490706)", initial = 490706)
- id_hal_user = forms.CharField(required=True, max_length=20, label="IdHal chercheur (*)")
- login_user = forms.CharField(required=True, max_length=20, label="Login HAL chercheur (*)")
+ name_user = forms.CharField(required=True, max_length=40, label="Nom chercheur (*)")
+ firstname_user = forms.CharField(required=True, max_length=40, label="Prénom chercheur (*)")
+ labo_auth_final = forms.CharField(required=True, max_length=40, label="N° de structure (*) (Ex: 490706)", initial = 490706)
+ id_hal_user = forms.CharField(required=True, max_length=40, label="IdHal chercheur (*)")
+ login_user = forms.CharField(required=True, max_length=40, label="Login HAL chercheur (*)")
choice_source = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES_SOURCE_BIBTEX, label="Choix de la source", initial='DBLP' )
@@ -71,14 +71,14 @@ class BibtexXmlForm(forms.Form):
class Text2halForm(forms.Form):
form_author = forms.CharField(required=True, max_length=40, label="Forme auteur (*)")
- name_user = forms.CharField(required=True, max_length=20, label="Nom chercheur (*)")
- firstname_user = forms.CharField(required=True, max_length=20, label="Prénom chercheur (*)")
- labo_auth_final = forms.CharField(required=True, max_length=20, label="N° de structure (*) (Ex: 490706)")
- id_hal_user = forms.CharField(required=True, max_length=20, label="IdHal chercheur (*)")
- login_user = forms.CharField(required=True, max_length=20, label="Login HAL chercheur (*)")
+ name_user = forms.CharField(required=True, max_length=40, label="Nom chercheur (*)")
+ firstname_user = forms.CharField(required=True, max_length=40, label="Prénom chercheur (*)")
+ labo_auth_final = forms.CharField(required=True, max_length=40, label="N° de structure (*) (Ex: 490706)")
+ id_hal_user = forms.CharField(required=True, max_length=40, label="IdHal chercheur (*)")
+ login_user = forms.CharField(required=True, max_length=40, label="Login HAL chercheur (*)")
- login_depot = forms.CharField(required=True, max_length=20, label="Login HAL référent (*)")
- passwd_depot = forms.CharField(required=True, max_length=20, label=("Password HAL référent (*)"), widget=forms.PasswordInput())
+ login_depot = forms.CharField(required=True, max_length=40, label="Login HAL référent (*)")
+ passwd_depot = forms.CharField(required=True, max_length=40, label=("Password HAL référent (*)"), widget=forms.PasswordInput())
choice_depot = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES_DEPOT, label="Choix du dépôt", initial='NODEPOT' )
domain1 = forms.CharField(required=True, max_length=20, label="Domaine 1 (*)")
@@ -92,11 +92,11 @@ class Text2halForm(forms.Form):
class TextXmlForm(forms.Form):
form_author = forms.CharField(required=True, max_length=40, label="Forme auteur (*)")
- name_user = forms.CharField(required=True, max_length=20, label="Nom chercheur (*)")
- firstname_user = forms.CharField(required=True, max_length=20, label="Prénom chercheur (*)")
- labo_auth_final = forms.CharField(required=True, max_length=20, label="N° de structure (*) (Ex: 490706)")
- id_hal_user = forms.CharField(required=True, max_length=20, label="IdHal chercheur (*)")
- login_user = forms.CharField(required=True, max_length=20, label="Login HAL chercheur (*)")
+ name_user = forms.CharField(required=True, max_length=40, label="Nom chercheur (*)")
+ firstname_user = forms.CharField(required=True, max_length=40, label="Prénom chercheur (*)")
+ labo_auth_final = forms.CharField(required=True, max_length=40, label="N° de structure (*) (Ex: 490706)")
+ id_hal_user = forms.CharField(required=True, max_length=40, label="IdHal chercheur (*)")
+ login_user = forms.CharField(required=True, max_length=40, label="Login HAL chercheur (*)")
domain1 = forms.CharField(required=True, max_length=20, label="Domaine 1 (*)")
domain2 = forms.CharField(required=False, max_length=20, label="Domaine 2")
diff --git a/hal/scripts_bibtex.py b/hal/scripts_bibtex.py
index c38f3de..8d2eb28 100644
--- a/hal/scripts_bibtex.py
+++ b/hal/scripts_bibtex.py
@@ -52,6 +52,7 @@ def script_bibtex_2_hal (bibtex_file, bib_name_user, name_user, firstname_user,
if the bool 'single' == False -> bibtex file has many publications, call createXml_sendHal (create XML and deposit) return a lis of results
if the bool 'single' == True -> bibtex file has one publication, call create_single_xml (post single XML no deposit) return the XML in string
'''
+ print ("script_bibtex_2_hal bool_depot_prod ",bool_depot_prod)
resultat = ""
problemes_url = ""
problemes_doublon = ""
@@ -331,6 +332,7 @@ def script_bibtex_2_hal (bibtex_file, bib_name_user, name_user, firstname_user,
editor_book = editor_book.encode("utf-8")
if accept_depot == True :
+ print ("bool_depot_prod ",bool_depot_prod )
result = createXml_sendHal(numero, listauthors, language, title, conf, nb_pages, year, listdomains, type_publi, town, country, country_acr,doi_value, editor_book, volume, name_user, labo_auth_final, id_hal_user, login_user, login_depot, passwd_depot, bool_depot_preprod, bool_depot_prod)
# methode createXml_sendHal renvoie true -> depot HAL ou preprod OK
diff --git a/hal/templates/hal/aide.html b/hal/templates/hal/aide.html
index 86f38c3..3fe5481 100644
--- a/hal/templates/hal/aide.html
+++ b/hal/templates/hal/aide.html
@@ -131,7 +131,7 @@ contrôler et corriger les résultats avant de faire un vrai dépôt. <br/>
Le résultat indique tout d'abord quelles sont les publis déja présentes dans HAL et lesquelles
sont susceptibles d'être déposées. <br/>
<br/>
-Dans la première partie des résultats sont indiqués le nombre de publications recensées dan la source,
+Dans la première partie des résultats sont indiqués le nombre de publications recensées dans la source,
puis les publications déja existantes dans HAL (une requête est lancée avec le titre) puis les dépôts
et les tentatives de dépôts s'étant soldées par un echec (problèmes de dépôts).<br/>
A noter qu'en mode simulation, aucun dépôt n'est fait et tous les potentiels dépôts se retrouvent
diff --git a/hal/templates/hal/index.html b/hal/templates/hal/index.html
index 67ca2a4..a165d25 100644
--- a/hal/templates/hal/index.html
+++ b/hal/templates/hal/index.html
@@ -27,9 +27,13 @@
Un rendu sous forme de tableau permet de visualiser les résultats et le choix est donné de déposer sur la base HAL ou sur une <a href="https://hal.halpreprod.archives-ouvertes.fr/" target="_blank">base de préproduction</a>.
<br/>
<br/>
- <b>Dblp_2_Hal</b> permet de faire des imports massifs dans HAL Ã partir de fichiers au format bibtex issus de <a href="https://dblp.uni-trier.de/" target="_blank">DBLP<a/>.
+ <b>Bibtex_2_Hal</b> permet de faire des imports massifs dans HAL à partir de fichiers au format bibtex provenant de différentes sources.
+ <br/>
+ - <a href="https://dblp.uni-trier.de/" target="_blank">DBLP</a>.
<br/><br/>
- <b>Text_2_Hal</b> permet de faire des imports massifs dans HAL Ã partir d'une liste texte.
+ <b>Text_2_Hal</b> permet de faire des imports massifs dans HAL à partir d'une liste texte, de formater une liste texte ou de formater du texte issu de différentes sources telles que :
+ <br/>
+ - <a href="https://www.researchgate.net/" target="_blank">Research Gate</a>
<br/>
</h4>
diff --git a/hal/views.py b/hal/views.py
index 91b9820..a19f32f 100644
--- a/hal/views.py
+++ b/hal/views.py
@@ -120,10 +120,10 @@ def bibtex2hal(request):
# recup du type de depot
if choice_depot == 'PREPROD' :
print ("Views.py depot preprod")
- bool_depot_preprod == True
+ bool_depot_preprod = True
if choice_depot == 'PRODHAL' :
print ("Views.py depot prod")
- bool_depot_prod == True
+ bool_depot_prod = True
print ("choice_source ",choice_source)
@@ -144,6 +144,7 @@ def bibtex2hal(request):
if domain5 is not "" :
listdomains.append(domain5)
+ print ("views.py bool_depot_prod ", bool_depot_prod)
print ("begin script")
reponse = script_bibtex_2_hal(bibtex_file, bib_name_user, name_user, firstname_user, labo_auth_final, id_hal_user, login_user, listdomains, login_depot, passwd_depot, bool_depot_preprod, bool_depot_prod, single, choice_source)
--
GitLab