Fix prep_data.py

HarukaMa · Oct 31, 2015 · f33f558 · f33f558
1 parent d73c53c
commit f33f558
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/scripts/prep_data.py b/scripts/prep_data.py
@@ -62,27 +62,25 @@ def header(text, subtext=None):
     pickle_miner = ResourcePickleMiner(rvr)
     trans = Translator(pickle_miner)
     bulkdata_miner = BulkdataMiner(rvr, trans)
-    staticcache_miner = StaticdataCacheMiner(eve_path, trans)
-
+    staticcache_miner = ResourceStaticCacheMiner(rvr, trans)
     miners = (
         MetadataMiner(eve_path),
         bulkdata_miner,
-        TraitMiner(staticcache_miner, bulkdata_miner, trans),
-        SqliteMiner(eve_path, trans),
         staticcache_miner,
-        #CachedCallsMiner(rvr, trans),
+        TraitMiner(staticcache_miner, bulkdata_miner, trans),
+        SqliteMiner(rvr.paths.root, trans),
+        CachedCallsMiner(rvr, trans),
         pickle_miner
     )
 
-
     writers = (
         JsonWriter(dump_path, indent=2),
     )
 
     list = "dgmexpressions,dgmattribs,dgmeffects,dgmtypeattribs,dgmtypeeffects,"\
            "dgmunits,icons,invcategories,invgroups,invmetagroups,invmetatypes,"\
-           "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides"\
-           "evegroups,evetypes"
+           "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\
+           "evegroups,evetypes,evecategories"
 
     FlowManager(miners, writers).run(list, "multi")