Changeset 8584
- Timestamp:
- 01/10/12 13:05:03 (8 years ago)
- Location:
- mauRepo/HPFos/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/commons.py
r8580 r8584 79 79 datetime.strptime(datetime_withnotz.group(0), DATETIME_FORMAT) 80 80 81 if tzmins is not None and ret_datetime is not None: 82 ret_datetime = ret_datetime.replace(tzinfo = OS_tz(tzmins)) 81 if ret_datetime is not None: 82 if tzmins is not None: 83 ret_datetime = ret_datetime.replace(tzinfo = OS_tz(tzmins)) 83 84 return ret_datetime 84 85 85 86 datetime_simple = re.match(dateformat, datestr) 86 87 if datetime_simple is not None: 87 ret_datetime = datetime.strptime(datetime_simple.group(0), DATE_FORMAT) 88 return ret_datetime 88 return datetime.strptime(datetime_simple.group(0), DATE_FORMAT) 89 89 90 90 def tm_InstantToDatetime(tm_instant): -
mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py
r8582 r8584 286 286 def generateEntryLinks(self, entry, atomroot, path, linkid = None): 287 287 entry.append(create_autodiscovery_link(atomroot, path, self.extension, \ 288 linkid, None,rel = REL_ALTERNATE))288 linkid, rel = REL_ALTERNATE)) 289 289 entry.append(create_autodiscovery_link(atomroot, path, self.extension, \ 290 linkid, None,rel = REL_SEARCH))290 linkid, rel = REL_SEARCH)) 291 291 292 292 def generate_entries(self, atomroot, subresults, path): -
mauRepo/HPFos/trunk/hpfos/tests/testos.py
r8580 r8584 84 84 result = self._generate_results(count=7, start_index=3, start_page=1, tot_results=40) 85 85 response = ar.generate_response(result, queries, '', context) 86 self.assertTrue('<link href="/search/atom/?startIndex=3 " rel="self" type="application/atom+xml"/>' in response, "Error")87 self.assertTrue('<link href="/search/atom/?startIndex=1 " rel="previous" type="application/atom+xml"/>' in response, "Error")88 self.assertTrue('<link href="/search/atom/?startIndex=1 " rel="first" type="application/atom+xml"/>' in response, "Error")89 self.assertTrue('<link href="/search/atom/?startIndex=10 " rel="next" type="application/atom+xml"/>' in response, "Error")90 self.assertTrue('<link href="/search/atom/?startIndex=38 " rel="last" type="application/atom+xml"/>' in response, "Error")86 self.assertTrue('<link href="/search/atom/?startIndex=3&count=7" rel="self" type="application/atom+xml"/>' in response, "Error") 87 self.assertTrue('<link href="/search/atom/?startIndex=1&count=7" rel="previous" type="application/atom+xml"/>' in response, "Error") 88 self.assertTrue('<link href="/search/atom/?startIndex=1&count=7" rel="first" type="application/atom+xml"/>' in response, "Error") 89 self.assertTrue('<link href="/search/atom/?startIndex=10&count=7" rel="next" type="application/atom+xml"/>' in response, "Error") 90 self.assertTrue('<link href="/search/atom/?startIndex=38&count=7" rel="last" type="application/atom+xml"/>' in response, "Error") 91 91 92 92 result = self._generate_results(count=10, start_index=5, start_page=1, tot_results=20) 93 93 response = ar.generate_response(result, queries, '', context) 94 self.assertTrue('<link href="/search/atom/?startIndex=5 " rel="self" type="application/atom+xml"/>' in response, "Error")95 self.assertTrue('<link href="/search/atom/?startIndex=1 " rel="previous" type="application/atom+xml"/>' in response, "Error")96 self.assertTrue('<link href="/search/atom/?startIndex=1 " rel="first" type="application/atom+xml"/>' in response, "Error")97 self.assertTrue('<link href="/search/atom/?startIndex=15 " rel="next" type="application/atom+xml"/>' in response, "Error")98 self.assertTrue('<link href="/search/atom/?startIndex=15 " rel="last" type="application/atom+xml"/>' in response, "Error")94 self.assertTrue('<link href="/search/atom/?startIndex=5&count=10" rel="self" type="application/atom+xml"/>' in response, "Error") 95 self.assertTrue('<link href="/search/atom/?startIndex=1&count=10" rel="previous" type="application/atom+xml"/>' in response, "Error") 96 self.assertTrue('<link href="/search/atom/?startIndex=1&count=10" rel="first" type="application/atom+xml"/>' in response, "Error") 97 self.assertTrue('<link href="/search/atom/?startIndex=15&count=10" rel="next" type="application/atom+xml"/>' in response, "Error") 98 self.assertTrue('<link href="/search/atom/?startIndex=15&count=10" rel="last" type="application/atom+xml"/>' in response, "Error") 99 99 100 100 result = self._generate_results(count=2, start_index=2, start_page=1, tot_results=5) 101 101 response = ar.generate_response(result, queries, '', context) 102 self.assertTrue('<link href="/search/atom/?startIndex=2 " rel="self" type="application/atom+xml"/>' in response, "Error")103 self.assertTrue('<link href="/search/atom/?startIndex=1 " rel="previous" type="application/atom+xml"/>' in response, "Error")104 self.assertTrue('<link href="/search/atom/?startIndex=1 " rel="first" type="application/atom+xml"/>' in response, "Error")105 self.assertTrue('<link href="/search/atom/?startIndex=4 " rel="next" type="application/atom+xml"/>' in response, "Error")106 self.assertTrue('<link href="/search/atom/?startIndex=4 " rel="last" type="application/atom+xml"/>' in response, "Error")102 self.assertTrue('<link href="/search/atom/?startIndex=2&count=2" rel="self" type="application/atom+xml"/>' in response, "Error") 103 self.assertTrue('<link href="/search/atom/?startIndex=1&count=2" rel="previous" type="application/atom+xml"/>' in response, "Error") 104 self.assertTrue('<link href="/search/atom/?startIndex=1&count=2" rel="first" type="application/atom+xml"/>' in response, "Error") 105 self.assertTrue('<link href="/search/atom/?startIndex=4&count=2" rel="next" type="application/atom+xml"/>' in response, "Error") 106 self.assertTrue('<link href="/search/atom/?startIndex=4&count=2" rel="last" type="application/atom+xml"/>' in response, "Error") 107 107 108 108 result = self._generate_results(count=1, start_index=18, start_page=1, tot_results=20) 109 109 response = ar.generate_response(result, queries, '', context) 110 self.assertTrue('<link href="/search/atom/?startIndex=18" rel="self" type="application/atom+xml"/>' in response, "Error") 111 self.assertTrue('<link href="/search/atom/?startIndex=17" rel="previous" type="application/atom+xml"/>' in response, "Error") 112 self.assertTrue('<link href="/search/atom/?startIndex=1" rel="first" type="application/atom+xml"/>' in response, "Error") 113 self.assertTrue('<link href="/search/atom/?startIndex=19" rel="next" type="application/atom+xml"/>' in response, "Error") 114 self.assertTrue('<link href="/search/atom/?startIndex=20" rel="last" type="application/atom+xml"/>' in response, "Error") 110 self.assertTrue('<link href="/search/atom/?startIndex=18&count=1" rel="self" type="application/atom+xml"/>' in response, "Error") 111 self.assertTrue('<link href="/search/atom/?startIndex=17&count=1" rel="previous" type="application/atom+xml"/>' in response, "Error") 112 self.assertTrue('<link href="/search/atom/?startIndex=1&count=1" rel="first" type="application/atom+xml"/>' in response, "Error") 113 self.assertTrue('<link href="/search/atom/?startIndex=19&count=1" rel="next" type="application/atom+xml"/>' in response, "Error") 114 self.assertTrue('<link href="/search/atom/?startIndex=20&count=1" rel="last" type="application/atom+xml"/>' in response, "Error") 115 116 result = self._generate_results(count=1, start_index=1, start_page=1, tot_results=2) 117 response = ar.generate_response(result, queries, '', context) 118 self.assertTrue('<link href="/search/atom/?startIndex=1&count=1" rel="self" type="application/atom+xml"/>' in response, "Error") 119 self.assertTrue('<link href="/search/atom/?startIndex=1&count=1" rel="previous" type="application/atom+xml"/>' in response, "Error") 120 self.assertTrue('<link href="/search/atom/?startIndex=1&count=1" rel="first" type="application/atom+xml"/>' in response, "Error") 121 self.assertTrue('<link href="/search/atom/?startIndex=2&count=1" rel="next" type="application/atom+xml"/>' in response, "Error") 122 self.assertTrue('<link href="/search/atom/?startIndex=2&count=1" rel="last" type="application/atom+xml"/>' in response, "Error") 115 123 116 124 -
mauRepo/HPFos/trunk/hpfos/tests/testsetup.py
r8580 r8584 34 34 def tearDown(self): 35 35 pass 36 36 37 ''' 37 38 def test_search_observation_collection(self): 38 39 res = HPFosTest.epbRepo.getObservationCollections() 39 40 ibbox = create_st_setSRID(180,-90,-180,90) 40 41 res = HPFosTest.epbRepo.getObservationCollections(bbox=ibbox) 42 ''' 41 43 42 44 class MyRequest(RequestFactory): -
mauRepo/HPFos/trunk/resources/requirements.txt
r8550 r8584 7 7 # --extra-index-url http://ciprod1.cems.rl.ac.uk/pip 8 8 # to your pip install 9 ceda-markup==0.0.1 19 ceda-markup==0.0.12 10 10 ceda-moles-model==0.1.5 11 11 -
mauRepo/HPFos/trunk/setup.py
r8550 r8584 38 38 'html5lib==0.95', \ 39 39 'ceda-moles-model==0.1.5', 40 'ceda-markup==0.0.1 0',40 'ceda-markup==0.0.12', 41 41 'psycopg2', 42 42 'nose'],
Note: See TracChangeset
for help on using the changeset viewer.