Skip to content

Commit

Permalink
2 sem search
Browse files Browse the repository at this point in the history
  • Loading branch information
yindaheng98 committed May 15, 2024
1 parent 7ce18a5 commit 9f1beaa
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 8 deletions.
4 changes: 3 additions & 1 deletion citation_rabbot/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
from .start import start_args2querys, gen_start_results2message
from .jumps import *
default_jumps_name = [
"author_papers_jump", "citations_jump", "references_jump", "search_by_title_jump", "search_by_abstract_jump", "paper_detail_jump",
"author_papers_jump", "citations_jump", "references_jump",
"search_by_title_jump", "search_by_title_semantic_jump", "search_by_abstract_semantic_jump",
"paper_detail_jump",
"add_favorite_paper_jump", "show_favorite_paper_jump", "rm_favorite_paper_jump",
"add_favorite_keywords_jump", "show_favorite_keywords_jump", "rm_favorite_keywords_jump"
]
Expand Down
2 changes: 1 addition & 1 deletion citation_rabbot/jumps/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .papers import author_papers_jump, citations_jump, references_jump
from .search import search_by_title_jump, search_by_abstract_jump
from .search import search_by_title_jump, search_by_title_semantic_jump, search_by_abstract_semantic_jump
from .detail import paper_detail_jump
from .favorites import add_favorite_paper_jump, show_favorite_paper_jump, rm_favorite_paper_jump
from .favorites import add_favorite_keywords_jump, show_favorite_keywords_jump, rm_favorite_keywords_jump
32 changes: 27 additions & 5 deletions citation_rabbot/jumps/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,29 @@ def search_by_title_args2querys(args: object) -> List[Tuple[str, Dict]]:
)


def search_by_abstract_args2querys(args: object) -> List[Tuple[str, Dict]]:
def search_by_title_semantic_args2querys(args: object) -> List[Tuple[str, Dict]]:
lucene, pwhere, jwhere, orderby, limits, values = parse_args_papers_fulltext_index(args)
return [(
f"CALL db.index.fulltext.queryNodes('publication_title_fulltext_index', '{lucene}') YIELD node WITH node AS p " +
f"MATCH (p:Publication) WHERE {pwhere} " +
("OPTIONAL MATCH (p:Publication)-[:PUBLISH]->(j:Journal) " if jwhere == '' else f"MATCH (p:Publication)-[:PUBLISH]->(j:Journal) WHERE {jwhere} ") +
f"OPTIONAL MATCH (c:Publication)-[:CITE]->(p:Publication) "
f"OPTIONAL MATCH (r:Publication)<-[:CITE]-(p:Publication) "
f"RETURN p, j, COUNT(DISTINCT c) AS citation, COUNT(DISTINCT r) AS reference ORDER BY {orderby} LIMIT {limits}",
values
)]


search_by_title_semantic_jump = Jump(
name="search_by_title_semantic",
parser_add_arguments=add_arguments_papers,
args2querys=search_by_title_semantic_args2querys,
results2message=papers_results2message,
description="Search papers by keywords in title semantically"
)


def search_by_abstract_semantic_args2querys(args: object) -> List[Tuple[str, Dict]]:
lucene, pwhere, jwhere, orderby, limits, values = parse_args_papers_fulltext_index(args)
return [(
f"CALL db.index.fulltext.queryNodes('publication_abstract_fulltext_index', '{lucene}') YIELD node WITH node AS p " +
Expand All @@ -38,10 +60,10 @@ def search_by_abstract_args2querys(args: object) -> List[Tuple[str, Dict]]:
)]


search_by_abstract_jump = Jump(
name="search_by_abstract",
search_by_abstract_semantic_jump = Jump(
name="search_by_abstract_semantic",
parser_add_arguments=add_arguments_papers,
args2querys=search_by_abstract_args2querys,
args2querys=search_by_abstract_semantic_args2querys,
results2message=papers_results2message,
description="Search papers by keywords in abstract"
description="Search papers by keywords in abstract semantically"
)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='citation-rabbot',
version='3.19',
version='3.19.1',
author='yindaheng98',
author_email='[email protected]',
url='https://github.com/yindaheng98/citation-rabbot',
Expand Down

0 comments on commit 9f1beaa

Please sign in to comment.