From b8558df442b0e2a6a4726f2a40e87bfc7b7934a9 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Thu, 19 Mar 2015 15:02:10 +0100 Subject: [PATCH] Revert "dev/passerelle: add x-hedtech headers (#6578)" encoding issues This reverts commit be5237efd800d70adb8a19770324bdc29a796d8e. --- ...p-x-hedtech-headers-in-response-6578.patch | 31 ------------------- .../passerelle/passerelle.spec | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 home:entrouvert:cg14-dev/passerelle/0001-bdp-x-hedtech-headers-in-response-6578.patch diff --git a/home:entrouvert:cg14-dev/passerelle/0001-bdp-x-hedtech-headers-in-response-6578.patch b/home:entrouvert:cg14-dev/passerelle/0001-bdp-x-hedtech-headers-in-response-6578.patch deleted file mode 100644 index 1d6f03e..0000000 --- a/home:entrouvert:cg14-dev/passerelle/0001-bdp-x-hedtech-headers-in-response-6578.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 42157711deeb323f2f0a2d4956d8f745f5246ff0 Mon Sep 17 00:00:00 2001 -From: Thomas NOEL -Date: Thu, 19 Mar 2015 13:41:11 +0100 -Subject: [PATCH] bdp: x-hedtech headers in response (#6578) - ---- - passerelle/apps/bdp/models.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/passerelle/apps/bdp/models.py b/passerelle/apps/bdp/models.py -index b103753..66ad8c6 100644 ---- a/passerelle/apps/bdp/models.py -+++ b/passerelle/apps/bdp/models.py -@@ -67,8 +67,14 @@ class Bdp(BaseResource): - data=data, headers=headers, **options) - result = { - 'status_code': request.status_code, -+ # from https://github.com/restfulapi/restful-api/blob/master/README.md: - 'x_request_id': request.headers.get('x-request-id'), - 'x_status_reason': request.headers.get('x-status-reason'), -+ 'x_hedtech_message': request.headers.get('x-hedtech-message'), -+ 'x_hedtech_totalcount': request.headers.get('x-hedtech-totalcount'), -+ 'x_hedtech_pageoffset': request.headers.get('x-hedtech-pageoffset'), -+ 'x_hedtech_pagemaxsize': request.headers.get('x-hedtech-pagemaxsize'), -+ 'x_hedtech_media_type': request.headers.get('x-hedtech-media-type'), - } - try: - result.update(request.json()) --- -2.1.4 - diff --git a/home:entrouvert:cg14-dev/passerelle/passerelle.spec b/home:entrouvert:cg14-dev/passerelle/passerelle.spec index efc5fb1..dac7dfb 100644 --- a/home:entrouvert:cg14-dev/passerelle/passerelle.spec +++ b/home:entrouvert:cg14-dev/passerelle/passerelle.spec @@ -29,7 +29,6 @@ Source6: wcs-au-quotidien.cron.d Source7: passerelle-manage Source8: cg14_config.py Patch1: 0001-bdp-add-parameters-to-post-adherent-6577.patch -Patch2: 0001-bdp-x-hedtech-headers-in-response-6578.patch BuildArch: noarch @@ -42,7 +41,6 @@ Passerelle provides an uniform access to multiple data sources and services. %prep %setup -q -n passerelle-%{commit} %patch1 -p1 -%patch2 -p1 %pre getent group passerelle >/dev/null || groupadd -r passerelle