|
56 | 56 | "Screen": omero.model.ScreenI,
|
57 | 57 | "Well": omero.model.WellI,
|
58 | 58 | "Roi": omero.model.RoiI,
|
| 59 | + "BooleanAnnotation": omero.model.BooleanAnnotationI, |
| 60 | + "CommentAnnotation": omero.model.CommentAnnotationI, |
| 61 | + "DoubleAnnotation": omero.model.DoubleAnnotationI, |
59 | 62 | "FileAnnotation": omero.model.FileAnnotationI,
|
60 | 63 | "ListAnnotation": omero.model.ListAnnotationI,
|
| 64 | + "LongAnnotation": omero.model.LongAnnotationI, |
61 | 65 | "MapAnnotation": omero.model.MapAnnotationI,
|
62 | 66 | "TagAnnotation": omero.model.TagAnnotationI,
|
| 67 | + "TermAnnotation": omero.model.TermAnnotationI, |
| 68 | + "TimestampAnnotation": omero.model.TimestampAnnotationI, |
63 | 69 | "XmlAnnotation": omero.model.XmlAnnotationI,
|
64 | 70 | }
|
65 | 71 |
|
@@ -145,8 +151,9 @@ def generate_omero_columns_csv(csv_path, chunk_size=1000):
|
145 | 151 |
|
146 | 152 | def create_table(source, table_name, links, conn, chunk_size):
|
147 | 153 | # Create an OMERO.table and upload data
|
148 |
| - # Make type case-insensitive |
149 |
| - links = [(t.lower().capitalize(), i) for t, i in links] |
| 154 | + # Make type case-insensitive, handling annotation caps properly |
| 155 | + links = [(t.lower().capitalize().replace("annotation", "Annotation"), i) |
| 156 | + for t, i in links] |
150 | 157 | # Validate link list
|
151 | 158 | working_group = None
|
152 | 159 | roi_only = True
|
|
0 commit comments