Commit 43f31c03 authored by PkSM3's avatar PkSM3

[BUG] some problem with Cache and ResourceType

parent 11a413f1
...@@ -93,7 +93,7 @@ WSGI_APPLICATION = 'wsgi.application' ...@@ -93,7 +93,7 @@ WSGI_APPLICATION = 'wsgi.application'
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'gargandb', 'NAME': 'clone_gargandb',
'USER': 'alexandre', 'USER': 'alexandre',
'PASSWORD': 'C8kdcUrAQy66U', 'PASSWORD': 'C8kdcUrAQy66U',
#'USER': 'gargantext', #'USER': 'gargantext',
......
...@@ -87,7 +87,8 @@ def project(request, project_id): ...@@ -87,7 +87,8 @@ def project(request, project_id):
# extract information from the form # extract information from the form
name = form.cleaned_data['name'] name = form.cleaned_data['name']
thefile = form.cleaned_data['file'] thefile = form.cleaned_data['file']
resourcetype = cache.ResourceType[form.cleaned_data['type']] print("thetype:",form.cleaned_data['type']) # <-- e.g: im receiving "isi"
resourcetype = cache.ResourceType[form.cleaned_data['type']] # e.g: here it converts to "pubmed" idk why
# which default language shall be used? # which default language shall be used?
if resourcetype.name == "europress_french": if resourcetype.name == "europress_french":
language_id = cache.Language['fr'].id language_id = cache.Language['fr'].id
...@@ -96,6 +97,8 @@ def project(request, project_id): ...@@ -96,6 +97,8 @@ def project(request, project_id):
else: else:
language_id = None language_id = None
# corpus node instanciation as a Django model # corpus node instanciation as a Django model
print("name:",name)
print("resourcetype.name:",resourcetype.name)
corpus = Node( corpus = Node(
name = name, name = name,
user_id = request.user.id, user_id = request.user.id,
......
...@@ -195,7 +195,6 @@ class NgramsExtractors(defaultdict): ...@@ -195,7 +195,6 @@ class NgramsExtractors(defaultdict):
ngramsextractors = NgramsExtractors() ngramsextractors = NgramsExtractors()
def extract_ngrams(corpus, keys): def extract_ngrams(corpus, keys):
print("yoloo")
dbg = DebugTime('Corpus #%d - ngrams' % corpus.id) dbg = DebugTime('Corpus #%d - ngrams' % corpus.id)
default_language_iso2 = None if corpus.language_id is None else cache.Language[corpus.language_id].iso2 default_language_iso2 = None if corpus.language_id is None else cache.Language[corpus.language_id].iso2
# query the metadata associated with the given keys # query the metadata associated with the given keys
......
...@@ -290,6 +290,7 @@ ...@@ -290,6 +290,7 @@
var typefield = $("#id_type").val()!="" var typefield = $("#id_type").val()!=""
var filefield = $("#id_file").val()!="" var filefield = $("#id_file").val()!=""
if( namefield && typefield && filefield ) { if( namefield && typefield && filefield ) {
alert(typefield)
$("#simpleloader").html('<img width="30px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img>') $("#simpleloader").html('<img width="30px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img>')
$("#submit_thing").prop('onclick',null); $("#submit_thing").prop('onclick',null);
$( "#id_form" ).submit(); $( "#id_form" ).submit();
......
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