base_indexer 0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc32b1c7767d03fb0eb45612332901ae0f01586
-  data.tar.gz: adbb902e6efb0304992be7f89c053685fd55e1d2
+  metadata.gz: 2673b29c0df7935516e09dcfea5cb5c8a2986785
+  data.tar.gz: 0cf28efde5d3fa7cf912a3476b779a9033fdce20
 SHA512:
-  metadata.gz: 0c0b46a0392eecaa229dd77a2a9361e62fc5eebfcffcf9a8c0724e68ed555bccae09c821e4213e2f8f28292d4b33bfc94c8496fd04a8bf8e22d78d227860a0a4
-  data.tar.gz: 1f71711f0ce3e1fbf56b9aff4d90e3ec154e0ca98fbd193d42d320018882230165a4228b98dbe88629df21ffd5907cc74085684bc4629158d4e1cdcf21c87f9a
+  metadata.gz: 0e0d8a9fac9445125d7377e091928448b9d3aa4e09fd916be3f7c9d26c45c87e9c8e03ae57bbd99e35b56031656889d4daa573f665d123708d1124fc4cdfebdb
+  data.tar.gz: 814399093a3259a2095240dd1afecaa7e090990d629213e5cb5c976f03326fd21b4c5eac6f6884d1d0409d9a374b3eada6ae4fb3104afdfb4a48ce152eb4b2dc

data/config/initializers/base_indexer.rb

@@ -2,5 +2,7 @@
 # Define the indexer class that will be used by the engine. 
 # The engine consumer app should override this class
 BaseIndexer.indexer_class = "BaseIndexer::MainIndexerEngine"
-BaseIndexer.solr_configuration_class = "BaseIndexer::SolrConfigurationFromFile"
-#BaseIndexer.solr_configuration_class.constantize.new(Rails.configuration.solr_config_file_path)
+BaseIndexer.solr_configuration_class_name = "BaseIndexer::SolrConfigurationFromFile"
+#BaseIndexer.solr_configuration_class.constantize.new(Rails.configuration.solr_config_file_path)
+BaseIndexer.mapper_class_name = "DiscoveryIndexer::Mapper::GeneralMapper"
+BaseIndexer.solr_writer_class_name = "DiscoveryIndexer::Writer::SolrWriter"

data/lib/base_indexer/engine.rb

@@ -6,7 +6,7 @@ module BaseIndexer
     # Initialize memory store cache with 50 MB size
     config.cache_store = [:memory_store, {:size => 64.megabytes }]
     config.after_initialize do 
-          BaseIndexer.solr_configuration_class.constantize.instance.read(Rails.configuration.solr_config_file_path ||= 'test')
+          BaseIndexer.solr_configuration_class_name.constantize.instance.read(Rails.configuration.solr_config_file_path ||= 'test')
           DiscoveryIndexer::Logging.logger = Rails.logger
     end
   end

data/lib/base_indexer/main_indexer_engine.rb

@@ -4,11 +4,15 @@ module BaseIndexer
     include DiscoveryIndexer
     
     def index druid, targets
+      # Read input mods and purl
       purl_model =  read_purl(druid)
       mods_model =  read_mods(druid)
       collection_names = get_collection_names(purl_model.collection_druids)
-      solr_doc = map(druid, mods_model, purl_model, collection_names)
       
+      # Map the input to solr_doc
+      solr_doc =  BaseIndexer.mapper_class_name.constantize.new(druid, mods_model, purl_model, collection_names).map
+      
+      # Get target list
       targets_hash={}
       if targets.nil? or targets.length == 0
         targets_hash = purl_model.release_tags_hash
@@ -16,12 +20,14 @@ module BaseIndexer
         targets_hash = get_targets_hash_from_param(targets)
       end
       
-      write(druid, solr_doc, targets_hash, get_solr_targets_configs())
+      # Get SOLR configuration and write
+      solr_targets_configs = BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash
+      BaseIndexer.solr_writer_class_name.constantize.new.process( druid, solr_doc, targets_hash, solr_targets_configs)
     end
     
     def delete druid
-      solr_writer = DiscoveryIndexer::Writer::SolrWriter.new
-      solr_writer.solr_delete_from_all( druid,  get_solr_targets_configs())
+      solr_targets_configs = BaseIndexer.solr_configuration_class_name.constantize.instance.get_configuration_hash
+      BaseIndexer.solr_writer_class_name.constantize.new.solr_delete_from_all( druid,  solr_targets_configs)
     end
     
     def read_purl druid
@@ -32,16 +38,6 @@ module BaseIndexer
       return DiscoveryIndexer::InputXml::Modsxml.new(druid).load()
     end
     
-    def map druid, mods_model, purl_model, collection_names
-      return DiscoveryIndexer::Mapper::IndexerlMapper.new(druid, mods_model, purl_model, collection_name).map 
-    end
-    
-    def write druid, solr_doc, targets, solr_targets_configs
-      solr_writer = DiscoveryIndexer::Writer::SolrWriter.new
-      solr_writer.process( druid, solr_doc, targets, solr_targets_configs)
-      #DiscoveryIndexer::Writer::SolrClient.add(solr_doc, solr_connector)
-    end
-    
     def get_targets_hash_from_param(targets)
       targets_hash = {}
       targets.each do |target|
@@ -50,15 +46,6 @@ module BaseIndexer
       return targets_hash
     end
     
-#    def get_targets_hash_from_release_tags release_tags
-#      indexer_target_name = "Robot_Testing_Feb_5_2015"
-#      return DiscoveryIndexer::Utilities::ExtractSubTargets.by_name(indexer_target_name,release_tags ) 
-#    end
-    
-    def get_solr_targets_configs
-      return BaseIndexer.solr_configuration_class.constantize.instance.get_configuration_hash
-    end
-    
     def get_collection_names collection_druids
       collection_names = {}
       

data/lib/base_indexer/version.rb

@@ -1,3 +1,3 @@
 module BaseIndexer
-  VERSION = "0.0.1"
+  VERSION = "0.1.2"
 end

data/lib/base_indexer.rb

@@ -7,6 +7,9 @@ require "base_indexer/collection"
 require 'discovery-indexer'
 module BaseIndexer
   mattr_accessor :indexer_class
-  mattr_accessor :solr_configuration_class
+  
+  mattr_accessor :mapper_class_name
+  mattr_accessor :solr_writer_class_name
+  mattr_accessor :solr_configuration_class_name
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base_indexer
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.2
 platform: ruby
 authors:
 - Ahmed Alsum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails