[chronojump] Fixed import exercise on forceSensor, runEncoder. Removed unneded code



commit 11002b6164b97412c210024efeb3363f1926ec48
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Apr 23 12:01:21 2020 +0200

    Fixed import exercise on forceSensor, runEncoder. Removed unneded code

 src/chronojump-importer/chronojump_importer.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index 4f5cf5e0..fee7914f 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -684,15 +684,11 @@ class ImportSession:
         if(DEBUGTOFILE):
             debugFile.write(" start _import_forceSensor\n")
 
-        forceSensor_exercise_from_forceSensor = self.source_db.read(table_name="ForceSensorExercise",
-                where_condition="ForceSensor.uniqueID={}".format(self.source_session),
+        forceSensor_exercise = self.source_db.read(table_name="ForceSensorExercise",
+                where_condition="ForceSensor.sessionID={}".format(self.source_session),
                 join_clause="LEFT JOIN ForceSensor ON ForceSensor.exerciseID=ForceSensorExercise.uniqueID",
                 group_by_clause="ForceSensorExercise.uniqueID")
 
-        forceSensor_exercise = Table("forceSensorExercise")
-        forceSensor_exercise.concatenate_table(forceSensor_exercise_from_forceSensor)
-        forceSensor_exercise.remove_duplicates()
-
 
         self.destination_db.write(table=forceSensor_exercise,
                                   matches_columns=self.destination_db.column_names("ForceSensorExercise", 
["uniqueID"]))
@@ -721,15 +717,11 @@ class ImportSession:
         if(DEBUGTOFILE):
             debugFile.write(" start _import_runEncoder\n")
 
-        runEncoder_exercise_from_runEncoder = self.source_db.read(table_name="RunEncoderExercise",
-                where_condition="RunEncoder.uniqueID={}".format(self.source_session),
+        runEncoder_exercise = self.source_db.read(table_name="RunEncoderExercise",
+                where_condition="RunEncoder.sessionID={}".format(self.source_session),
                 join_clause="LEFT JOIN RunEncoder ON RunEncoder.exerciseID=RunEncoderExercise.uniqueID",
                 group_by_clause="RunEncoderExercise.uniqueID")
 
-        runEncoder_exercise = Table("runEncoderExercise")
-        runEncoder_exercise.concatenate_table(runEncoder_exercise_from_runEncoder)
-        runEncoder_exercise.remove_duplicates()
-
 
         self.destination_db.write(table=runEncoder_exercise,
                                   matches_columns=self.destination_db.column_names("RunEncoderExercise", 
["uniqueID"]))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]