CAMP/chaloBEST
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

argh, silly error in routes apiview

Browse Source
This commit is contained in:
Sanj 2012-02-29 02:42:37 +05:30
parent 194a08c11c
commit dd3e59e7df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chaloBEST/mumbai/apiviews.py
View File

@ -29,8 +29,7 @@ def area(request, slug):
} }
}) })
def routes(request): def routes(request):
q = request.GET.get("q", "") q = request.GET.get("q", "")
in_regex = re.compile(r'(\d{1,3})') # used to extract the route number string out of the query string - for eg, gets "21" from "21Ltd" in_regex = re.compile(r'(\d{1,3})') # used to extract the route number string out of the query string - for eg, gets "21" from "21Ltd"
match = re.findall(in_regex, q) match = re.findall(in_regex, q)
@ -41,7 +40,7 @@ def routes(request):
ret = [] ret = []
if route_no != '': if route_no != '':
out_regex = re.compile(r'.*(\D|\A)%s(\D|\Z).*' % route_no) # used for, for eg. to filter out '210Ltd' when user searches for '21'. Checks for non-digit or start of string, followed by route_no, followed by non-digit or end of string out_regex = re.compile(r'.*(\D|\A)%s(\D|\Z).*' % route_no) # used for, for eg. to filter out '210Ltd' when user searches for '21'. Checks for non-digit or start of string, followed by route_no, followed by non-digit or end of string
qset = Route.objects.filter(alias__icontains=q) qset = Route.objects.filter(alias__icontains=route_no)
for route in qset: for route in qset:
if re.match(out_regex, route.alias): if re.match(out_regex, route.alias):
ret.append(route.alias) ret.append(route.alias)
@ -62,6 +61,7 @@ def areas(request):
areas = [area.slug for area in qset] areas = [area.slug for area in qset]
return render_to_json_response(areas) return render_to_json_response(areas)
def stops(request): def stops(request):
q = request.GET.get("q", "") q = request.GET.get("q", "")
if q != '': if q != '':