| lbrabec |
| resultsdb |
Cleans up the callback param from prev/next urls, before this patch, if resutlsdb
was used with jsonp the callback params just got stacked on top of each other.
tested locally
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | resultsdb/controllers/api_v2.py (5 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| c40237666934 | f83e5c6ee194 | d81159dbcc1d | Josef Skladanka | Cleans up the callback param from prev/next urls (Show More…) | Feb 1 2017, 4:12 PM |
| Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s) | |||||
| 54 | def not_found(error): | 54 | def not_found(error): | ||
| 55 | return jsonify({"message": "Not found"}), 404 | 55 | return jsonify({"message": "Not found"}), 404 | ||
| 56 | 56 | | |||
| 57 | # ============================================================================= | 57 | # ============================================================================= | ||
| 58 | # GLOBAL VARIABLES | 58 | # GLOBAL VARIABLES | ||
| 59 | # ============================================================================= | 59 | # ============================================================================= | ||
| 60 | 60 | | |||
| 61 | RE_PAGE = re.compile(r"([?&])page=([0-9]+)") | 61 | RE_PAGE = re.compile(r"([?&])page=([0-9]+)") | ||
| 62 | RE_CALLBACK = re.compile(r"([?&])callback=[^&]*&?") | ||||
| 63 | RE_CLEAN_AMPERSANDS = re.compile(r'&+') | ||||
| 62 | 64 | | |||
| 63 | # RP contains request parsers (reqparse.RequestParser). | 65 | # RP contains request parsers (reqparse.RequestParser). | ||
| 64 | # Parsers are added in each 'resource section' for better readability | 66 | # Parsers are added in each 'resource section' for better readability | ||
| 65 | RP = {} | 67 | RP = {} | ||
| 66 | 68 | | |||
| 67 | SERIALIZE = Serializer().serialize | 69 | SERIALIZE = Serializer().serialize | ||
| 68 | 70 | | |||
| 69 | 71 | | |||
| ▲ Show 20 Lines • Show All 101 Lines • ▼ Show 20 Line(s) | 172 | if page is None: | |||
| 171 | if "?" in request.url: | 173 | if "?" in request.url: | ||
| 172 | baseurl = "%s&page=%s" % (request.url, placeholder) | 174 | baseurl = "%s&page=%s" % (request.url, placeholder) | ||
| 173 | else: | 175 | else: | ||
| 174 | baseurl = "%s?page=%s" % (request.url, placeholder) | 176 | baseurl = "%s?page=%s" % (request.url, placeholder) | ||
| 175 | page = 0 | 177 | page = 0 | ||
| 176 | else: | 178 | else: | ||
| 177 | baseurl = RE_PAGE.sub("%spage=%s" % (flag, placeholder), request.url) | 179 | baseurl = RE_PAGE.sub("%spage=%s" % (flag, placeholder), request.url) | ||
| 178 | 180 | | |||
| 181 | baseurl = RE_CALLBACK.sub(r"\1", baseurl) | ||||
| 182 | baseurl = RE_CLEAN_AMPERSANDS.sub('&', baseurl) | ||||
| 183 | | ||||
| 179 | if page > 0: | 184 | if page > 0: | ||
| 180 | prev = baseurl.replace(placeholder, str(page - 1)) | 185 | prev = baseurl.replace(placeholder, str(page - 1)) | ||
| 181 | if len(data) > limit: | 186 | if len(data) > limit: | ||
| 182 | next = baseurl.replace(placeholder, str(page + 1)) | 187 | next = baseurl.replace(placeholder, str(page + 1)) | ||
| 183 | data = data[:limit] | 188 | data = data[:limit] | ||
| 184 | 189 | | |||
| 185 | return data, prev, next | 190 | return data, prev, next | ||
| 186 | 191 | | |||
| ▲ Show 20 Lines • Show All 575 Lines • Show Last 20 Lines | |||||