fix merge conflicts

app/assets/javascripts/application/search.js

@@ -18,7 +18,7 @@ var search = function() {
     $.ajax({
       url:"/search/fetch",
       type: 'get',
-      data: params.get(),
+      data: params.get_fetch(),
       beforeSend: function() {
         if (append) {
           $('.search-more').remove();
@@ -267,6 +267,13 @@ var searchParameters = function() {
       }
       return params[type];
     },
+    get_fetch: function() {
+      var params_to_send = JSON.parse(JSON.stringify(params));
+      params_to_send.subject = params_to_send.subject.join(', ');
+      params_to_send.type = params_to_send.type.join(', ');
+      params_to_send.school_year = params_to_send.school_year.join(', ');
+      return params_to_send;
+    },
     url: function() {
       var url = history.state.url.split('?', 1) + "?",
           keys = Object.keys(params),

app/controllers/search_controller.rb

@@ -7,6 +7,9 @@ class SearchController < ApplicationController
   def fetch
     objectsFound = []
 
+    params[:subject]= params[:subject].split(', ')
+    params[:type] = params[:type].split(', ')
+    params[:school_year] = params[:school_year].split(', ')
     page=1
     if (params[:page])
       page = params[:page].to_i
@@ -15,9 +18,7 @@ class SearchController < ApplicationController
     @pagination_limit=10
 
     unless params[:query].blank?
-      params[:order] = "" if params[:order].blank?
-
-      objectsFound = search params[:query], params[:order]
+      objectsFound = search params
       @numFound = objectsFound.length
 
       # case params[:order]

app/repositories/orient_db/learning_object_repository.rb

@@ -129,27 +129,29 @@ module OrientDb
     #   ON LearningObject (name, description)
     #   FULLTEXT ENGINE LUCENE
     #   METADATA {"analyzer":"org.apache.lucene.analysis.br.BrazilianAnalyzer"}
-    def search(qry, order = nil)
+    def search(params)
       # TODO: fix search metadata from dspace
+      order = params[:order]
+      qry = params[:query]
       unless order.nil?
         order = case order
-                  when "author"
-                    "metadata.key['dc.contributor.author']"
-                  when "publicationasc"
-                    "metadata.key['dc.date.submitted']"
-                  when "publicationdesc"
-                    "metadata.key['dc.date.submitted'] DESC"
-                  when "title"
-                    "name ASC"
-                  else
-                    nil
-                end
+        when "author"
+          "author"
+        when "publicationasc"
+          "created_at"
+        when "publicationdesc"
+          "created_at DESC"
+        when "title"
+          "name ASC"
+        else
+          nil
+        end
       end
 
       query = "SELECT EXPAND(rid) FROM index:learningobject_search WHERE key LUCENE '#{qry}'"
+      query = "SELECT * FROM (" + query + ") WHERE " + fetch_types(params[:type]) unless params[:type].blank?
       query = "SELECT * FROM (" + query + ") ORDER BY #{order}" unless order.nil?
       query = "SELECT @rid.asString(), last_modified FROM (" + query + ")"
-
       learning_objects_hash = connection.query query, limit: 10000
 
       # return only rids with their modification time
@@ -172,6 +174,15 @@ module OrientDb
       hash
     end
 
+    def fetch_types(types)
+      qry = ''
+      types.each do |type|
+        qry = qry + "type = '#{type}' " if type == types.first
+        qry = qry + "OR type = '#{type}' " if type != types.first
+      end
+      qry
+    end
+
     private
 
     def accepted_properties

app/views/search/index.html.erb

@@ -22,7 +22,7 @@
           <select class="select-tag-container filter-subject" multiple="multiple">
               <option value="Conjunto">Conjuntos</option>
               <option value="Soma">Soma</option>
-              <option value="Álgebra">Álgebra</option>
+              <option value="Algebra">Álgebra</option>
           </select>
         </div>
         <h4 class="dropdown">Biologia<span class="caret caret-align-right"/></h4>

lib/search_engine/orientdb_lucene.rb

 module SearchEngine
   module OrientdbLucene
 
-    def search(qry, order = nil)
-      learning_object_repository.search(qry, order)
+    def search(params)
+      learning_object_repository.search(params)
     end
 
   end