diff --git a/modules/comscripts/comgendb.py b/modules/comscripts/comgendb.py index d35e970..bec611b 100755 --- a/modules/comscripts/comgendb.py +++ b/modules/comscripts/comgendb.py @@ -160,23 +160,6 @@ class comgendb(ctools.cscript): # Return relative path return relpath - def _tjd_start(self, element): - """ - Return 'tjd_start' value from dictionary - - Parameters - ---------- - element : dict - Element of list - - Returns - ------- - tjd_start : float - Value of element['tjd_start'] - """ - # Return - return element.get('tjd_start') - def _get_evp_list(self): """ Get EVP list @@ -209,7 +192,7 @@ class comgendb(ctools.cscript): evp_list.extend(evps) # Sort EVP list by start day - evp_list.sort(key=self._tjd_start) + evp_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return EVP list return evp_list @@ -291,7 +274,7 @@ class comgendb(ctools.cscript): evp_list.append(evp_dict) # Sort EVP list by start day - evp_list.sort(key=self._tjd_start) + evp_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return EVP list return evp_list @@ -443,7 +426,7 @@ class comgendb(ctools.cscript): oad_list.extend(oads) # Sort OAD list by start day - oad_list.sort(key=self._tjd_start) + oad_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return OAD list return oad_list @@ -505,7 +488,7 @@ class comgendb(ctools.cscript): oad_list.append(oad_dict) # Sort OAD list by start day - oad_list.sort(key=self._tjd_start) + oad_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return OAD list return oad_list @@ -630,7 +613,7 @@ class comgendb(ctools.cscript): tim_list.extend(tims) # Sort TIM list by start day - tim_list.sort(key=self._tjd_start) + tim_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return TIM list return tim_list @@ -691,8 +674,8 @@ class comgendb(ctools.cscript): # Append dictionary tim_list.append(tim_dict) - # Sort OAD list by start day - tim_list.sort(key=self._tjd_start) + # Sort TIM list by start day + tim_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return TIM list return tim_list @@ -841,7 +824,7 @@ class comgendb(ctools.cscript): xml_list.append(xml) # Sort XML list by start day - xml_list.sort(key=self._tjd_start) + xml_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return XML list return xml_list @@ -1228,7 +1211,7 @@ class comgendb(ctools.cscript): oads.append(oad) # Sort OAD list by start day - oads.sort(key=self._tjd_start) + oads.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start'])) # Return OADs return oads