Merge pull request #4 from lcdhoffman/master

Release Candidate 2

Gemfile

@@ -20,7 +20,6 @@ gem 'puma'
 gem 'rack'
 gem 'rack-protection'
 gem 'rack-test'
-gem 'rake'
 gem 'rdoc'
 gem 'rspec'
 gem 'rubyzip'
@@ -32,3 +31,4 @@ gem 'thread_safe'
 gem 'tilt'
 gem 'tzinfo'
 gem 'uglifier'
+gem 'zip'

app/lib/migrate.rb

@@ -194,7 +194,8 @@ def migrate_collection_content(repo_id,
             obj = obj_or_cont
             set_key = obj.parent.nil? ? nil : obj.parent['ref']
             position_tracker[set_key] ||= {}
-            position_tracker[set_key][obj.position] = obj.key
+            position_tracker[set_key][obj.position] ||= []
+            position_tracker[set_key][obj.position] << obj.key
 
             resolve_ids_to_links(rec, obj_or_cont, classification_map)
 
@@ -223,13 +224,17 @@ def migrate_collection_content(repo_id,
       position_tracker.each do |id, map|
         sorted = map.keys.sort
         sorted.each_with_index do |padded_position, real_position|
-          position_map[map[padded_position]] = real_position
+          map[padded_position].each do |obj_key|
+            position_map[obj_key] = real_position
+          end
         end
       end
 
       batch.each do |obj|
         if position_map.has_key?(obj.key)
           obj.position = position_map[obj.key]
+        else
+          obj.position = nil
         end
 
         if (container_data_sets = container_trees[obj.key])

app/main.rb

@@ -35,6 +35,9 @@
   require f
 end
 
+public_dir = File.dirname(File.absolute_path(__FILE__)) + '/public'
+Dir.mkdir(public_dir) unless File.exists?(public_dir)
+
 
 get '/' do
   erb :index

vendor/archivesspace/client_tools/v1.0.0/migrations/lib/parse_queue.rb

@@ -96,7 +96,6 @@ def save(&block)
           end
         end
       ensure
-        FileUtils.cp(@batch_file, "/Users/hoffman/Developer/Projects/archon-migration/batch_trace_#{Time.now.to_i}.txt")
         @batch_file.unlink
       end
     end