take care of general openataba feed

noamoss · Jun 8, 2016 · ca8cc79 · ca8cc79
1 parent 94eb840
commit ca8cc79
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/views.py b/views.py
@@ -146,17 +146,21 @@ def add_feed_opentaba():
  try:
  if url not in relevantfeeds:
  try:
- city = request.args.get('city','')
+ city = request.args.get('city', '')
  except:
- city=""
+ city = ""
+
+ if "gush" not in url:
+ name = set_title_by_feed(url)[1]
+ try:
+ name_temp = name.split(" ")
+ except:
+ name_temp = [name,"",""]
+ name_temp[2] = city+", "
+ name= " ".join(name_temp)
+ else:
+ name= 'תב"ע פתוחה '+city
 
- name = set_title_by_feed(url)[1]
- try:
- name_temp = name.split(" ")
- except:
- name_temp = [name,"",""]
- name_temp[2] = city+", "
- name= " ".join(name_temp)
  a_new_feed = Feed(
  user_id=session['user_id'],
  url=request.args.get('link', ''),