Init automatic and adding database type for the parser

init.py

 from node.models import NodeType
+
 #NodeType.objects.all().delete()
-nodeTypeRoot = NodeType(name="Root")
-nodeTypeRoot.save()
-nodeTypeProject = NodeType(name="Project")
-nodeTypeProject.save()
-nodeTypeDocument = NodeType(name="Document")
-nodeTypeDocument.save()
+NodeType(name="Root").save()
+NodeType(name="Project").save()
+NodeType(name="Corpus").save()
+NodeType(name="Document").save()
 
+from node.models import DatabaseType
+for bdd in ['Europresse', 'PubMed', 'Web Of Science (WOS), ISI format']:
+    DatabaseType(name=bdd).save()
 
 from node.models import Language
 import pycountry
-for lang in pycountry.languages:
-    try:
-        Language(iso2=lang.alpha2, iso3=lang.terminology, fullname=lang.name).save()
-    except:
-        pass
+for iso in ['fr', 'en', ]:
+    lang = pycountry.languages.get(alpha2=iso)
+    Language(iso2=lang.alpha2, iso3=lang.terminology, fullname=lang.name, implemented=1).save()

init.sh

 #!/bin/bash
 
-psql -d gargandb -f database_zero.sql
+psql -d gargandb -f init.sql
+
+
+sleep 2
 ./manage.py syncdb
+
+sleep 2
 ./manage.py shell < init.py

node/admin.py

@@ -103,6 +103,11 @@ class DocumentAdmin(NodeAdmin):
     form = DocumentForm
 
 class LanguageAdmin(admin.ModelAdmin):
+    
+    def get_queryset(self, request):
+        return Language.objects.filter(implemented=1)
+
+    
     class Meta:
         ordering = ['fullname',]
 

node/models.py

@@ -19,19 +19,24 @@ def upload_to(instance, filename):
 # All classes here
 
 class Language(models.Model):
-    iso2        = models.CharField(max_length=2)
+    iso2        = models.CharField(max_length=2, unique=True)
     iso3        = models.CharField(max_length=3)
     fullname    = models.CharField(max_length=255)
+    implemented = models.BooleanField(blank=True)
+    
     def __str__(self):
         return self.fullname
 
+class DatabaseType(models.Model):
+    name    = models.CharField(max_length=255)
+    def __str__(self):
+        return self.name
 
 class Ngram(models.Model):
     language    = models.ForeignKey(Language, blank=True, null=True, on_delete=models.SET_NULL)
     n           = models.IntegerField()
     terms       = models.CharField(max_length=255)
 
-    
 class Resource(models.Model):
     guid        = models.CharField(max_length=255)
     file        = models.FileField(upload_to=upload_to, blank=True)
@@ -42,9 +47,6 @@ class NodeType(models.Model):
         return self.name
 
 class Node(CTENode):
-#    depth       = DepthField()
-#    path        = PathField()
-#    ordering    = OrderingField()
     objects     = Manager()
 
     user        = models.ForeignKey(User)
@@ -59,8 +61,10 @@ class Node(CTENode):
     # the 'file' column should be deprecated soon;
     # use resources instead.
     file        = models.FileField(upload_to=upload_to, blank=True)
+    bdd_type    = models.ForeignKey(DatabaseType, blank=True, null=True)
+    
     #resources   = models.ManyToManyField(Resource)
-    resource    = models.ForeignKey(Resource, blank=True)
+    #resource    = models.ForeignKey(Resource, blank=True, null=True)
     #ngrams      = models.ManyToManyField(NGrams)