cdm_migrator 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 985574c3d7f661fd0f9d1ce9a15e9269fa4c2dafd10d387110695400aff2b762
-  data.tar.gz: 0c24c2d7beb6f6d9c66a44dd30393c8dae0cb9222c9d6c69186909cdfe074590
+  metadata.gz: 52d0b261c3a30d2366fc4ce466c93ba915ad77465fbc5c19b9144ef1c76e30be
+  data.tar.gz: 55fae411673e948fdfc7ca0f6f8ddd251cc3821093b0a15aaa03b3059aaad836
 SHA512:
-  metadata.gz: 6b06e22ca127a1b5fa304c18edb939c5082cb3251b7c5be202e51f6914e6ab703a3a7c2a3cc992327ae0122eacc52eec5d5ae810e00eb8531b5e49f5a9481a71
-  data.tar.gz: 2cefe7be69db9247165ec1c03eeadd5bbffbe0b1ed8044f097e6a6070968e77b224706845eb6072d891cdd5718612c93544321b7a2d9a204af8e92ff4cf6388d
+  metadata.gz: '09622f0d05d5621802326d634d026deac0e5cf0b8cf61cd46ea2ad502c22c4b7763b318264796d44ae5061895150712b3d254715404033ad905ce81663544304'
+  data.tar.gz: e6f9a6398702df628d49faaf5eba31af5b1c8cc604c86c033287fa33879a1fde4dae488491e0530eb6a4bf3b6ab894ef3179eb11a5d984ff548cc8f7762b2f3d

data/app/controllers/cdm_migrator/cdm_controller.rb

@@ -121,7 +121,7 @@ module CdmMigrator
 			filename = child ? child['pagefile'] : "#{rec.first}.#{rec.last}"
 
 			if params[:file_system]=='true'
-				"file://#{file_path(rec.first)}"
+				"file://#{file_path(cisoptr)}"
 			elsif @cdm_api == 'server'
 				"#{@cdm_url}:#{@cdm_port}/cgi-bin/showfile.exe?CISOROOT=#{params[:collection]}&CISOPTR=#{cisoptr}"
 			else

data/app/jobs/cdm_migrator/batch_create_files_job.rb

@@ -2,7 +2,7 @@ module CdmMigrator
   class BatchCreateFilesJob < ActiveJob::Base
     queue_as Hyrax.config.ingest_queue_name
 
-    def perform work, ingest_work, user, last_work=false
+    def perform work, ingest_work, user
       ingest_work.files.each do |file|
         url = file[:url]
         last_file = ingest_work.files.last==file
@@ -11,10 +11,9 @@ module CdmMigrator
           actor = Hyrax::Actors::FileSetActor.new(fs, user)
           actor.create_metadata#(work, visibility: work.visibility)
           actor.attach_file_to_work(work)
-          #byebug
           fs.attributes = file[:metadata]
           fs.save!
-          CdmIngestFilesJob.perform_later(fs, url, user, ingest_work, last_file, last_work)
+          CdmIngestFilesJob.perform_later(fs, url, user, ingest_work, last_file)
         end
       end
     end

data/app/jobs/cdm_migrator/batch_create_works_job.rb

@@ -4,10 +4,9 @@ module CdmMigrator
 
     def perform(ingest, user)
       ingest.data.each do |w|
-        last_work = ingest.data.last==w
         ingest_work = IngestWork.new(w, ingest.id)
         ingest_work.save!
-        CreateWorkJob.perform_later ingest_work, user, ingest.admin_set_id, ingest.collection_id, last_work
+        CreateWorkJob.perform_later ingest_work, user, ingest.admin_set_id, ingest.collection_id
       end
 
     end

data/app/jobs/cdm_migrator/cdm_ingest_files_job.rb

@@ -2,7 +2,7 @@ module CdmMigrator
   class CdmIngestFilesJob < ActiveJob::Base
     queue_as Hyrax.config.ingest_queue_name
 
-    def perform(fs, url, user, ingest_work = nil, last_file = false, last_work = false)
+    def perform(fs, url, user, ingest_work = nil, last_file = false)
       if url.include?("http") && File.extname(url).include?("pdf")
         download = open(url)
         dir = Rails.root.join('public', 'uploads', 'csv_pdfs')
@@ -23,7 +23,6 @@ module CdmMigrator
         ImportUrlJob.perform_now(fs, log(user))
       end
       ingest_work.update_attribute('complete', true) if last_file
-      BatchIngest.find(ingest_work.id).update_attribute('complete', true) if last_work
     end
 
     def log(user)

data/app/jobs/cdm_migrator/create_work_job.rb

@@ -2,7 +2,7 @@ module CdmMigrator
   class CreateWorkJob < ActiveJob::Base
     queue_as Hyrax.config.ingest_queue_name
 
-    def perform(ingest_work, user, admin_set_id, collection_id, last_work=false)
+    def perform(ingest_work, user, admin_set_id, collection_id)
       admin_set = ::AdminSet.find(admin_set_id) rescue nil
       collection = ::Collection.find(collection_id) rescue nil
       work = Object.const_get(ingest_work.work_type).new
@@ -13,7 +13,7 @@ module CdmMigrator
       work.admin_set = admin_set if admin_set
       work.date_uploaded = DateTime.now
       work.save
-      BatchCreateFilesJob.perform_later work, ingest_work, user, last_work
+      BatchCreateFilesJob.perform_later work, ingest_work, user
 
     end
   end

data/app/models/cdm_migrator/batch_ingest.rb

@@ -7,11 +7,14 @@ module CdmMigrator
     end
 
     def progress
-      if complete?
+      return "Complete" if complete?
+      completed = IngestWork.where(batch_ingest_id: id, complete: true ).length
+      if completed==data.length
+        complete=true
+        save
         "Complete"
       else
-        completed = IngestWork.where(batch_ingest_id: id, complete: true ).length.to_s
-        "#{completed}/#{size}"
+        "#{completed.to_s}/#{size}"
       end
     end
 
@@ -20,7 +23,7 @@ module CdmMigrator
     end
 
     def complete?
-      self.complete
+      complete
     end
 
     def message?

data/lib/cdm_migrator/version.rb

@@ -1,3 +1,3 @@
 module CdmMigrator
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdm_migrator
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - sephirothkod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails