mirror of
https://github.com/migatu/conjurer.git
synced 2026-07-14 21:38:38 +00:00
Almost deployment versio - for full deployment change parameteres in search_bot
This commit is contained in:
@@ -170,6 +170,10 @@ class Librarian(object):
|
|||||||
for item in database.keys():
|
for item in database.keys():
|
||||||
if item in self.uuid:
|
if item in self.uuid:
|
||||||
self.result = await self.refine_query(database)
|
self.result = await self.refine_query(database)
|
||||||
|
temp = {}
|
||||||
|
for item in self.result:
|
||||||
|
temp[item['DOI']] = {"Title" : item['title'], "type": item['type']}
|
||||||
|
self.result = temp
|
||||||
return self.result
|
return self.result
|
||||||
answer = await self.search_crossref(query=query)
|
answer = await self.search_crossref(query=query)
|
||||||
database.update(answer)
|
database.update(answer)
|
||||||
@@ -177,7 +181,6 @@ class Librarian(object):
|
|||||||
cr_file.seek(0)
|
cr_file.seek(0)
|
||||||
json.dump(database,cr_file)
|
json.dump(database,cr_file)
|
||||||
self.result = await self.refine_query(answer)
|
self.result = await self.refine_query(answer)
|
||||||
return self.result
|
|
||||||
else:
|
else:
|
||||||
answer = await self.search_crossref(query=query)
|
answer = await self.search_crossref(query=query)
|
||||||
database = answer
|
database = answer
|
||||||
@@ -187,7 +190,11 @@ class Librarian(object):
|
|||||||
self.result = await self.refine_query(answer)
|
self.result = await self.refine_query(answer)
|
||||||
self.app.logger.info("Refined")
|
self.app.logger.info("Refined")
|
||||||
self.done = True
|
self.done = True
|
||||||
return self.result
|
temp = {}
|
||||||
|
for item in self.result:
|
||||||
|
temp[item['DOI']] = {"Title" : item['title'], "type": item['type']}
|
||||||
|
self.result = temp
|
||||||
|
return self.result
|
||||||
|
|
||||||
#============================= FLASK INTERNALS===============================
|
#============================= FLASK INTERNALS===============================
|
||||||
def flask_debug():
|
def flask_debug():
|
||||||
@@ -225,7 +232,9 @@ class BackgroundTaskSearch(threading.Thread):
|
|||||||
except JSONDecodeError:
|
except JSONDecodeError:
|
||||||
pass
|
pass
|
||||||
if database:
|
if database:
|
||||||
database.extend(result)
|
self.app.logger.info(database)
|
||||||
|
self.app.logger.info(result)
|
||||||
|
database.update(result)
|
||||||
else:
|
else:
|
||||||
database = result
|
database = result
|
||||||
self.app.logger.info("DUMPING DATA")
|
self.app.logger.info("DUMPING DATA")
|
||||||
@@ -242,7 +251,8 @@ class BackgroundTaskSearch(threading.Thread):
|
|||||||
timeout=360,
|
timeout=360,
|
||||||
)
|
)
|
||||||
self.app.logger.info("SENT")
|
self.app.logger.info("SENT")
|
||||||
_ = await coroutine
|
result = await coroutine
|
||||||
|
self.app.logger.info(result.status_code)
|
||||||
self.app.logger.info("SEND CONFIRMED")
|
self.app.logger.info("SEND CONFIRMED")
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
@@ -254,9 +264,6 @@ async def query_database():
|
|||||||
app.logger.info(record["query"])
|
app.logger.info(record["query"])
|
||||||
app.logger.info(record["UUID"])
|
app.logger.info(record["UUID"])
|
||||||
uuid = record["UUID"]
|
uuid = record["UUID"]
|
||||||
#TODO: TESTING ONLY======================
|
|
||||||
uuid = UUID('{12345678-1234-5678-1234-567812345678}')
|
|
||||||
|
|
||||||
cl = Librarian(app, record["query"], uuid)
|
cl = Librarian(app, record["query"], uuid)
|
||||||
librarian_queue.put(cl)
|
librarian_queue.put(cl)
|
||||||
librarian_list.append(cl)
|
librarian_list.append(cl)
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
-161654
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
{"12345678-1234-5678-1234-567812345678": [{"DOI": "10.1057/9781137435026", "title": ["Queer BDSM Intimacies"], "type": "book", "container": "NO"}]}
|
|
||||||
Reference in New Issue
Block a user