Commit ad48332c authored by PkSM3's avatar PkSM3

[BUGFIX] +catch in paginator

parent b82a67ad
...@@ -321,7 +321,7 @@ def subcorpus(request, project_id, corpus_id, start , end ): ...@@ -321,7 +321,7 @@ def subcorpus(request, project_id, corpus_id, start , end ):
import datetime import datetime
dateini = datetime.datetime.strptime(str(start), '%Y%m%d').date() dateini = datetime.datetime.strptime(str(start), '%Y%m%d').date()
datefin = datetime.datetime.strptime(str(end), '%Y%m%d').date() datefin = datetime.datetime.strptime(str(end), '%Y%m%d').date()
# print (dateini,"\t",datefin)
t = get_template('subcorpus.html') t = get_template('subcorpus.html')
user = request.user user = request.user
...@@ -339,15 +339,21 @@ def subcorpus(request, project_id, corpus_id, start , end ): ...@@ -339,15 +339,21 @@ def subcorpus(request, project_id, corpus_id, start , end ):
# filtering documents by range-date # filtering documents by range-date
for doc in documents: for doc in documents:
if "publication_date" in doc.metadata: if "publication_date" in doc.metadata:
try:
realdate = doc.metadata["publication_date"].split(" ")[0] # in database is = (year-month-day = 2015-01-06 00:00:00 = 06 jan 2015 00 hrs) realdate = doc.metadata["publication_date"].split(" ")[0] # in database is = (year-month-day = 2015-01-06 00:00:00 = 06 jan 2015 00 hrs)
realdate = datetime.datetime.strptime(str(realdate), '%Y-%m-%d').date() # finalform = (yearmonthday = 20150106 = 06 jan 2015) realdate = datetime.datetime.strptime(str(realdate), '%Y-%m-%d').date() # finalform = (yearmonthday = 20150106 = 06 jan 2015)
if dateini <= realdate <= datefin: if dateini <= realdate <= datefin:
doc.date = realdate doc.date = realdate
filtered_docs.append(doc) filtered_docs.append(doc)
except Exception as e:
print ("pag error01 detail:",e)
print("pag error01 doc:",doc)
# import pprint
# pprint.pprint(filtered_docs)
# ordering from most recent to the older. # ordering from most recent to the older.
ordered = sorted(filtered_docs, key=lambda x: x.date) ordered = sorted(filtered_docs, key=lambda x: x.date)
# pages of 10 elements. Like a sir. # pages of 10 elements. Like a sir.
paginator = Paginator(ordered, 10) paginator = Paginator(ordered, 10)
...@@ -385,14 +391,13 @@ def subcorpusJSON(request, project_id, corpus_id, start , end ): ...@@ -385,14 +391,13 @@ def subcorpusJSON(request, project_id, corpus_id, start , end ):
offset = str(end) offset = str(end)
except ValueError: except ValueError:
raise Http404() raise Http404()
# parameters received via web. Format = (yearmonthday = 20150106 = 06 jan 2015) # parameters received via web. Format = (yearmonthday = 20150106 = 06 jan 2015)
import datetime import datetime
dateini = datetime.datetime.strptime(str(start), '%Y%m%d').date() dateini = datetime.datetime.strptime(str(start), '%Y%m%d').date()
datefin = datetime.datetime.strptime(str(end), '%Y%m%d').date() datefin = datetime.datetime.strptime(str(end), '%Y%m%d').date()
t = get_template('subcorpus.html') t = get_template('subcorpus.html')
print(dateini , "\t" , datefin)
user = request.user user = request.user
date = datetime.datetime.now() date = datetime.datetime.now()
......
...@@ -276,7 +276,7 @@ d3.csv("/chart/corpus/{{ corpus.id }}/data.csv", function (data) { ...@@ -276,7 +276,7 @@ d3.csv("/chart/corpus/{{ corpus.id }}/data.csv", function (data) {
}); });
var orderDates = Object.keys(justdates).reverse(); var orderDates = Object.keys(justdates).reverse();
// console.log(orderDates)
latest = orderDates[0].split("/") latest = orderDates[0].split("/")
oldest = orderDates[orderDates.length-1].split("/") oldest = orderDates[orderDates.length-1].split("/")
......
...@@ -301,7 +301,6 @@ ...@@ -301,7 +301,6 @@
$( "#id_form" ).submit(); $( "#id_form" ).submit();
} }
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment