Merge branch 'sample-genome-assembly-naming' into 'master'

Modify chip-meta-import to first try and set the genome type based on the sample

See merge request !36

scripts/chip-meta-import

@@ -68,8 +68,8 @@ if not args.quiet:
 for i, document in enumerate(cursor):
         for f in document["files"]:
                 doc = {}
-                if ("assembly" in document and len(document["assembly"]) > 0) or "assembly" in f:
-                    assembly = document["assembly"][0] if ("assembly" in document and len(document["assembly"]) > 0) else f["assembly"]
+                if "assembly" in f or ("assembly" in document and len(document["assembly"]) > 0):
+                    assembly = f["assembly"] if "assembly" in f else document["assembly"][0]
                     if "accession" in f:
                         doc["experiment_id"] = document["uuid"]
                         doc["organism"] = organism[assembly[:2].lower()]