Must add components listed in Column M of swissmedic-packages whether they appear in Column O or not not (when running oddb2xml --calc
Adding some more tests for splitting the compositions into components. Working on improving the regular expression to get the composition.
Must resolve the problem on how to avoid adding the the last part, eg. aqua ad 100 ml or Excipiens Ad Emulsionem Pro as a separate component. Also my local version mangles names like Globulina Equina (immunisé Avec Coeur, Tissu Pulmonaire, Reins De Porcins) to Reins De Porcins). Handling colors like "E 127" or conserv.: E 216, E 218 is also wrong. Current diff is Attach:oddb_xml_components.txt.
Will continue Friday.
After readding the import jobs, many watir tests failed and the interactions don't show up correctly. E.g. http://oddb-ci2.dyndns.org/de/gcc/home_interactions/7680583920112,7680592060090 Must figure out the reason.
Problem was, that we must deal differently with a Hash when it contains odba-objects. With this diff, everything reverted to the correct behaviour
index fcb3c9c..742818e 100644
--- a/src/model/epha_interaction.rb
+++ b/src/model/epha_interaction.rb
@@ -41,7 +41,14 @@ module ODDB
atc_codes
end
def EphaInteractions.get_epha_interaction(atc_code_self, atc_code_other)
- @@epha_interactions[ [atc_code_self, atc_code_other] ]
+ result = []
+ @@epha_interactions.each{ | key, value |
+ if key[0].to_s.eql?(atc_code_self) and key[1].to_s.eql?(atc_code_other)
+ result = value
+ break
+ end
+ }
+ result
end
Running the watir tests again, to see whether the problems (except ZSR) have gone away.
Fixed two problem with failing watir specs. Then pushed the commits