[FEATURE] Still working on forms.

gargantext_web/views.py

@@ -140,10 +140,6 @@ def project(request, project_id):
     if request.method == 'POST':
         #form = CorpusForm(request.POST, request.FILES)
         name        = str(request.POST['name'])
-        try:
-            language    = Language.objects.get(id=str(request.POST['language']))
-        except:
-            language = None
 
         try:
             bdd_type = ResourceType.objects.get(id=str(request.POST['bdd_type']))
@@ -155,30 +151,36 @@ def project(request, project_id):
         except:
             file = None
 
-        if language is not None and name != "" and bdd_type != None and file != None :
-            resource = Resource(user=request.user, guid=str(date), bdd_type=bdd_type, file=file)
-            resource.save()
+        if  name != "" and bdd_type != None and file != None :
+            try:
                 node_type   = NodeType.objects.get(name='Corpus')
                 parent      = Node.objects.get(id=project_id)
+                corpus = Node(parent=parent, name=name, type=node_type, user=request.user)
+                corpus.save()
+                #corpus.add_ressource(file=file)
+            except Exception as error:
+                print(error)
+            #resource = Resource(user=request.user, guid=str(date), bdd_type=bdd_type, file=file)
+            #language    = Language.objects.get(iso2='fr')
 
-            node = Node(parent=parent, type=node_type, name=name, user=request.user, language=language)
+            node = Node(parent=parent, type=node_type, name=name, user=request.user)#, language=language)
             node.save()
-            node.resource.add(resource)
-
-            try:
-                for resource in node.resource.all():
-                    print(resource.bdd_type.name)
-                    if resource.bdd_type.name == "PubMed":
-                        fileparser = PubmedFileParser(file='/var/www/gargantext/media/' + str(resource.file))
-                        fileparser.parse(node)
-                    elif resource.bdd_type.name == "Web Of Science (WOS), ISI format":
-                        fileparser = IsiParser(file='/var/www/gargantext/media/' + str(resource.file))
-                        fileparser.parse(node)
-                    elif node.bdd_type.name == "Europresse":
-                        pass
+            #node.resource.add(resource)
 
-            except Exception as error:
-                print(error)
+#            try:
+#                for resource in node.resource.all():
+#                    print(resource.bdd_type.name)
+#                    if resource.bdd_type.name == "PubMed":
+#                        fileparser = PubmedFileParser(file='/var/www/gargantext/media/' + str(resource.file))
+#                        fileparser.parse(node)
+#                    elif resource.bdd_type.name == "Web Of Science (WOS), ISI format":
+#                        fileparser = IsiParser(file='/var/www/gargantext/media/' + str(resource.file))
+#                        fileparser.parse(node)
+#                    elif node.bdd_type.name == "Europresse":
+#                        pass
+#
+#            except Exception as error:
+#                print(error)
 
             return HttpResponseRedirect('/project/' + str(project_id))
         else:
@@ -321,9 +323,9 @@ def add_corpus(request):
         
         try:
             #language    = Language.objects.get(name=str(request.POST['language']))
-            language    = Language.objects.get(name='French')
+            language    = Language.objects.get(iso2='fr')
         except Exception as e:
-            print(e)
+            print('line 323', e)
             language = None
         
         if name != "" :

init/requirements.txt

@@ -13,23 +13,28 @@ certifi==14.05.14
 cffi==0.8.6
 cryptography==0.6
 decorator==3.4.0
+django-autoslug==1.7.2
+django-autoslug-field==0.2.3
 django-cte-trees==0.9.2
 django-extensions==1.4.0
 django-grappelli==2.5.3
 django-hstore==1.3.1
 django-mptt==0.6.1
 django-nested-inlines==0.1
+django-treebeard==2.0
 graphviz==0.4
 ipython==2.2.0
 kombu==3.0.23
 lxml==3.3.6
 matplotlib==1.4.0
 networkx==1.9
+nltk==3.0a4
 nose==1.3.4
 numpy==1.8.2
 pandas==0.14.1
 pexpect-u==2.5.1
 psycopg2==2.5.4
+pycountry==1.8
 pycparser==2.10
 pydot2==1.0.33
 pyparsing==2.0.2

node/admin.py

@@ -97,7 +97,7 @@ class CorpusForm(ModelForm):
 #                    user_id=self.request.user.id, 
 #                    type_id=parent_type.id
 #                    )
-            self.fields['language'].queryset = Language.objects.filter(implemented=1)
+            #self.fields['language'].queryset = Language.objects.filter(implemented=1)
         except Exception as error:
             print("Error with", error)