Merge pull request #408 from PanDAWMS/tania_dev

core | add framework column to JediTask model
PanDAWMS · Nov 20, 2024 · 5adc0ee · 5adc0ee
2 parents ab220bd + 7c488e4
commit 5adc0ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/common/models.py b/core/common/models.py
@@ -309,6 +309,7 @@ class JediTasksBase(models.Model):
     memoryleakcore = models.BigIntegerField(null=True, db_column='memory_leak_core', blank=True)
     memoryleakx2 = models.BigIntegerField(null=True, db_column='memory_leak_x2', blank=True)
     modificationtime = models.DateTimeField(db_column='realmodificationtime')
+    framework = models.CharField(max_length=100, db_column='framework', blank=True)
 
     def get_fields_by_type(self, ftype='integer'):
         field_list = [str(f.name) for f in self._meta.fields if ftype in str(f.description).lower()]

diff --git a/core/libs/sqlcustom.py b/core/libs/sqlcustom.py
@@ -64,7 +64,7 @@ def preprocess_wild_card_string(strToProcess, fieldToLookAt, **kwargs):
     for parameter in cardParametersRaw:
         leadStar = False
         trailStar = False
-        if len(parameter) > 0:
+        if currentParCount < countParameters - 1:
 
             if currentParCount - 1 >= 0:
                 leadStar = True