Skip to content

Commit

Permalink
Merge pull request #1273 from datacite/revert-1272-graph-search-order
Browse files Browse the repository at this point in the history
Revert "Chang default DOI search order"
  • Loading branch information
jrhoads authored Nov 14, 2024
2 parents efe893b + 99e104e commit 3344421
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/controllers/datacite_dois_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def index
when "relevance"
{ "_score": { "order": "desc" } }
else
{ "_score": { "order": "desc" } }
{ updated: { order: "desc" } }
end

page = page_from_params(params)
Expand Down
2 changes: 1 addition & 1 deletion app/models/doi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2518,7 +2518,7 @@ def update_publisher_from_hash

def update_publisher_from_string
self.publisher_obj = { name: publisher_before_type_cast }
end
end

def reset_publishers
self.publisher_obj = nil
Expand Down
12 changes: 6 additions & 6 deletions app/models/doi/graphql_query.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Doi::GraphqlQuery
class Builder
include Modelable

DEFAULT_CURSOR = ["Infinity", 0]
DEFAULT_CURSOR = [0, ""]
DEFAULT_PAGE_SIZE = 0
DEFAULT_FACET_COUNT = 10

Expand All @@ -29,7 +29,7 @@ def size
end

def sort
[{ _score: "desc", uid: "asc" }]
[{ created: "asc", uid: "asc" }]
end

def query_fields
Expand All @@ -47,16 +47,16 @@ def query_fields

def cursor
tmp_cursor = @options.dig(:page, :cursor)
if tmp_cursor.blank?
if tmp_cursor.nil?
return DEFAULT_CURSOR
end

if tmp_cursor.is_a?(Array)
tmp_score, uid = tmp_cursor
timestamp, uid = tmp_cursor
elsif tmp_cursor.is_a?(String)
tmp_score, uid = tmp_cursor.split(",")
timestamp, uid = tmp_cursor.split(",")
end
[tmp_score.to_f, uid.to_s]
[timestamp.to_i, uid.to_s]
end

def search_after
Expand Down

0 comments on commit 3344421

Please sign in to comment.