Issue1 gcmd short names

Vagrantfile

@@ -10,6 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box_url = "https://atlas.hashicorp.com/ubuntu/trusty64"
 
   config.vm.define "geospaas", primary: true do |geospaas|
+    geospaas.vm.network :private_network, ip: "192.168.33.10"
   end
 
   config.vm.provider "virtualbox" do |v|

geospaas/catalog/fixtures/catalog.json

@@ -2,9 +2,8 @@
     "pk": 1,
     "model": "catalog.source",
     "fields": {
-        "platform": ["AQUA"],
-        "instrument": ["MODIS"],
-        "specs": "Nothing special"
+        "platform": ["Earth Observation Satellites", "", "Aqua", "Earth Observing System, Aqua"],
+        "instrument": ["Earth Remote Sensing Instruments", "Passive Remote Sensing", "Spectrometers/Radiometers", "Imaging Spectrometers/Radiometers", "MODIS", "Moderate-Resolution Imaging Spectroradiometer"]
     }
 },{
     "pk": 1,
@@ -27,7 +26,8 @@
         "time_coverage_end": "2010-01-02T00:00:00Z",
         "time_coverage_start": "2010-01-01T00:00:00Z",
         "summary": "This is a quite short summary about the test dataset.",
-        "source": ["AQUA", "MODIS"],
+        "sources": [[["Earth Observation Satellites", "", "Aqua", "Earth Observing System, Aqua"], ["Earth Remote Sensing Instruments", "Passive Remote Sensing", "Spectrometers/Radiometers", "Imaging Spectrometers/Radiometers", "MODIS", "Moderate-Resolution Imaging Spectroradiometer"]]],
+        "parameters": [["sea_surface_temperature"], ["wind_speed"]],
         "geographic_location": 1,
         "data_center": ["NERSC"],
         "gcmd_location": ["VERTICAL LOCATION", "SEA SURFACE", "", "", ""],
@@ -43,7 +43,8 @@
         "time_coverage_end": "2010-01-03T00:00:00Z",
         "time_coverage_start": "2010-01-02T00:00:00Z",
         "summary": "This is a quite short summary about the test dataset.",
-        "source": ["AQUA", "MODIS"],
+        "sources": [[["Earth Observation Satellites", "", "Aqua", "Earth Observing System, Aqua"], ["Earth Remote Sensing Instruments", "Passive Remote Sensing", "Spectrometers/Radiometers", "Imaging Spectrometers/Radiometers", "MODIS", "Moderate-Resolution Imaging Spectroradiometer"]]],
+        "parameters": [["sea_surface_temperature"], ["wind_speed"]],
         "geographic_location": 2,
         "data_center": ["NERSC"],
         "gcmd_location": ["VERTICAL LOCATION", "SEA SURFACE", "", "", ""],

geospaas/catalog/managers.py

@@ -6,7 +6,10 @@
 class SourceManager(models.Manager):
 
     def get_by_natural_key(self, p, i):
-        return self.get(platform__short_name=p, instrument__short_name=i)
+        return self.get(platform__category=p[0], platform__series_entity=p[1],
+                platform__short_name=p[2], platform__long_name=p[3], instrument__category=i[0],
+                instrument__instrument_class=i[1], instrument__type=i[2], instrument__subtype=i[3],
+                instrument__short_name=i[4], instrument__long_name=i[5])
 
 class DatasetURIQuerySet(models.QuerySet):
     def get_non_ingested_uris(self, all_uris):

geospaas/catalog/migrations/0007a_add_sources_field.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.5 on 2019-02-04 10:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0006_auto_20190130_1442'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dataset',
+            name='sources',
+            field=models.ManyToManyField(to='catalog.Source'),
+        ),
+    ]

geospaas/catalog/migrations/0007b_migrate_source_data.py

@@ -0,0 +1,23 @@
+from django.db import migrations
+
+def copy_source(apps, schema_editor):
+    Dataset = apps.get_model('catalog', 'Dataset')
+    for ds in Dataset.objects.all():
+        ds.sources.add(ds.source)
+
+def copy_source_backwards(apps, schema_editor):
+    Dataset = apps.get_model('catalog', 'Dataset')
+    for ds in Dataset.objects.all():
+        src = ds.sources.all()[0]
+        ds.source = src
+        ds.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0007a_add_sources_field'),
+    ]
+
+    operations = [
+            migrations.RunPython(copy_source, copy_source_backwards),
+    ]

geospaas/catalog/migrations/0007c_remove_source_and_specs_fields.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.1.5 on 2019-02-04 10:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0007b_migrate_source_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dataset',
+            name='source',
+        ),
+        migrations.RemoveField(
+            model_name='source',
+            name='specs',
+        ),
+    ]

geospaas/catalog/migrations/0008a_add_newparameters_field.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.1.5 on 2019-02-04 18:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vocabularies', '0001_initial'),
+        ('catalog', '0007c_remove_source_and_specs_fields'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dataset',
+            name='newparameters',
+            field=models.ManyToManyField(to='vocabularies.Parameter'),
+        ),
+    ]

geospaas/catalog/migrations/0008b_migrate_parameters_data.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.1.5 on 2019-02-05 12:18
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    Dataset = apps.get_model('catalog', 'Dataset')
+    DatasetParameter = apps.get_model('catalog', 'DatasetParameter')
+    for ds in Dataset.objects.all():
+        dataset_params = DatasetParameter.objects.filter(dataset=ds)
+        for dp in dataset_params:
+            ds.newparameters.add(dp.parameter)
+
+def backward(apps, schema_editor):
+    Dataset = apps.get_model('catalog', 'Dataset')
+    DatasetParameter = apps.get_model('catalog', 'DatasetParameter')
+    for ds in Dataset.objects.all():
+        for pp in ds.newparameters.all():
+            dp, created = DatasetParameter.objects.get_or_create(dataset=ds, parameter=pp)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0008a_add_newparameters_field'),
+    ]
+
+    operations = [
+            migrations.RunPython(forward, backward),
+    ]

geospaas/catalog/migrations/0008c_remove_parameters_field.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.5 on 2019-02-04 18:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vocabularies', '0001_initial'),
+        ('catalog', '0008b_migrate_parameters_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dataset',
+            name='parameters',
+        ),
+    ]

geospaas/catalog/migrations/0009_rename_newparameters_field.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.5 on 2019-02-04 18:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0008c_remove_parameters_field'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='dataset',
+            old_name='newparameters',
+            new_name='parameters',
+        ),
+    ]

geospaas/catalog/models.py

@@ -32,24 +32,21 @@ def __str__(self):
 
 
 class Source(models.Model):
+    # Consider updating to follow https://gcmd.nasa.gov/DocumentBuilder/defaultDif10/guide/platform.html
     platform = models.ForeignKey(Platform, on_delete=models.CASCADE)
     instrument = models.ForeignKey(Instrument, on_delete=models.CASCADE)
-    specs = models.CharField(max_length=50, default='',
-        help_text=_('Further specifications of the source.'))
 
     objects = SourceManager()
 
     class Meta:
         unique_together = (("platform", "instrument"),)
 
     def __str__(self):
-        if not self.platform and not self.instrument:
-            return '%s' % self.specs
-        else:
-            return '%s/%s' % (self.platform, self.instrument)
+        return 'Platform: (%s) / Instrument: (%s)' % (self.platform.__str__(),
+                self.instrument.__str__())
 
     def natural_key(self):
-        return (self.platform.short_name, self.instrument.short_name)
+        return (self.platform.natural_key(), self.instrument.natural_key())
 
 class Personnel(models.Model):
     '''
@@ -103,8 +100,8 @@ class Dataset(models.Model):
             In addition to some general information, the summary should also
             contain information about the project from/for which the data was
             collected/created
-    source : ForeignKey to Source
-            Contains information about the instrument and platform by which the
+    sources : ManyToMany relation to Source
+            Contains information about the instruments and platforms by which the
             data was collected
     time_coverage_start : DateTimeField
     time_coverage_end : DateTimeField
@@ -131,13 +128,14 @@ class Dataset(models.Model):
         ]
     )
     entry_title = models.CharField(max_length=220)
-    parameters = models.ManyToManyField(Parameter, through='DatasetParameter')
+    #parameters = models.ManyToManyField(Parameter, through='DatasetParameter')
+    parameters = models.ManyToManyField(Parameter)
     ISO_topic_category = models.ForeignKey(ISOTopicCategory, on_delete=models.CASCADE)
     data_center = models.ForeignKey(DataCenter, on_delete=models.CASCADE)
     summary = models.TextField()
 
     # DIF highly recommended fields
-    source = models.ForeignKey(Source, blank=True, null=True, on_delete=models.CASCADE)
+    sources = models.ManyToManyField(Source)
     time_coverage_start = models.DateTimeField(blank=True, null=True)
     time_coverage_end = models.DateTimeField(blank=True, null=True)
     geographic_location = models.ForeignKey(GeographicLocation, blank=True, null=True, on_delete=models.CASCADE)
@@ -146,8 +144,7 @@ class Dataset(models.Model):
             choices=ACCESS_CHOICES, blank=True, null=True)
 
     def __str__(self):
-        return '%s/%s/%s' % (self.source.platform, self.source.instrument,
-                self.time_coverage_start.isoformat())
+        return self.entry_title
 
 # Keep this for reference if we want to add it
 #class DataResolution(models.Model):
@@ -179,7 +176,7 @@ class Meta:
         unique_together = (('uri', 'dataset'),)
 
     def __str__(self):
-        return '%s: %s'%(self.dataset, os.path.split(self.uri)[1])
+        return str(self.uri)
 
     def protocol(self):
         return self.uri.split(':')[0]