Fix column order validation

sdrf_pipelines/sdrf/sdrf_schema.py

@@ -280,19 +280,19 @@ def validate_columns_order(panda_sdrf):
         error_columns_order = []
         if "assay name" in list(panda_sdrf):
             cnames = list(panda_sdrf)
-            index = cnames.index("assay name")
+            assay_index = cnames.index("assay name")
             factor_tag = False
-            for column in cnames:
-                if ("comment" in column or "technology type" in column) and cnames.index(column) < index:
-                    error_message = "The column " + column + "cannot be before the assay name"
+            for idx, column in enumerate(cnames):
+                if "comment" in column and idx < assay_index:
+                    error_message = "The column " + column + " cannot be before the assay name"
                     error_columns_order.append(LogicError(error_message, error_type=logging.ERROR))
                 if (
                     "characteristics" in column or ("material type" in column and "factor value" not in column)
-                ) and cnames.index(column) > index:
-                    error_message = "The column " + column + "cannot be after the assay name"
+                     or "technology type" in column) and idx > assay_index:
+                    error_message = "The column " + column + " cannot be after the assay name"
                     error_columns_order.append(LogicError(error_message, error_type=logging.ERROR))
                 if "factor value" in column and not factor_tag:
-                    factor_index = cnames.index(column)
+                    factor_index = idx
                     factor_tag = True
             if factor_tag:
                 temp = []