ada/code_examples_server
0
0
Fork 0
mirror of https://github.com/AdaCore/code_examples_server.git synced 2026-02-12 12:45:18 -08:00
Code Issues Packages Projects Releases Wiki Activity

Adding logic to handle get request with part and chapters out of range of the book.

Browse Source
This commit is contained in:
Robert Tice
2017-11-21 17:07:01 -05:00
parent eefcedfc4e
commit 1ce5b8d703
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compile_server/app/views.py
View File

@@ -145,23 +145,29 @@ def book_router(request, book, part, chapter):
val_search = "part%s-chapter%s" % (part, chapter)
inrange = False
for i, ch in enumerate(chapter_list):
if ch['url'] == val_search:
inrange = True
htmldata['sel_topic'] = ch
if i != 0:
htmldata['prev_topic'] = chapter_list[i - 1]
if i != len(chapter_list) - 1:
htmldata['next_topic'] = chapter_list[i + 1]
# TODO: handle instance where part and chapter are outside of valid range
break
content_page = os.path.join(book_path,
"pages",
"part%s-chapter%s.md" % (part, chapter))
if inrange:
content_page = os.path.join(book_path,
"pages",
"part%s-chapter%s.md" % (part, chapter))
if os.path.isfile(content_page):
with open(content_page, 'r') as f:
htmldata['content'] = f.read()
if os.path.isfile(content_page):
with open(content_page, 'r') as f:
htmldata['content'] = f.read()
else:
htmldata['content'] = "# Page Under Construction"
else:
htmldata['content'] = "<h3>Page Under Construction</h3>"
htmldata['content'] = "### The page you have reached is invalid. " \
"Please use the links at the left to navigate to a valid page."
return render(request, 'readerpage.html', htmldata)