diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py
index 39dac26af309c4c879218fe873f5521e99e71f01..a6bed3f26771a61656faa26a8589f8db4a090a20 100644
--- a/src/Model/D90AdisTS/D90AdisTS.py
+++ b/src/Model/D90AdisTS/D90AdisTS.py
@@ -71,7 +71,7 @@ class D90AdisTS(SQLSubModel):
@classmethod
def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".")
- if major == minor == "0":
+ if major == 0 and minor < 1:
if int(release) < 6:
cls._db_create(execute)
diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py
index 78992c67f3c1a8a27aee9900ffbc1a73ce0adb64..948e8f786adfb47d813035ba42893709e58cb595 100644
--- a/src/Model/D90AdisTS/D90AdisTSSpec.py
+++ b/src/Model/D90AdisTS/D90AdisTSSpec.py
@@ -72,7 +72,7 @@ class D90AdisTSSpec(SQLSubModel):
@classmethod
def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".")
- if major == minor == "0":
+ if major == 0 and minor < 1:
if int(release) < 6:
cls._db_create(execute)
@@ -89,28 +89,29 @@ class D90AdisTSSpec(SQLSubModel):
f"WHERE d90_default = {data['d90_default_id']} "
)
- for row in table:
- id = row[0]
- name = row[2]
- reach = row[3]
- start_rk = row[4]
- end_rk = row[5]
- d90 = row[6]
- enabled = (row[7] == 1)
-
- new_spec = cls(
- id=id,
- name=name,
- status=data['status']
- )
-
- new_spec.reach = reach
- new_spec.start_rk = start_rk
- new_spec.end_rk = end_rk
- new_spec.d90 = d90
- new_spec.enabled = enabled
-
- new.append(new_spec)
+ if table is not None:
+ for row in table:
+ id = row[0]
+ name = row[2]
+ reach = row[3]
+ start_rk = row[4]
+ end_rk = row[5]
+ d90 = row[6]
+ enabled = (row[7] == 1)
+
+ new_spec = cls(
+ id=id,
+ name=name,
+ status=data['status']
+ )
+
+ new_spec.reach = reach
+ new_spec.start_rk = start_rk
+ new_spec.end_rk = end_rk
+ new_spec.d90 = d90
+ new_spec.enabled = enabled
+
+ new.append(new_spec)
return new
diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py
index c04479416e45e7d53b5933b164db4306e8847a4e..b40b09f510416af89a26a56bd1549e8439b343cd 100644
--- a/src/Model/DIFAdisTS/DIFAdisTS.py
+++ b/src/Model/DIFAdisTS/DIFAdisTS.py
@@ -78,7 +78,7 @@ class DIFAdisTS(SQLSubModel):
@classmethod
def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".")
- if major == minor == "0":
+ if major == 0 and minor < 1:
if int(release) < 6:
cls._db_create(execute)
diff --git a/src/Model/DIFAdisTS/DIFAdisTSSpec.py b/src/Model/DIFAdisTS/DIFAdisTSSpec.py
index 306c12fcb7cb9a860ee7fee0ceb177d3ddd8848b..606551c0eeddd3f5ccab4167144d46bd32658035 100644
--- a/src/Model/DIFAdisTS/DIFAdisTSSpec.py
+++ b/src/Model/DIFAdisTS/DIFAdisTSSpec.py
@@ -76,7 +76,7 @@ class DIFAdisTSSpec(SQLSubModel):
@classmethod
def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".")
- if major == minor == "0":
+ if major == 0 and minor < 1:
if int(release) < 6:
cls._db_create(execute)
@@ -93,32 +93,33 @@ class DIFAdisTSSpec(SQLSubModel):
f"WHERE dif_default = {data['dif_default_id']} "
)
- for row in table:
- id = row[0]
- method = row[2]
- reach = row[3]
- start_rk = row[4]
- end_rk = row[5]
- dif = row[6]
- b = row[7]
- c = row[8]
- enabled = (row[9] == 1)
-
- new_spec = cls(
- id=id,
- method=method,
- status=data['status']
- )
-
- new_spec.reach = reach
- new_spec.start_rk = start_rk
- new_spec.end_rk = end_rk
- new_spec.dif = dif
- new_spec.b = b
- new_spec.c = c
- new_spec.enabled = enabled
-
- new.append(new_spec)
+ if table is not None:
+ for row in table:
+ id = row[0]
+ method = row[2]
+ reach = row[3]
+ start_rk = row[4]
+ end_rk = row[5]
+ dif = row[6]
+ b = row[7]
+ c = row[8]
+ enabled = (row[9] == 1)
+
+ new_spec = cls(
+ id=id,
+ method=method,
+ status=data['status']
+ )
+
+ new_spec.reach = reach
+ new_spec.start_rk = start_rk
+ new_spec.end_rk = end_rk
+ new_spec.dif = dif
+ new_spec.b = b
+ new_spec.c = c
+ new_spec.enabled = enabled
+
+ new.append(new_spec)
return new
diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py
index b8f3b7d07f477c7febb7c09dab65de44261cdbf4..bf720edf5adbac2b82166dd2909db58fd8876faa 100644
--- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py
+++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py
@@ -80,7 +80,7 @@ class InitialConditionsAdisTS(SQLSubModel):
@classmethod
def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".")
- if major == minor == "0":
+ if major == 0 and minor < 1:
if int(release) < 6:
cls._db_create(execute)
diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py
index b98815e6428209638203064c3292689987aa02e6..3014c2670d62d359ee3cb4e684108569403b7808 100644
--- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py
+++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py
@@ -80,7 +80,7 @@ class ICAdisTSSpec(SQLSubModel):
@classmethod
def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".")
- if major == minor == "0":
+ if major == 0 and minor < 1:
if int(release) < 6:
cls._db_create(execute)
@@ -97,38 +97,39 @@ class ICAdisTSSpec(SQLSubModel):
f"WHERE ic_default = {data['ic_default_id']} "
)
- for row in table:
- id = row[0]
- name = row[2]
- reach = row[3]
- start_rk = row[4]
- end_rk = row[5]
- concentration = row[6]
- eg = row[7]
- em = row[8]
- ed = row[9]
- rate = row[10]
- enabled = (row[11] == 1)
-
- #new_spec = [name, reach, start_rk, end_rk, concentration, eg, em, ed, rate, enabled]
-
- new_spec = cls(
- id=id,
- name=name,
- status=data['status']
- )
-
- new_spec.reach = reach
- new_spec.start_rk = start_rk
- new_spec.end_rk = end_rk
- new_spec.concentration = concentration
- new_spec.eg = eg
- new_spec.em = em
- new_spec.ed = ed
- new_spec.rate = rate
- new_spec.enabled = enabled
-
- new.append(new_spec)
+ if table is not None:
+ for row in table:
+ id = row[0]
+ name = row[2]
+ reach = row[3]
+ start_rk = row[4]
+ end_rk = row[5]
+ concentration = row[6]
+ eg = row[7]
+ em = row[8]
+ ed = row[9]
+ rate = row[10]
+ enabled = (row[11] == 1)
+
+ #new_spec = [name, reach, start_rk, end_rk, concentration, eg, em, ed, rate, enabled]
+
+ new_spec = cls(
+ id=id,
+ name=name,
+ status=data['status']
+ )
+
+ new_spec.reach = reach
+ new_spec.start_rk = start_rk
+ new_spec.end_rk = end_rk
+ new_spec.concentration = concentration
+ new_spec.eg = eg
+ new_spec.em = em
+ new_spec.ed = ed
+ new_spec.rate = rate
+ new_spec.enabled = enabled
+
+ new.append(new_spec)
return new