refactor freebase download

GlobalNamesArchitecture · Aug 17, 2012 · f468b5e · f468b5e
1 parent 2f931cc
commit f468b5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/bin/dwca-hunt.rb b/bin/dwca-hunt.rb
@@ -6,8 +6,8 @@
 DwcaHunter::logger = Logger.new($stdout)
 resources = [
   # DwcaHunter::ResourceWikispecies.new(opts), 
-  # DwcaHunter::ResourceFreebase.new(opts),
-  DwcaHunter::ResourceITIS.new(opts),
+  DwcaHunter::ResourceFreebase.new(opts),
+  # DwcaHunter::ResourceITIS.new(opts),
   # DwcaHunter::ResourceNCBI.new(opts),
   # DwcaHunter::ResourceWoRMS.new(opts)
 ]

diff --git a/lib/dwca-hunter/resource_freebase.rb b/lib/dwca-hunter/resource_freebase.rb
@@ -31,11 +31,6 @@ def download
           name: nil,
           scientific_name: nil,
           synonym_scientific_name: [],
-          # key: {
-          #   namespace: "/wikipedia/en_id",
-          #   value: nil,
-          #   optional: true,
-          # },
           higher_classification: { 
             id: nil,
             guid: nil,
@@ -45,6 +40,18 @@ def download
         }],
         cursor: true,
       }
+
+      run_query(q)
+
+      data = JSON.pretty_generate @data
+      f = open(@download_path, "w:utf-8")
+      f.write(data)
+      f.close
+    end
+
+    private
+
+    def run_query(q)
       count = 0
       requests_num = 0
       while true
@@ -56,15 +63,8 @@ def download
         res["result"].each { |d| @data << d }
         q[:cursor] = res["cursor"]
       end
-
-      data = JSON.pretty_generate @data
-      f = open(@download_path, "w:utf-8")
-      f.write(data)
-      f.close
     end
 
-    private
-
     def organize_data
       @data = JSON.load(open(@download_path, "r:utf-8").read)
       @data.each do |d|