raise correct error when from and until parameters have different gra…

…nularities

--HG--
extra : convert_revision : svn%3A882ca7fe-3cf8-0310-95c5-f9aabef819dd/pyoai/trunk%4034776

HISTORY.txt

@@ -2,9 +2,13 @@
 oaipmh changelog
 ================
 
-2.4 (unreleased)
+2.3.1 (2009-04-24)
 ================
 
+Changes
+-------
+
+* Raise correct error when from and until parameters have different granularities
 2.3 (2009-04-23)
 ================
 

setup.py

@@ -2,10 +2,15 @@
 
 setup(
     name='pyoai',
-    version='2.4dev',
+    version='2.3.1',
     author='Infrae',
     author_email='[email protected]',
     url='http://www.infrae.com/download/oaipmh',
+    classifiers=["Development Status :: 4 - Beta",
+                 "Programming Language :: Python",
+                 "License :: OSI Approved :: BSD License",
+                 "Topic :: Software Development :: Libraries :: Python Modules",
+                 "Environment :: Web Environment"],
     description="""\
 The oaipmh module is a Python implementation of an "Open Archives
 Initiative Protocol for Metadata Harvesting" (version 2) client and server.

src/oaipmh/server.py

@@ -279,7 +279,14 @@ def handleRequest(self, request_kw):
                     raise error.BadArgumentError(
                         "The value '%s' of the argument "
                         "'%s' is not valid." %(until, 'until'))
-
+
+            if from_ is not None and until is not None:
+                if (('T' in from_ and not 'T' in until) or
+                    ('T' in until and not 'T' in from_)):
+                    raise error.BadArgumentError(
+                        "The request has different granularities for"
+                        " the from and until parameters")
+
             # now validate parameters
             try:
                 validation.validateResumptionArguments(verb, request_kw)

src/oaipmh/tests/test_server.py

@@ -270,6 +270,18 @@ def test_badDateArgument(self):
               "The value 'junk' of the argument 'until' is not valid.")],
             xml)
 
+
+    def testDifferentGranularities(self):
+        xml = self._server.handleRequest({'verb': 'ListRecords',
+                                          'metadataPrefix': 'oai_dc',
+                                          'from': '2006-01-01',
+                                          'until': '2008-01-01T00:00:00Z'})
+        self.assertErrors(
+            [('badArgument',
+              "The request has different granularities for the from"
+              " and until parameters")],
+            xml)
+
 
     def assertErrors(self, errors, xml):
         self.assertEquals(errors, self.findErrors(xml))