Changeset 8546 for mauRepo

Timestamp:

30/08/12 10:10:17 (7 years ago)

Author:

mnagni

Message:

Complete - # 22528: Migration of FAtCat Open Search link for HPFeld
 http://team.ceda.ac.uk/trac/ceda/ticket/22528
Corrected some unittests

Location:

mauRepo/MolesManager/trunk/cedaMoles

Files:

• libs/migration/processor/commons.py (modified) (1 diff)
• tests/moles2gui/creationFactory.py (modified) (1 diff)
• tests/moles2gui/om/period.py (modified) (2 diffs)

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

@@ -969 +969 @@
     return ceda_project
 
-def from_date_string_to_pt(start, end):
-    """
-        Transforms a date string like '2002-07-22' (startDate) in a TM_Instant instance or   
-        '2002-07-22/2011-08-06' (start/endDate) in a TM_Period instance
-        @param doc_phenomenon_time: a date string in the expected format
-    """
+def from_date_string_to_pt(start = None, end = None):
+    """
+    Transforms a date string like '2002-07-22' (start) in a TM_Instant instance or   
+        pair '2002-07-22', '2011-08-06' (start, end) in a TM_Period instance
+    **Parameters**
+        * start:String - the start date with format YYYY-MM-DD
+        * end:String - the end date with format YYYY-MM-DD
+        
+    **Returns**
+        A TM_Instant if only `start` has a value not None
+        A TM_Period if both `start` and `end` have values not None
+    """    
     pt = None
     if end is not None and start is not None:

mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/creationFactory.py

@@ -102 +102 @@
     return identifier
 
-def assembleObservation(phenomenonTime = '2002-07-22/2011-08-06'):
+def assembleObservation(start = '2002-07-22', end ='2011-08-06'):
     ceda_observation = CEDA_Observation()
     ceda_observation.relatedParty = assembleMO_ResponsiblePartyInfo()
     ceda_observation.resultTime = assembleTM_Instant()
-    ceda_observation.phenomenonTime = from_date_string_to_pt(phenomenonTime)
+    ceda_observation.phenomenonTime = from_date_string_to_pt(start, end)
     bb = create_ex_geographic_boundingbox(180, 90, -180, -90)
     bb.id = 12    

mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/om/period.py

@@ -51 +51 @@
         Validates a simple encode/decode
         """
-        period = from_date_string_to_pt('2002-07-22/2011-08-06') 
+        period = from_date_string_to_pt('2002-07-22', '2011-08-06') 
         json = encodeCedaMoles2Json(period)
         #----------------------- test ------------------------
@@ -69 +69 @@
         Decodes an updated json object
         """
-        period = from_date_string_to_pt('2002-07-22/2011-08-06') 
+        period = from_date_string_to_pt('2002-07-22', '2011-08-06') 
         json = encodeCedaMoles2Json(period)
         dec_json = loads(json)