Changeset 1602
- Timestamp:
- 06/05/08 13:26:51 (3 months ago)
- Files:
-
- hive/trunk/data_webapp/app/controllers/hc_database_controller.rb (modified) (2 diffs)
- hive/trunk/data_webapp/app/models/completed_url.rb (added)
- hive/trunk/data_webapp/app/models/drone_job.rb (added)
- hive/trunk/data_webapp/app/models/history_url.rb (modified) (1 diff)
- hive/trunk/data_webapp/app/models/job_source.rb (added)
- hive/trunk/data_webapp/app/models/pending_url.rb (added)
- hive/trunk/data_webapp/app/models/queue_url.rb (modified) (1 diff)
- hive/trunk/data_webapp/app/models/user.rb (modified) (1 diff)
- hive/trunk/data_webapp/db/migrate/028_create_drone_jobs.rb (added)
- hive/trunk/data_webapp/db/migrate/029_create_pending_urls.rb (added)
- hive/trunk/data_webapp/db/migrate/030_create_completed_urls.rb (added)
- hive/trunk/data_webapp/db/migrate/031_create_job_sources.rb (added)
- hive/trunk/data_webapp/test/fixtures/completed_urls.yml (added)
- hive/trunk/data_webapp/test/fixtures/configurations.yml (added)
- hive/trunk/data_webapp/test/fixtures/drone_jobs.yml (added)
- hive/trunk/data_webapp/test/fixtures/job_sources.yml (added)
- hive/trunk/data_webapp/test/fixtures/pending_urls.yml (added)
- hive/trunk/data_webapp/test/unit/completed_url_test.rb (added)
- hive/trunk/data_webapp/test/unit/configuration_test.rb (added)
- hive/trunk/data_webapp/test/unit/drone_job_test.rb (added)
- hive/trunk/data_webapp/test/unit/job_source_test.rb (added)
- hive/trunk/data_webapp/test/unit/pending_url_test.rb (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
hive/trunk/data_webapp/app/controllers/hc_database_controller.rb
r1595 r1602 29 29 def dequeue_url(url) 30 30 q = QueueUrl.find(:first,:conditions => {:url => url}) 31 jobs = q.drone_jobs 31 32 if not q.nil? 32 33 q.destroy 33 34 end 35 return jobs 34 36 end 35 37 … … 117 119 bee_work["urls"] << url_obj 118 120 119 if insert(HistoryUrl,url_obj) 120 count += 1 121 count += 1 if hu = insert(HistoryUrl,url_obj) 122 123 jobs = dequeue_url(u) 124 if not hu.nil? 125 jobs.each do |job| 126 job.completed_urls << CompletedUrl.new(:history_url => hu) 127 job.save 128 end 121 129 end 122 dequeue_url(u)123 130 end 124 125 126 131 end 127 132 end hive/trunk/data_webapp/app/models/history_url.rb
r1111 r1602 1 1 class HistoryUrl < ActiveRecord::Base 2 2 belongs_to :client 3 # Many-Many DroneJob/HistoryUrl relationships 4 has_many :completed_urls, :dependent => :destroy 5 has_many :drone_jobs, :through => :completed_urls 3 6 4 7 validates_presence_of :url hive/trunk/data_webapp/app/models/queue_url.rb
r1589 r1602 1 1 require 'resolv' 2 2 class QueueUrl < ActiveRecord::Base 3 # Many-Many DroneJob/QueueUrl relationships 4 has_many :pending_urls, :dependent => :destroy 5 has_many :drone_jobs, :through => :pending_urls 3 6 4 7 # These validations will only work on basic ActiveRecord::Base save and update hive/trunk/data_webapp/app/models/user.rb
r1185 r1602 2 2 class User < ActiveRecord::Base 3 3 has_one :heartbeat, :dependent => :destroy 4 #TODO: Associate JobSources to the authenticated User creating the DroneJob? 5 # has_many :job_source 4 6 5 7 # Virtual attribute for the unencrypted password
