Added combined search

spec/searchbar_spec.rb

@@ -244,6 +244,18 @@ def enter_fachinfo_search
     false.should == true
   end
 
+  it "should be possible to find Budenofalk and Budesonid Sandoz via combined search" do
+    @browser.link(:name, 'drugs').click
+    @browser.select_list(:name, "search_type").select("Preisvergleich und Inhaltsstoff")
+    @browser.text_field(:name, "search_query").value = "Budesonid"
+    @browser.button(:name, 'search').click
+    text = @browser.text.clone
+    text.should_not match LeeresResult
+    text.should match('Budesonid Sandoz') # by price
+    text.should match('Budenofalk')       # by component
+  end unless ['just-medical'].index(Flavor)
+
+
   after :all do
     @browser.close
   end

src/custom/lookandfeelbase.rb

@@ -1513,6 +1513,7 @@ def google_analytics_token
 				:square_patent						=>	'PS',
 				:square_phytotherapy			=>	'Ph',
 				:square_vaccine						=>	'I/B',
+        :st_combined              =>  'Preisvergleich und Inhaltsstoff',
 				:st_company								=>	'Zulassungsinhaber',
 				:st_indication						=>	'Anwendung',
 				:st_oddb									=>	'Preisvergleich',
@@ -2919,7 +2920,7 @@ def google_analytics_token
 				:square_patent						=>	'PP',
 				:square_phytotherapy			=>	'Ph',
 				:square_vaccine						=>	'V/S',
-				:st_company								=>	'Titulaire de l\'Autorisation',
+        :st_combined              =>  'Comparaison des prix et Composant',
 				:st_indication						=>	'Application',
 				:st_oddb									=>	'Comparaison des prix',
 				:st_unwanted_effect       =>	'Effet indésirable',
@@ -4200,6 +4201,7 @@ def google_analytics_token
 				:square_phytotherapy			=>	'Ph',
 				:square_vaccine						=>	'V/S',
 				:st_company								=>	'Registration owner',
+        :st_combined              =>  'Price comparison and Component',
 				:st_indication						=>	'Indication',
 				:st_oddb									=>	'Price comparison',
 				:st_sequence							=>	'Brand name',

src/custom/lookandfeelwrapper.rb

@@ -399,7 +399,7 @@ def result_list_components
       }
     end
     def search_type_selection
-      ['st_oddb']
+      ['st_combined']
     end
     def zones
       [

src/state/global.rb

@@ -864,6 +864,8 @@ def search
 			alias :result :search
 			def _search_drugs(query, stype)
 				case stype
+        when 'st_combined'
+          @session.search_combined(query, @session.language)
 				when 'st_sequence'
 					@session.search_exact_sequence(query)
 				when 'st_substance'

src/util/oddbapp.rb

@@ -1083,6 +1083,17 @@ def search_exact_sequence(query)
 		sequences = search_sequences(query)
 		_search_exact_classified_result(sequences, :sequence)
 	end
+  def search_combined(query, lang)
+    result = search_oddb(query, lang)
+    result_substances = search_exact_substance(query)
+    result_substances.atc_classes.each{
+      |atc|
+      result.atc_classes << atc unless result.atc_classes.index(atc)
+    }
+    result.search_type = :combined
+    result
+  end
+
 	def search_exact_substance(query)
 		sequences = ODBA.cache.\
 			retrieve_from_index('substance_index_sequence', query)

src/util/validator.rb

@@ -80,7 +80,8 @@ class Validator < SBSM::Validator
       :search_type => [
         'st_oddb', 'st_sequence', 'st_substance',
         'st_company', 'st_indication', 'st_interaction',
-        'st_unwanted_effect', 'st_registration', 'st_pharmacode'
+        'st_unwanted_effect', 'st_registration', 'st_pharmacode',
+        'st_combined'
       ],
       :fachinfo_search_type => [
         'fi_usage', 'fi_interactions', 'fi_unwanted_effects'

test/test_util/oddbapp.rb

@@ -811,14 +811,19 @@ def test_search_exact_sequence
     expected = ODDB::SearchResult.new
     expected.atc_classes = []
     expected.search_type = :sequence
-    #assert_equal(expected, @app.search_exact_sequence('query'))
     assert(same?(expected, @app.search_exact_sequence('query')))
   end
+  def test_search_combined
+    expected = ODDB::SearchResult.new
+    expected.atc_classes = []
+    expected.search_type = :combined
+    result = @app.search_combined('query', 'lang')
+    assert(same?(expected, result), "Result #{result.inspect} should match #{expected.inspect}" )
+  end
   def test_search_exact_substance
     expected = ODDB::SearchResult.new
     expected.atc_classes = []
     expected.search_type = :substance
-    #assert_equal(expected, @app.search_exact_substance('query'))
     assert(same?(expected, @app.search_exact_substance('query')))
   end
   def test_search_pharmacies