From 6444756adcb9c08663d317b14240063fe3daf805 Mon Sep 17 00:00:00 2001
From: Bezleputh <carton_ben@yahoo.fr>
Date: Tue, 22 Sep 2015 15:18:22 +0200
Subject: [PATCH] [popolemploi] site changed

---
 modules/popolemploi/browser.py | 39 ++++++++++++++++++++++++++--------
 modules/popolemploi/module.py  |  2 +-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/modules/popolemploi/browser.py b/modules/popolemploi/browser.py
index 1722d234..88864b15 100644
--- a/modules/popolemploi/browser.py
+++ b/modules/popolemploi/browser.py
@@ -33,6 +33,16 @@ class PopolemploiBrowser(PagesBrowser):
     search = URL('candidat/rechercheoffres/resultats/(?P<search>.*?)',
                  'https://offre.pole-emploi.fr/resultat\?offresPartenaires=true&libMetier=(?P<pattern>.*?)', SearchPage)
 
+    decode_salary = {
+        'FOURCHETTE1': u'|15000|A',
+        'FOURCHETTE2': u'15000|18000|A',
+        'FOURCHETTE3': u'18000|21000|A',
+        'FOURCHETTE4': u'21000|24000|A',
+        'FOURCHETTE5': u'24000|36000|A',
+        'FOURCHETTE6': u'36000|60000|A',
+        'FOURCHETTE7': u'60000||A',
+    }
+
     def search_job(self, pattern=None):
         return self.search.go(pattern=quote_plus(pattern)).iter_job_adverts()
 
@@ -40,17 +50,28 @@ class PopolemploiBrowser(PagesBrowser):
                             qualification=None, limit_date=None, domain=None):
 
         splitted_place = place.split('|')
+        _domain = "%s-" % domain if domain else ""
 
-        search = 'A_%s_%s_%s__%s_P_%s_%s_%s_______INDIFFERENT______________%s___' % (quote(metier.encode('utf-8')).replace('%', '$00'),
-                                                                                     splitted_place[1],
-                                                                                     splitted_place[2],
-                                                                                     contrat,
-                                                                                     domain,
-                                                                                     salary,
-                                                                                     qualification,
-                                                                                     limit_date
-                                                                                     )
+        if salary in self.decode_salary:
+            salary_time = self.decode_salary.get(salary).split('|')[2]
+            salary_low = self.decode_salary.get(salary).split('|')[0]
+            salary_hight = self.decode_salary.get(salary).split('|')[1]
+        else:
+            salary_time = ""
+            salary_low = ""
+            salary_hight = ""
 
+        search = "A_%s_%s_%s__%s_P_%s_%s_%s_____________________%s_%s_%s_______" % (
+            quote(metier.encode('utf-8')).replace('%', '$00'),
+            splitted_place[1],
+            splitted_place[2],
+            contrat,
+            _domain,
+            salary_time,
+            qualification,
+            limit_date,
+            salary_low,
+            salary_hight)
         return self.search.go(search=search).iter_job_adverts()
 
     def get_job_advert(self, id, advert):
diff --git a/modules/popolemploi/module.py b/modules/popolemploi/module.py
index c3cd76d3..a2a2ae18 100644
--- a/modules/popolemploi/module.py
+++ b/modules/popolemploi/module.py
@@ -38,7 +38,7 @@ class PopolemploiModule(Module, CapJob):
     BROWSER = PopolemploiBrowser
 
     places_choices = OrderedDict([(k, u'%s' % (v)) for k, v in sorted({
-        '100|FRANCE|O1': u'France entière',
+        '100|PAYS|01': u'France entière',
         '102|REGION|42': u'Alsace',
         '103|DEPARTEMENT|67': u'-- Rhin (Bas) (67)',
         '104|DEPARTEMENT|68': u'-- Rhin (Haut) (68)',