convert_to_solr_query() improved, convert_id_query() finished.
Merge branch 'master' of github.com:jinwen/ninja