Changeset 8460 for mauRepo/MolesManager/trunk/src/libs/migration/processor/commons.py

Timestamp:

10/07/12 15:15:27 (9 years ago)

Author:

mnagni

Message:

Complete - # 22489: CEDA Observation Collection - phenomenonTime
 http://team.ceda.ac.uk/trac/ceda/ticket/22489
Complete - # 22518: The description is broken
 http://team.ceda.ac.uk/trac/ceda/ticket/22518
Complete - # 22488: CEDA Observation Collection - Geographical Extent
 http://team.ceda.ac.uk/trac/ceda/ticket/22488

Now the Moles3EPB explicitly call the "synchronise" method in the SQLAlchemy mapped classes to assure the persistence of the data
Uses the CedaMolesModel? v 0.1.5 which correct a major problem in synchronise the instances with database

File:

• mauRepo/MolesManager/trunk/src/libs/migration/processor/commons.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/src/libs/migration/processor/commons.py

@@ -959 +959 @@
             tm_position = createTM_Position(date8601 = createDate(isoDateStringToTimeDate(doc_phenomenon_time)))
             pt = createTM_Instant(tm_position)
-    return pt
+        return pt
 
 def fromPhenomenonTimeToString(phenomenonTime):
@@ -988 +988 @@
     return str(datetime.date(int(idate.year), int(idate.month), int(idate.day)))
 
-def fromGeographicBoundingBoxToString(geographicBoundingBox):
-    if geographicBoundingBox is None:
+def fromGeographicBoundingBoxToString(gbb):
+    if gbb is None:
         return None
-    return ('%f %f,%f %f') % (geographicBoundingBox.eastBoundLongitude, geographicBoundingBox.northBoundLatitude, \
-                              geographicBoundingBox.westBoundLongitude, geographicBoundingBox.southBoundLatitude)
+    return '{0} {1},{2} {3}'.format(gbb.eastBoundLongitude, gbb.northBoundLatitude, gbb.westBoundLongitude, gbb.southBoundLatitude)
     
 def compareGeographicBoundingBoxes(gb1, gb2):