create now creates experiments too. config file now has test inst/site/exp/filetype

metobscommon/archive/config.yaml

@@ -51,6 +51,19 @@ instruments:
       filetypes:
         - mendota.buoy.ascii
         - mendota.buoy.png
+  test_site_1:
+    display_name: 'test_site_1'
+    test_inst_1:
+      display_name: 'test_inst_1'
+      filetypes:
+        - test_site_1.test_inst_1.png
+  test_site_2:
+    display_name: 'test_site_2'
+    test_inst_2:
+      display_name: 'test_inst_2'
+      filetypes:
+        - test_site_2.test_inst_2.ascii
+        - test_site_2.test_inst_2.nc
 
 filetypes:
   aoss.aeri.par.l00.v00:
@@ -173,7 +186,7 @@ filetypes:
     period: 'Half-Daily'
     format_pattern: '{site}_{inst}.{start_time:%y-%m-%d_%h%m%s}_{end_time:%h%m%s}.png'
     glob_pattern: '*_*.????-??-??_??????_??????*.png'
-  aoss.ceilo.tn.png:
+  #aoss.ceilo.tn.png:
 
   aoss.tower.ascii:
     period: 'Daily'
@@ -211,7 +224,19 @@ filetypes:
     period: 'Daily'
     format_pattern: '{site}_{inst}.{measurement}.{start_time:%y-%m-%d_%h%m%s}_{end_time:%h%m%s}.png'
     glob_pattern: '*_*.*.????-??-??_??????_??????*.png'
-  experiments:
-    test_experiment:
-      start_time: '2000-01-01T01:02:03'
-      end_time: '2000-01-02T01:02:03'
+  test_site_1.test_inst_1.png:
+    period: 'Daily'
+    format_pattern:
+    glob_pattern: ' '
+  test_site_2.test_inst_2.ascii:
+  test_site_2.test_inst_2.nc:
+
+experiments:
+  test_exp_1:
+    start_time: '2000-01-01T01:02:03'
+    end_time: '2000-01-02T01:02:03'
+    site: 'test_site_1'
+  test_exp_2:
+    start_time: '2017-10-10'
+    end_time: '2017-10-11'
+    site: 'test_site_1, test_site_2'

metobscommon/archive/db.py

@@ -484,6 +484,23 @@ def _create(args):
                             else:
                                 curr_filetype = FileType(name=f, glob_pattern=d['glob_pattern'], format_pattern=d['format_pattern'], level=level, period=d['period'])
                                 curr_filetype.add_instrument(curr_inst)
+        for e in docs['experiments'].keys():
+            exp_q = session.query(Experiment).filter(Experiment.name == e)
+            if len(exp_q.all()) > 0:
+                curr_exp = exp_q.all()[0]
+            else:
+                curr_exp = Experiment(name = e)
+            curr_exp.start_time = _parse_datetime(docs['experiments'][e]['start_time'])
+            curr_exp.end_time = _parse_datetime(docs['experiments'][e]['end_time'])
+            session.add(curr_exp)
+            session.commit()
+            for s in docs['experiments'][e]['site'].replace(' ', '').split(','):
+                if len(exp_q.filter(Experiment.site.any(name = s)).all()) == 0:
+                    curr_site = session.query(Site).filter(Site.name == s).all()
+                    if len(curr_site) > 0:
+                        curr_exp.add_site(curr_site[0])
+                    else:
+                        raise ValueError('Error in YAML: {} site does not exist'.format(s))
 
     #remove database if process failed
     except: