diff --git a/app/builders/generic_builder.rb b/app/builders/generic_builder.rb index 99bf26934c4459c54d3c0697e98897b0a502e086..53379676e22179b11969f7c34fa08f7b623530da 100644 --- a/app/builders/generic_builder.rb +++ b/app/builders/generic_builder.rb @@ -18,7 +18,6 @@ class GenericBuilder < Builder if cache && !object[last_modified].blank? o = Rails.cache.fetch(cache_key(object[id], object[last_modified])) end - p object.inspect o = repository(object['class']).find object[id] if o.nil? array << o end diff --git a/app/services/search_service.rb b/app/services/search_service.rb index 93189fc9071fc76107fba3a68f1d91a2fb516308..ce3504255161d23436b91852e9bf9d6d9c9d127e 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -18,7 +18,11 @@ class SearchService private def build_search_query(params={}) - "SELECT @rid.asString(), last_modified, @class FROM ("+main_query(params)+") ORDER BY #{order_by(params[:order])}" + order = order_by(params[:order]) + ord_attr = order + ord_attr.slice!(' ASC') + ord_attr.slice!(' DESC') + "SELECT @rid.asString(), last_modified, @class, #{ord_attr} FROM ("+main_query(params)+") ORDER BY #{order}" end def main_query(params={}) @@ -88,9 +92,9 @@ class SearchService def order_by(order) case order when 'author' - 'author' + 'author ASC' when 'publicationasc' - 'published_at' + 'published_at ASC' when 'publicationdesc' 'published_at DESC' when 'title'