Merge pull request #200 from brain-image-library/master

Master to Dev

Author: ecpantalone

bil_site/settings.py

@@ -220,4 +220,4 @@
 EMAIL_USE_TLS = True
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 #EMAIL_USE_SSL = False
-
+DATA_UPLOAD_MAX_NUMBER_FIELDS = 10240

ingest/migrations/0012_auto_20220713_1813.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.13 on 2022-07-13 18:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingest', '0011_auto_20220602_1409'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dataset',
+            name='title',
+            field=models.CharField(max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='publication',
+            name='citation',
+            field=models.CharField(blank=True, max_length=1500),
+        ),
+    ]

ingest/migrations/0013_alter_dataset_abstract.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-07-14 15:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingest', '0012_auto_20220713_1813'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dataset',
+            name='abstract',
+            field=models.CharField(max_length=3000),
+        ),
+    ]

ingest/models.py

@@ -104,7 +104,7 @@ def __str__(self):
 
 class Dataset(models.Model):
     bildirectory = models.CharField(max_length=256)
-    title = models.CharField(max_length=256)
+    title = models.CharField(max_length=500)
     socialmedia = models.CharField(max_length=256, blank=True)
     subject = models.CharField(max_length=256, blank=True)
     subjectscheme = models.CharField(max_length=256, blank=True)
@@ -115,7 +115,7 @@ class Dataset(models.Model):
     generalmodality = models.CharField(max_length=256, blank=True)
     technique = models.CharField(max_length=256, blank=True)
     other = models.CharField(max_length=256, blank=True)
-    abstract = models.CharField(max_length=1000)
+    abstract = models.CharField(max_length=3000)
     methods = models.CharField(max_length=256, blank=True)
     technicalinfo = models.CharField(max_length=256, blank=True)
     sheet = models.ForeignKey(Sheet, on_delete=models.SET_NULL, blank=True, null=True)
@@ -337,7 +337,7 @@ class Publication(models.Model):
     relatedidentifiertype = models.CharField(max_length=256, blank=True)
     pmcid = models.CharField(max_length=256, blank=True)
     relationtype = models.CharField(max_length=256, blank=True)
-    citation = models.CharField(max_length=256, blank=True)
+    citation = models.CharField(max_length=1500, blank=True)
     sheet = models.ForeignKey(Sheet, on_delete=models.SET_NULL, blank=True, null=True)
     data_set = models.ForeignKey(Dataset, on_delete=models.SET_NULL, blank=True, null=True)
 

requirements.txt

@@ -50,7 +50,7 @@ sqlparse==0.4.2
 texttable==1.2.1
 vine==5.0.0
 wcwidth==0.2.5
-xlrd==2.0.1
+xlrd==1.2.0
 xlwt==1.3.0
 zipp==3.4.1
 tzdata==2022.1