diff --git a/scripts/search/build_var_index.py b/scripts/search/build_var_index.py index c216f68..27b2110 100644 --- a/scripts/search/build_var_index.py +++ b/scripts/search/build_var_index.py @@ -27,14 +27,14 @@ def get_schema(): writer = ix.writer() all_vars = [ - [u'adult_obesity,diabetes', u'obesity', u'Obesity Prevalence,Diabetes Prevalence', u'category_health_risks', u'Healthcare', u'geo', None], - [u'adult_obesity,diabetes', u'diabetes', u'Obesity Prevalence,Diabetes Prevalence', u'category_health_risks', u'Healthcare', u'geo', None], - [u'adult_obesity,diabetes', u'healthcare', u'Obesity Prevalence,Diabetes Prevalence', u'category_health_risks', u'Healthcare', u'geo', None], - [u'motor_vehicle_crash_deaths', u'car crashes', u'Motor Vehicle Crash Deaths', u'crime', u'Crime', u'geo', None], - [u'motor_vehicle_crash_deaths', u'accidents', u'Motor Vehicle Crash Deaths', u'crime', u'Crime', u'geo', None], - - [u'adult_smoking', u'smokers', u'Adult Smoking Prevalence', u'substance_abuse', u'Healthcare', u'geo', None], - [u'adult_smoking', u'cigarettes', u'Adult Smoking Prevalence', u'substance_abuse', u'Healthcare', u'geo', None], + [u'adult_obesity,diabetes', u'obesity', u'Obesity Prevalence,Diabetes Prevalence', u'conditions_diseases', u'Healthcare', u'geo', None], + [u'adult_obesity,diabetes', u'diabetes', u'Obesity Prevalence,Diabetes Prevalence', u'conditions_diseases', u'Healthcare', u'geo', None], + [u'adult_obesity,diabetes', u'healthcare', u'Obesity Prevalence,Diabetes Prevalence', u'conditions_diseases', u'Healthcare', u'geo', None], + [u'motor_vehicle_crash_deaths', u'car crashes', u'Motor Vehicle Crash Deaths', u'risky', u'Crime', u'geo', None], + [u'motor_vehicle_crash_deaths', u'accidents', u'Motor Vehicle Crash Deaths', u'risky', u'Crime', u'geo', None], + + [u'adult_smoking', u'smokers', u'Adult Smoking Prevalence', u'risky', u'Healthcare', u'geo', None], + [u'adult_smoking', u'cigarettes', u'Adult Smoking Prevalence', u'risky', u'Healthcare', u'geo', None], # [u'infant_mortality', u'infant mortality', u'Infant mortality', u'health', u'geo'], # [u'teen_births', u'teen births', u'Teen births', u'health', u'geo'], diff --git a/tests/test_search.py b/tests/test_search.py index 021ab1d..d663218 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -173,13 +173,13 @@ def test_healthcare(self): data,suggs,tries,my_vars = do_search("healthcare") self.assertEqual(data[0][0], "01000US") self.assertEqual(my_vars[0]["name"], "healthcare") - self.assertEqual(my_vars[0]["section"], "category_health_risks") + self.assertEqual(my_vars[0]["section"], "conditions_diseases") def test_obesity(self): data,suggs,tries,my_vars = do_search("obesity") self.assertEqual(data[0][0], "01000US") self.assertEqual(my_vars[0]["name"], "obesity") - self.assertEqual(my_vars[0]["section"], "category_health_risks") + self.assertEqual(my_vars[0]["section"], "conditions_diseases") def test_umd(self): data, suggs, tries, my_vars = do_search("umd") diff --git a/var_index/MAIN_94jtl4wxf8zdxq8p.seg b/var_index/MAIN_g1c93s1e37q8coxg.seg similarity index 94% rename from var_index/MAIN_94jtl4wxf8zdxq8p.seg rename to var_index/MAIN_g1c93s1e37q8coxg.seg index cff7a9e..7e503f5 100644 Binary files a/var_index/MAIN_94jtl4wxf8zdxq8p.seg and b/var_index/MAIN_g1c93s1e37q8coxg.seg differ diff --git a/var_index/_MAIN_1.toc b/var_index/_MAIN_1.toc index 1d2bac8..8f9a233 100644 Binary files a/var_index/_MAIN_1.toc and b/var_index/_MAIN_1.toc differ