krikri 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f203971eae45daf869b1fac3553af154509e87
-  data.tar.gz: f633a0305b66fa97bf365ebbbf858c0ecbb088ca
+  metadata.gz: ed0c538e39d8f73fe8b01cc8b71e84f5d4301229
+  data.tar.gz: a1e4947bae2177804b1cda18251cf0cacb8cf700
 SHA512:
-  metadata.gz: 595e114e8b514d645d89e6d2a9033deb1e1e505e6d390ebd6f4d4de886300e9806e97cde3998d9611703a135439f4d97dcf709d60638492ac6d6656725066c18
-  data.tar.gz: f085f2ee8930b1622a62cb03d6fe7b848ddf826c3eaf84061700d75fa89ba92086fff79b0703c55a871f24acf892565e9453f70e79ee637a2bcd5545fac3f093
+  metadata.gz: 62aad477bfe83bdf1aad7ef810bc0ac99391874a8491750c769a36a7b92517fe90242e66570dbd8f512e82d232a91901272c473256c8e69e00641c2f43aac8c7
+  data.tar.gz: 06e3c912140e8b42c25391e8e727a2d6650b36c52cb028810d97e521045756e0d6f1f88d66c7eda6f41f3c978e7cb3ec821b9e6ddd6477f61cfda7b9b0e94b69

data/lib/krikri/harvester.rb

@@ -131,6 +131,7 @@ module Krikri
     # @see Krirki::Harvesters:HarvestBehavior
     def run(activity_uri = nil)
       records.each do |rec|
+        next if rec.nil?
         begin
           process_record(rec, activity_uri)
         rescue => e
@@ -193,5 +194,9 @@ module Krikri
     def mint_id(seed)
       @id_minter.create(*[seed, @name].compact)
     end
+
+    public
+    
+    class IdentifierError < ArgumentError; end
   end
 end

data/lib/krikri/harvesters/oai_harvester.rb

@@ -22,6 +22,8 @@ module Krikri::Harvesters
   #   - metadata_prefix: A string specifying the metadata prefix. e.g. 'oai_dc'.
   #   - from: The begin date for the harvest.
   #   - until: The end date for the harvest.
+  #   - id_path: An alternate xpath (e.g. '//dc:identifier') from which to load
+  #              raw identifier strings. Default:  <record><header><identifier>.
   #
   # @see http://www.rubydoc.info/gems/oai/OAI/Client
   class OAIHarvester
@@ -32,12 +34,16 @@ module Krikri::Harvesters
     # @param opts [Hash] options to pass through to client requests.
     #   Allowable options are specified in OAI::Const::Verbs. Currently :from,
     #   :until, :set, and :metadata_prefix.
+    #   Additionally, you may pass an xpath string to `:id_path` specifying the
+    #   location of the IDs.
     # @see OAI::Client
     # @see #expected_opts
     def initialize(opts = {})
       opts[:harvest_behavior] ||= OAISkipDeletedBehavior
       super
-      @opts = opts.fetch(:oai, {})
+
+      @opts    = opts.fetch(:oai, {})
+      @id_path = @opts.delete(:id_path) { false }
 
       http_conn = Faraday.new do |conn|
         conn.request :retry, :max => 3
@@ -86,8 +92,12 @@ module Krikri::Harvesters
       opts = @opts.merge(opts)
       request_with_sets(opts) do |set_opts|
         client.list_records(set_opts).full.lazy.flat_map do |rec|
-          @record_class.build(mint_id(rec.header.identifier),
-                              record_xml(rec))
+          begin
+            @record_class.build(mint_id(get_identifier(rec)),
+                                record_xml(rec))
+          rescue => e
+            Krikri::Logger.log(:error, e.message)
+          end
         end
       end
     end
@@ -131,11 +141,12 @@ module Krikri::Harvesters
       {
         key: :oai,
         opts: {
-          set: {type: :string, required: false, multiple_ok: true},
-          skip_set: {type: :string, required: false, multiple_ok: true},
-          metadata_prefix: {type: :string, required: false},
-          from: {type: :string, required: false},
-          until: {type: :string, required: false}
+          set: { type: :string, required: false, multiple_ok: true },
+          skip_set: { type: :string, required: false, multiple_ok: true },
+          metadata_prefix: { type: :string, required: false },
+          from: { type: :string, required: false },
+          until: { type: :string, required: false },
+          id_path: { type: :string, required: false }
         }
       }
     end
@@ -201,11 +212,37 @@ module Krikri::Harvesters
     #
     # @param rec [OAI::Record]
     # @return [String] an xml string
-    def record_xml(rec)
+    def record_xml(rec, as_doc: false)
       doc = Nokogiri.XML(rec._source.to_s)
       doc.root
         .add_namespace_definition(nil, 'http://www.openarchives.org/OAI/2.0/')
-      doc.to_xml
+      as_doc ? doc : doc.to_xml
+    end
+
+    private
+
+    def get_identifier(record)
+      return record.header.identifier unless @id_path
+
+      xml = record_xml(record, as_doc: true)
+      ns = xml.collect_namespaces.map do |k, v|
+        [k.gsub('xmlns:', ''), v]
+      end
+
+      begin
+        ids = xml.xpath(@id_path, ns.to_h)
+      rescue Nokogiri::XML::XPath::SyntaxError => e
+        raise Krikri::Harvester::IdentifierError, 
+              "No identifier at #{@id_path} for #{record.header.identifier}\n" \
+              "\t#{e.message}"
+      end
+      
+      if ids.empty?
+        raise Krikri::Harvester::IdentifierError, 
+              "No identifier at #{@id_path} for #{record.header.identifier}"
+      end
+      
+      ids.first.text
     end
   end
 end

data/lib/krikri/version.rb

@@ -1,3 +1,3 @@
 module Krikri
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.11.2'.freeze
 end

data/spec/internal/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/tjohnson/src/dpla/krikri
   specs:
-    krikri (0.11.0)
+    krikri (0.11.1)
       analysand (= 4.0.0)
       audumbla (~> 0.1)
       blacklight (~> 5.8.0)
@@ -72,7 +72,7 @@ GEM
       dpla-map (~> 4.0.0.0.pre.10)
       geokit
       twofishes
-    autoprefixer-rails (6.3.0)
+    autoprefixer-rails (6.3.1)
       execjs
       json
     bcrypt (3.1.10)
@@ -200,7 +200,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.99)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
+    minitest (5.8.4)
     mono_logger (1.1.0)
     multi_json (1.11.2)
     multipart-post (2.0.0)
@@ -377,7 +377,7 @@ GEM
     unf_ext (0.0.7.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warden (1.2.3)
+    warden (1.2.4)
       rack (>= 1.0)
     yajl-ruby (1.2.1)
 

data/spec/internal/config/initializers/blacklight_initializer.rb

@@ -3,5 +3,5 @@
 # will use the application's secret key base instead.
 #
 
-# Blacklight.secret_key = '7730fe252126238fd17b8a152916aa9411acf5988718c7d460c2fec64c1ea58ccc9b99c28d84ff213dc892c7f82c50f14a6cc3670b193b59df2bd91fb6ab497c'
+# Blacklight.secret_key = '2e18692814c107ed106221a977f8a5fa38bd1a8355716a818ff72b8b618dd97e07385335c796361f2d18d00302de916adf1e397ad60f725a4b3f3eebd0c3eff2'
 

data/spec/internal/config/initializers/devise.rb

@@ -4,7 +4,7 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # config.secret_key = 'c5c38941b7b9051f1eaf0770a7c1cd75219ae43c6778869b74cfa87965ae918e6cdc96d01fa818236f48201cbdb8794568c9aa847baff1ed20df4ca8ea41727a'
+  # config.secret_key = '8f0b79f6ceba0441e785de1179473bade347d14f3718eeb09d0c46657653bb30f2592d6123de9cb7316910280cf9c81dd5ca2d1794023a5c1de7a715cfb37d20'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
@@ -97,7 +97,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = '3aa2420a2014d2e3ba226fe04b9f11622010655ab0cc38c80ba94bb8606db7ce88ac7ad51b589a0fa80d4fd640066cf8fb77e8541742eb20cfe35e7dd5efadbc'
+  # config.pepper = 'ffc94a9f1b5bd168c80153de7513d7e6e61c8066ea2b793750f4732e65e6c62b1e2f8a729c07de2cf3ad5b465b183364e0ce6acde3a4581ca3e2e64f7c07ef93'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without

data/spec/internal/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 65de12170d46a341399075608ca57aff6612789b24519926c47ca2d6eb1c2e481ce87ae8f26fe37001b82a621e8514d2c8adb00bb3b1d8d1b371c5465ec977a9
+  secret_key_base: baa7b78f0d33e176d43c2e53b15cc34a7a13353589e525b444eca2593b2abcbb9a0b55a1b30196d7886d41d7a5801aa2e4ba6aed862340704dbac5f165ddf961
 
 test:
-  secret_key_base: 6ce9fd492b4a440830ba1184ed1efe3782bad811470bc95af7b771f8ca5b2bf6173ece56d1b8dfcc10b57d35b69ce7c4d11a9d98d53d849d64c6f9c770f36d00
+  secret_key_base: 775cd9bf2b3e7cb1f9f98ea042f371ca3bbeb565ffaad8314cb89887da924c77bdb1e9be79f03b5790c6345901cee62e5c67df2bf8a80a490b1fe0e4f337882d
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/spec/internal/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160114224637) do
+ActiveRecord::Schema.define(version: 20160201014949) do
 
   create_table "bookmarks", force: true do |t|
     t.integer  "user_id",       null: false

data/spec/internal/log/development.log

@@ -1,57 +1,57 @@
-   (12.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (40.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
    (0.1ms)  select sqlite_version(*)
-   (10.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (27.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
 Migrating to CreateKrikriInstitutions (20141113200614)
-   (0.0ms)  begin transaction
-   (0.2ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200614"]]
-   (10.4ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200614"]]
+   (30.9ms)  commit transaction
 Migrating to CreateKrikriHarvestSources (20141113200643)
-   (0.0ms)  begin transaction
-   (0.2ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200643"]]
-   (16.8ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141113200643"]]
+   (32.5ms)  commit transaction
 Migrating to CreateKrikriActivities (20141212220924)
    (0.1ms)  begin transaction
-   (0.3ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.4ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141212220924"]]
-   (25.6ms)  commit transaction
+   (35.5ms)  commit transaction
 Migrating to AddOptsToKrikriHarvestSources (20150106164218)
-   (0.1ms)  begin transaction
-   (0.2ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150106164218"]]
-   (16.0ms)  commit transaction
+   (0.2ms)  begin transaction
+   (0.6ms)  ALTER TABLE "krikri_harvest_sources" ADD "opts" text
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150106164218"]]
+   (20.3ms)  commit transaction
 Migrating to ChangeOptsInKrikriActivities (20150309160112)
    (0.1ms)  begin transaction
-   (0.3ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (0.0ms)  SELECT * FROM "krikri_activities"
-   (0.1ms)  DROP TABLE "krikri_activities"
-   (0.1ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
-   (0.0ms)  SELECT * FROM "akrikri_activities"
-   (0.1ms)  DROP TABLE "akrikri_activities"
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150309160112"]]
-   (15.7ms)  commit transaction
+   (0.7ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  SELECT * FROM "krikri_activities"
+   (0.4ms)  DROP TABLE "krikri_activities"
+   (0.3ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  SELECT * FROM "akrikri_activities"
+   (0.3ms)  DROP TABLE "akrikri_activities"
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150309160112"]]
+   (23.6ms)  commit transaction
 Migrating to RemoveOptsLimitInKrikriActivities (20150310190054)
-   (0.0ms)  begin transaction
-   (0.1ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TEMPORARY TABLE "akrikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text(255), "created_at" datetime, "updated_at" datetime) 
    (0.1ms)  SELECT * FROM "krikri_activities"
-   (0.2ms)  DROP TABLE "krikri_activities"
-   (0.1ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
-   (0.0ms)  SELECT * FROM "akrikri_activities"
-   (0.1ms)  DROP TABLE "akrikri_activities"
+   (0.3ms)  DROP TABLE "krikri_activities"
+   (0.3ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  SELECT * FROM "akrikri_activities"
+   (0.2ms)  DROP TABLE "akrikri_activities"
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150310190054"]]
-   (17.0ms)  commit transaction
+   (19.5ms)  commit transaction
 Migrating to AddQaReport (20150328035550)
-   (0.1ms)  begin transaction
-   (0.3ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150328035550"]]
-   (20.9ms)  commit transaction
-Migrating to DeviseCreateUsers (20160114224615)
-   (0.1ms)  begin transaction
-   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (0.2ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
-   (0.1ms)              SELECT sql
+   (0.2ms)  begin transaction
+   (0.7ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150328035550"]]
+   (38.1ms)  commit transaction
+Migrating to DeviseCreateUsers (20160201014927)
+   (0.3ms)  begin transaction
+   (0.8ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.4ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+   (0.2ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -59,11 +59,11 @@ Migrating to DeviseCreateUsers (20160114224615)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (0.1ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160114224615"]]
-   (13.9ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.1ms)              SELECT sql
+   (0.3ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160201014927"]]
+   (32.4ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
             UNION ALL
@@ -71,7 +71,7 @@ Migrating to DeviseCreateUsers (20160114224615)
             FROM sqlite_temp_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
 
-   (0.1ms)              SELECT sql
+   (0.2ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
             UNION ALL
@@ -80,26 +80,26 @@ Migrating to DeviseCreateUsers (20160114224615)
             WHERE name='index_users_on_email' AND type='index'
 
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateSearches (20160114224635)
+Migrating to CreateSearches (20160201014947)
    (0.1ms)  begin transaction
    (0.3ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
    (0.1ms)  select sqlite_version(*)
    (0.1ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160114224635"]]
-   (13.1ms)  commit transaction
-Migrating to CreateBookmarks (20160114224636)
-   (0.0ms)  begin transaction
-   (0.2ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160114224636"]]
-   (10.6ms)  commit transaction
-Migrating to AddPolymorphicTypeToBookmarks (20160114224637)
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160201014947"]]
+   (33.4ms)  commit transaction
+Migrating to CreateBookmarks (20160201014948)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160201014948"]]
+   (25.2ms)  commit transaction
+Migrating to AddPolymorphicTypeToBookmarks (20160201014949)
    (0.1ms)  begin transaction
-   (0.2ms)  ALTER TABLE "bookmarks" ADD "document_type" varchar(255)
-   (0.1ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160114224637"]]
-   (10.6ms)  commit transaction
+   (0.4ms)  ALTER TABLE "bookmarks" ADD "document_type" varchar(255)
+   (0.2ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160201014949"]]
+   (31.7ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.4ms)              SELECT sql
+   (0.2ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_bookmarks_on_user_id' AND type='index'
             UNION ALL
@@ -107,7 +107,7 @@ Migrating to AddPolymorphicTypeToBookmarks (20160114224637)
             FROM sqlite_temp_master
             WHERE name='index_bookmarks_on_user_id' AND type='index'
 
-   (0.3ms)              SELECT sql
+   (0.2ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_searches_on_user_id' AND type='index'
             UNION ALL
@@ -115,7 +115,7 @@ Migrating to AddPolymorphicTypeToBookmarks (20160114224637)
             FROM sqlite_temp_master
             WHERE name='index_searches_on_user_id' AND type='index'
 
-   (0.2ms)              SELECT sql
+   (0.3ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_reset_password_token' AND type='index'
             UNION ALL
@@ -131,17 +131,17 @@ Migrating to AddPolymorphicTypeToBookmarks (20160114224637)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (11.3ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime, "document_type" varchar(255)) 
+   (24.0ms)  CREATE TABLE "bookmarks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "user_type" varchar(255), "document_id" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime, "document_type" varchar(255)) 
    (0.1ms)  select sqlite_version(*)
-   (10.8ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
-   (21.9ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
-   (50.6ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime, "opts" text) 
-   (22.0ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
-   (27.5ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
-   (23.7ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (30.3ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
-   (26.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
-   (36.2ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+   (23.5ms)  CREATE  INDEX "index_bookmarks_on_user_id" ON "bookmarks" ("user_id")
+   (28.9ms)  CREATE TABLE "krikri_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "start_time" datetime, "end_time" datetime, "agent" varchar(255), "opts" text, "created_at" datetime, "updated_at" datetime) 
+   (40.7ms)  CREATE TABLE "krikri_harvest_sources" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "institution_id" integer, "name" varchar(255), "source_type" varchar(255), "metadata_schema" varchar(255), "uri" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime, "opts" text) 
+   (38.8ms)  CREATE TABLE "krikri_institutions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "notes" text, "created_at" datetime, "updated_at" datetime) 
+   (33.6ms)  CREATE TABLE "krikri_qa_reports" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "field_report" text, "count_report" text, "created_at" datetime, "updated_at" datetime) 
+   (29.8ms)  CREATE TABLE "searches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "query_params" text, "user_id" integer, "user_type" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (35.7ms)  CREATE  INDEX "index_searches_on_user_id" ON "searches" ("user_id")
+   (28.9ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (35.6ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
    (0.2ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_users_on_email' AND type='index'
@@ -150,18 +150,18 @@ Migrating to AddPolymorphicTypeToBookmarks (20160114224637)
             FROM sqlite_temp_master
             WHERE name='index_users_on_email' AND type='index'
 
-   (29.1ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
-   (22.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (49.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (36.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160114224637')
-   (28.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160114224636')
-   (29.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160114224635')
-   (18.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160114224615')
-   (19.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
-   (23.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150309160112')
-   (25.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
-   (16.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
-   (21.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
-   (17.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
-   (16.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')
+   (33.5ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+   (33.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (33.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (26.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160201014949')
+   (23.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160201014947')
+   (24.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160201014927')
+   (24.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160201014948')
+   (42.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200643')
+   (23.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150309160112')
+   (24.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150106164218')
+   (29.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141212220924')
+   (34.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141113200614')
+   (32.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150310190054')
+   (34.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150328035550')