Changeset 220
- Timestamp:
- 03/13/08 18:50:57 (8 months ago)
- Files:
-
- apache_log/apache_log/parser.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
apache_log/apache_log/parser.py
r139 r220 54 54 else: 55 55 self.code = None 56 #if 'user_agent' in data:57 # self.user_agent = data['user_agent'] 56 if 'user_agent' in data: 57 self.user_agent = self.unquote(data['user_agent']) 58 58 # tag = userAgentTag(parser.error, self.user_agent) 59 59 # if tag: 60 60 # self.tag = tag 61 #else:62 #self.user_agent = None61 else: 62 self.user_agent = None 63 63 64 64 def unquote(self, url): 65 url = url.replace(r'\"', '"') 65 66 url = unquote(url) 66 67 if url != "-": … … 70 71 71 72 class ApacheLogParser: 73 _REGEX_STRING = r'(?:[^\"]|\")*' 74 72 75 # Referrer URL -> referrer="http://..." 73 REGEX_REFERRER = r "\"(?P<referrer>(?:[^\"]|\\\")*)\""76 REGEX_REFERRER = r'"(?P<referrer>%s)"' % _REGEX_STRING 74 77 75 78 #Â User agent: "Mozilla ..." -> user_agent="Mozilla ..." 76 REGEX_USER_AGENT = r "\"(?P<user_agent>[^\"]*)\""79 REGEX_USER_AGENT = r'"(?P<user_agent>%s)"' % _REGEX_STRING 77 80 78 81 # HTTP request: … … 87 90 ) 88 91 METHODS = HTTP_METHODS + WEBDAV_METHODS 89 REGEX_REQUEST = r "\"(?P<method>%s) (?P<url>[^ ]+)(?: HTTP/(?P<http_version>1\.[01]))?\""% '|'.join(METHODS)92 REGEX_REQUEST = r'"(?P<method>%s) (?P<url>[^ ]+)(?: HTTP/(?P<http_version>1\.[01]))?"' % '|'.join(METHODS) 90 93 91 94 # Date -> date="..."
