Changeset d160e4d in indico

Timestamp:

08/23/11 15:38:54 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

4dd9bd0

Parents:

c5fcd0

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (05/25/11 09:09:23)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:54)

Message:

[IMP] HTTP API - Several small fixes

Location:

indico

Files:

• util/fossilize/__init__.py (modified) (5 diffs)
• util/metadata/serializer.py (modified) (1 diff)
• web/http_api/handlers.py (modified) (7 diffs)

indico/util/fossilize/__init__.py

@@ -57 +57 @@
         zope.interface.classImplements(klazz, fossil)
 
+
 def clearCache():
     """
@@ -63 +64 @@
     Fossilizable.clearCache()
 
+
 class NonFossilizableException(Exception):
     """
     Object is not fossilizable (doesn't implement Fossilizable)
     """
+
 
 class InvalidFossilException(Exception):
@@ -74 +77 @@
     """
 
+
 class IFossil(zope.interface.Interface):
     """
     Fossil base interface. All fossil classes should derive from this one.
     """
+
 
 class Fossilizable(object):
@@ -187 +192 @@
         return interface
 
+
     @classmethod
     def clearCache(cls):
@@ -193 +199 @@
         """
         cls.__fossilAttrsCache = {}
+
 
     @classmethod

indico/util/metadata/serializer.py

@@ -18 +18 @@
 ## along with CDS Indico; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
 
 class Serializer(object):

indico/web/http_api/handlers.py

@@ -26 +26 @@
 import hashlib
 import hmac
-import itertools
 import re
 import time
@@ -32 +31 @@
 from urlparse import parse_qs
 from ZODB.POSException import ConflictError
-import pytz
 
 # indico imports
-from indico.web.http_api import ExportInterface, LimitExceededException, Exporter
+from indico.web.http_api import Exporter
 from indico.web.http_api.auth import APIKeyHolder
 from indico.web.http_api.cache import RequestCache
 from indico.web.http_api.responses import HTTPAPIResult, HTTPAPIError
 from indico.web.http_api.util import remove_lists, get_query_parameter
-from indico.web.http_api import API_MODE_KEY, API_MODE_ONLYKEY, API_MODE_SIGNED, API_MODE_ONLYKEY_SIGNED, API_MODE_ALL_SIGNED
+from indico.web.http_api import API_MODE_ONLYKEY, API_MODE_SIGNED, API_MODE_ONLYKEY_SIGNED, API_MODE_ALL_SIGNED
 from indico.web.wsgi import webinterface_handler_config as apache
 from indico.util.metadata.serializer import Serializer
@@ -46 +44 @@
 # indico legacy imports
 from MaKaC.common import DBMgr
-from MaKaC.common.fossilize import fossilizes, fossilize, Fossilizable
+from MaKaC.common.logger import Logger
+from MaKaC.common.fossilize import fossilize
 from MaKaC.accessControl import AccessWrapper
 from MaKaC.common.info import HelperMaKaCInfo
-from MaKaC.plugins.base import PluginsHolder
-
-# Maximum number of records that will get exported for each detail level
-MAX_RECORDS = {
-    'events': 10000,
-    'contributions': 500,
-    'subcontributions': 500,
-    'sessions': 100,
-}
-
-# Valid URLs for export handlers. the last group has to be the response type
-EXPORT_URL_MAP = {
-    r'/export/(event|categ)/(\w+(?:-\w+)*)\.(\w+)$': 'handler_event_categ'
-}
-
-# Compile url regexps
-EXPORT_URL_MAP = dict((re.compile(pathRe), handlerFunc) for pathRe, handlerFunc in EXPORT_URL_MAP.iteritems())
+
+
 # Remove the extension at the end or before the querystring
 RE_REMOVE_EXTENSION = re.compile(r'\.(\w+)(?:$|(?=\?))')
@@ -135 +119 @@
 
 def handler(req, **params):
+    logger = Logger.get('httpapi')
     path, query = req.URLFields['PATH_INFO'], req.URLFields['QUERY_STRING']
     # Parse the actual query string
@@ -173 +158 @@
 
         obj = None
-        add_to_cache = True
+        addToCache = True
         cache_key = RE_REMOVE_EXTENSION.sub('', cache_key)
         if not no_cache:
@@ -180 +165 @@
                 result, complete, typeMap = obj.getContent()
                 ts = obj.getTS()
-                add_to_cache = False
+                addToCache = False
         if result is None:
             # Perform the actual exporting
             result, complete, typeMap = func(aw)
-        if result is not None and add_to_cache:
+        if result is not None and addToCache:
             cache.cacheObject(cache_key, (result, complete, typeMap))
     except HTTPAPIError, e:
@@ -222 +207 @@
 
         req.headers_out['Content-Type'] = serializer.getMIMEType()
-        return serializer(resultFossil)
+
+        try:
+            return serializer(resultFossil)
+        except:
+            logger.exception('Serialization error in request %s?%s' % (path, query))
+            raise