diff --git a/app/services/search_service.rb b/app/services/search_service.rb index ce3504255161d23436b91852e9bf9d6d9c9d127e..85bf9913cb5c78ba6e0ee1df163027a0a52a69ae 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -19,9 +19,7 @@ class SearchService def build_search_query(params={}) order = order_by(params[:order]) - ord_attr = order - ord_attr.slice!(' ASC') - ord_attr.slice!(' DESC') + ord_attr = order.split(' ', 2).first "SELECT @rid.asString(), last_modified, @class, #{ord_attr} FROM ("+main_query(params)+") ORDER BY #{order}" end @@ -30,11 +28,11 @@ class SearchService end def collection_query(params={}) - qry = "SELECT *, created_at as published_at, out('BelongsTo')[0].name as author FROM Collection" - qry += " WHERE name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}'" unless params[:query].blank? + qry = "SELECT *, created_at as published_at, out('BelongsTo')[0].name as author FROM Collection WHERE privacy = 'public' " + qry += "AND (name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}')" unless params[:query].blank? qry_filter = params[:query].blank? ? " WHERE " : " AND " filter = collection_learning_objects_filter(params) - qry += qry_filter+filter unless filter.blank? + qry += " AND "+filter unless filter.blank? qry end @@ -88,7 +86,7 @@ class SearchService end qry end - + def order_by(order) case order when 'author' @@ -125,4 +123,4 @@ class SearchService cache_key end -end \ No newline at end of file +end diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index 1ea7683c89124e189814706dfbc5e712dda25266..db8a2354979ddc1fdf04c3d61d2bbc8580296151 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -55,8 +55,8 @@ <select class="order sort-dropdown" name="order"> <option value="">relevância</option> <option value="author">autor</option> - <option value="publicationasc">mais recente</option> - <!-- <option value="publicationdesc">mais velhos</option> --> + <option value="publicationdesc">mais recente</option> + <!-- <option value="publicationasc">mais velhos</option> --> <option value="title">tÃtulo</option> </select> </form>