Commit 305f6466 authored by Administrator's avatar Administrator

[CLEAN]

parent 3175b571
......@@ -11,7 +11,7 @@ from sqlalchemy import text, distinct
from sqlalchemy.sql import func
from sqlalchemy.orm import aliased
import json
import jsonfield
from .db import *
......
......@@ -87,10 +87,12 @@ def project(request, project_id):
# form validation
form = CustomForm(request.POST, request.FILES)
if form.is_valid():
# extract information from the form
name = form.cleaned_data['name']
thefile = form.cleaned_data['file']
resourcetype = cache.ResourceType[form.cleaned_data['type']] # e.g: here it converts to "pubmed" idk why
resourcetype = cache.ResourceType[form.cleaned_data['type']]
# which default language shall be used?
if resourcetype.name == "europress_french":
language_id = cache.Language['fr'].id
......@@ -98,6 +100,7 @@ def project(request, project_id):
language_id = cache.Language['en'].id
else:
language_id = None
# corpus node instanciation as a Django model
corpus = Node(
name = name,
......
......@@ -16,6 +16,7 @@ import datetime
from multiprocessing import Process
from math import log
import collections
from collections import defaultdict
import hashlib
......@@ -125,7 +126,7 @@ class Node(CTENode):
language = models.ForeignKey(Language, blank=True, null=True, on_delete=models.SET_NULL)
date = models.DateField(default=timezone.now, blank=True)
metadata = jsonfield.JSONField(blank=True)
metadata = jsonfield.JSONField()#blank=True, load_kwargs={'object_pairs_hook': collections.OrderedDict})
ngrams = models.ManyToManyField(through='Node_Ngram', to='Ngram')
......
......@@ -24,7 +24,7 @@ session.commit()
add_resource(corpus,
# file = './data_samples/pubmed_result.xml',
file = './data_samples/pubmed_2013-04-01_HoneyBeesBeeBees.xml',
file = '/srv/gargantext_lib/data_samples/pubmed_2013-04-01_HoneyBeesBeeBees.xml',
type_id = cache.ResourceType['pubmed'].id,
)
parse_resources(corpus)
......
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