parent
30908e8cb7
commit
6efe4397f1
|
@ -23,7 +23,6 @@ def multiQuery():
|
||||||
queries["authors"]=authors
|
queries["authors"]=authors
|
||||||
if publishers!="*" and publishers!="":
|
if publishers!="*" and publishers!="":
|
||||||
queries["publishers"]=publishers
|
queries["publishers"]=publishers
|
||||||
print(queries)
|
|
||||||
matchingDocs = elastic.query_multifields(queries, page=page, perPage=perPage)
|
matchingDocs = elastic.query_multifields(queries, page=page, perPage=perPage)
|
||||||
textResponse = MultiResponse(
|
textResponse = MultiResponse(
|
||||||
'text',
|
'text',
|
||||||
|
@ -218,15 +217,14 @@ def renQuery(rennum):
|
||||||
for entry in matchingDocs:
|
for entry in matchingDocs:
|
||||||
dbRenewal = qManager.renewalQuery(entry.uuid)
|
dbRenewal = qManager.renewalQuery(entry.uuid)
|
||||||
renResponse.extendResults(parseRetRenewal(
|
renResponse.extendResults(parseRetRenewal(
|
||||||
dbRenewal,
|
dbRenewal
|
||||||
source=sourceReturn
|
|
||||||
))
|
))
|
||||||
|
|
||||||
renResponse.createDataBlock()
|
renResponse.createDataBlock()
|
||||||
return jsonify(renResponse.createResponse(200))
|
return jsonify(renResponse.createResponse(200))
|
||||||
|
|
||||||
|
|
||||||
def parseRetRenewal(dbRenewal, source):
|
def parseRetRenewal(dbRenewal):
|
||||||
if len(dbRenewal.registrations) == 0:
|
if len(dbRenewal.registrations) == 0:
|
||||||
return [MultiResponse.parseRenewal(dbRenewal)]
|
return [MultiResponse.parseRenewal(dbRenewal)]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue