@@ -498,20 +498,23 @@ def restore(self):
498498 self .reset_filter ()
499499
500500 def save (self , result = None ):
501- values = self .memDB .getDataValuesDF ()
502-
503- if not result :
504- result = self .memDB .series_service .get_series (series_id = values ['resultid' ][0 ])
505- else :
506- values ["resultid" ] = result .ResultID
501+ try :
502+ values = self .memDB .getDataValuesDF ()
507503
508- # update result
509- result .ValueCount = 0
510- self .updateResult (result )
511- # upsert values
512- self .memDB .series_service .upsert_values (values )
513- # save new annotations
514- self .add_annotations (self .memDB .annotation_list )
504+ if not result :
505+ result = self .memDB .series_service .get_series (series_id = values ['resultid' ][0 ])
506+ else :
507+ values ["resultid" ] = result .ResultID
508+
509+ # update result
510+ result .ValueCount = 0
511+ self .updateResult (result )
512+ # upsert values
513+ self .memDB .series_service .upsert_values (values )
514+ # save new annotations
515+ self .add_annotations (self .memDB .annotation_list )
516+ except Exception as e :
517+ logger .error ("Exception encountered while saving: {}" .format (e ))
515518 return result
516519
517520 def save_existing (self , result ):
@@ -651,8 +654,8 @@ def updateResult(self, result, valuecount = -10):
651654
652655 setSchema (self .memDB .series_service ._session_factory .engine )
653656 self .memDB .series_service .update .updateResult (result .ResultID , result .ValueCount )
654- self .memDB .series_service .update .updateAction (actionID = action .ActionID , begin = action . BeginDateTime , end = action . EndDateTime )
655-
657+ self .memDB .series_service .update .updateAction (actionID = action .ActionID ,
658+ begin = action . BeginDateTime , end = action . EndDateTime )
656659 return result
657660
658661 def overlapcalc (self , result , values , overwrite ):
@@ -678,16 +681,12 @@ def add_annotations(self, annolist):
678681 #get df with only ValueID and AnnotationID
679682 #remove any duplicates
680683 #save df to db
681- pass
682-
683-
684-
685-
686-
687-
688-
684+ print ("ANNOTATIONS ARE ATTEMPTED TO ADD" )
685+ query = "SELECT resultid, datetime FROM TSRV"
686+ pd .read_sql (query , self ._session_factory .engine )
689687
690688
689+ pass
691690
692691
693692 #
0 commit comments