picky 0.11.2 → 0.12.0

data/spec/lib/indexing/bundle_spec.rb

@@ -3,18 +3,19 @@ require 'spec_helper'
 describe Indexing::Bundle do
 
   before(:each) do
-    @category    = stub :category, :name => :some_category
-    @type        = stub :type, :name => :some_type
+    @index         = stub :index, :name => :some_index
+    @category      = stub :category, :name => :some_category
+    @configuration = Configuration::Index.new @index, @category
+    
     @partial     = stub :partial
     @weights     = stub :weights
     @similarity  = stub :similarity
-    @index_class = Indexing::Bundle
-    @index       = @index_class.new :some_name, @category, @type, @partial, @weights, @similarity
+    @index       = Indexing::Bundle.new :some_name, @configuration, @similarity, @partial, @weights
   end
 
   describe 'identifier' do
     it 'should return a specific identifier' do
-      @index.identifier.should == 'some_type: some_name some_category'
+      @index.identifier.should == 'some_index some_category (some_name)'
     end
   end
   
@@ -212,12 +213,6 @@ describe Indexing::Bundle do
   end
   
   describe 'initialization' do
-    before(:each) do
-      @category = stub :category, :name => :some_category
-      @type     = stub :type, :name => :some_type
-      
-      @index = @index_class.new :some_name, @category, @type, :similarity, :partial, :weights
-    end
     it 'should initialize the index correctly' do
       @index.index.should == {}
     end
@@ -228,13 +223,13 @@ describe Indexing::Bundle do
       @index.similarity.should == {}
     end
     it 'should initialize the partial strategy correctly' do
-      @index.partial_strategy.should == :partial
+      @index.partial_strategy.should == @partial
     end
     it 'should initialize the weights strategy correctly' do
-      @index.weights_strategy.should == :weights
+      @index.weights_strategy.should == @weights
     end
     it 'should initialize the similarity strategy correctly' do
-      @index.similarity_strategy.should == :similarity
+      @index.similarity_strategy.should == @similarity
     end
   end
 

data/spec/lib/indexing/category_spec.rb

@@ -1,10 +1,13 @@
 require 'spec_helper'
+
 describe Indexing::Category do
   
+  before(:each) do
+    @index = stub :index, :name => :some_index
+    @category = Indexing::Category.new :some_category, @index, :source => :some_given_source
+  end
   context "unit specs" do
     before(:each) do
-      @type = stub :some_type, :name => :some_type
-      @category = Indexing::Category.new :some_name, @type
       @exact = @category.exact
       @partial = @category.partial
     end
@@ -69,88 +72,12 @@ describe Indexing::Category do
       end
     end
     
-    describe "virtual?" do
-      context "with virtual true" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, virtual: true
-        end
-        it "returns the right value" do
-          @category.virtual?.should == true
-        end
-      end
-      context "with virtual object" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, :virtual => 123.6
-        end
-        it "returns the right value" do
-          @category.virtual?.should == true
-        end
-      end
-      context "with virtual nil" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, :virtual => nil
-        end
-        it "returns the right value" do
-          @category.virtual?.should == false
-        end
-      end
-      context "with virtual false" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, :virtual => false
-        end
-        it "returns the right value" do
-          @category.virtual?.should == false
-        end
-      end
-    end
-    describe "tokenizer" do
-      context "with specific tokenizer" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, tokenizer: Tokenizers::Index.new
-        end
-        it "caches" do
-          @category.tokenizer.should == @category.tokenizer
-        end
-        it "returns an instance" do
-          @category.tokenizer.should be_kind_of(Tokenizers::Index)
-        end
-      end
-    end
-    describe "indexer" do
-      context "with default indexer" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type
-        end
-        it "caches" do
-          @category.indexer.should == @category.indexer
-        end
-      end
-      context "with specific indexer" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, tokenizer: Indexers::Default
-        end
-        it "caches" do
-          @category.indexer.should == @category.indexer
-        end
-        it "returns an instance" do
-          @category.indexer.should be_kind_of(Indexers::Default)
-        end
-        it "creates a new instance of the right class" do
-          Indexers::Default.should_receive(:new).once.with @type, @category
-          
-          @category.indexer
-        end
-      end
-    end
     describe "cache" do
       before(:each) do
-        @category = Indexing::Category.new :some_name, @type
-        @category.stub! :prepare_cache_directory
-        
         @category.stub! :generate_caches
       end
       it "prepares the cache directory" do
-        @category.should_receive(:prepare_cache_directory).once.with
+        @category.should_receive(:prepare_index_directory).once.with
         
         @category.cache
       end
@@ -160,28 +87,13 @@ describe Indexing::Category do
         @category.cache
       end
     end
-    describe "prepare_cache_directory" do
-      before(:each) do
-        @category = Indexing::Category.new :some_name, @type
-        
-        @category.stub! :cache_directory => :some_cache_directory
-      end
-      it "tells the FileUtils to mkdir_p" do
-        FileUtils.should_receive(:mkdir_p).once.with :some_cache_directory
-        
-        @category.prepare_cache_directory
-      end
-    end
     describe "index" do
       before(:each) do
-        @category = Indexing::Category.new :some_name, @type
-        @category.stub! :prepare_cache_directory
-        
         @indexer = stub :indexer, :index => nil
         @category.stub! :indexer => @indexer
       end
       it "prepares the cache directory" do
-        @category.should_receive(:prepare_cache_directory).once.with
+        @category.should_receive(:prepare_index_directory).once.with
         
         @category.index
       end
@@ -192,40 +104,12 @@ describe Indexing::Category do
       end
     end
     describe "source" do
-      context "with source" do
-        before(:each) do
-          @category = Indexing::Category.new :some_name, @type, :source => :some_given_source
-        end
-        it "returns the given source" do
-          @category.source.should == :some_given_source
-        end
-      end
       context "without source" do
-        before(:each) do
-          @type = stub :type, :name => :some_type, :source => :some_type_source
-          
-          @category = Indexing::Category.new :some_name, @type
-        end
-        it "returns the type's source" do
-          @category.source.should == :some_type_source
-        end
-      end
-    end
-    context "name symbol" do
-      before(:each) do
-        @category = Indexing::Category.new :some_name, @type
-      end
-      describe "search_index_file_name" do
-        it "returns the right file name" do
-          @category.search_index_file_name.should == 'some/search/root/index/test/some_type/prepared_some_name_index.txt'
+        it "raises" do
+          lambda { Indexing::Category.new :some_name, @index }.should raise_error(Indexers::NoSourceSpecifiedException)
         end
       end
     end
-    context "name string" do
-      it "works" do
-        @category = Indexing::Category.new 'some_name', @type
-      end
-    end
   end
   
 end

data/spec/lib/indexing/{type_spec.rb → index_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Indexing::Type do
+describe Indexing::Index do
   
   context "with categories" do
     before(:each) do
@@ -8,7 +8,7 @@ describe Indexing::Type do
       
       @categories = stub :categories
       
-      @index = Indexing::Type.new :some_name, @source
+      @index = Indexing::Index.new :some_name, @source
       @index.add_category :some_category_name1
       @index.add_category :some_category_name2
       
@@ -25,7 +25,7 @@ describe Indexing::Type do
   
   context "no categories" do
     it "works" do
-      Indexing::Type.new :some_name, @source
+      Indexing::Index.new :some_name, @source
     end
   end
   

data/spec/lib/query/base_spec.rb

@@ -109,7 +109,7 @@ describe 'Query::Base' do
   
   before(:each) do
     @type      = stub :type
-    @index     = stub :some_index, :index => @type
+    @index     = stub :some_index, :indexed => @type
   end
   
   describe 'initializer' do

data/spec/lib/query/full_spec.rb

@@ -4,7 +4,7 @@ describe Query::Full do
 
   before(:each) do
     @type  = stub :type
-    @index = stub :index, :index => @type
+    @index = stub :index, :indexed => @type
   end
 
   describe 'result_type' do

data/spec/lib/query/live_spec.rb

@@ -3,10 +3,8 @@ require 'spec_helper'
 describe Query::Live do
 
   before(:each) do
-    # @category1  = Index::Category.new
-    # @type_index = Index::Type.new :some_name, :some_result_type, @category1
-    @type  = stub :type
-    @index = stub :index, :index => @type
+    @indexed  = stub :indexed
+    @index = stub :index, :indexed => @indexed
   end
 
   describe 'result_type' do

data/spec/lib/sources/couch_spec.rb

@@ -7,15 +7,15 @@ describe Sources::Couch do
       lambda { @source = Sources::Couch.new(:a, :b, :c) }.should raise_error(Sources::NoCouchDBGiven)
     end
   end
-
+  
   context "with database" do
     before(:each) do
       @source = Sources::Couch.new :a, :b, :c, url: 'http://localhost:5984/picky'
       RestClient::Request.should_receive(:execute).any_number_of_times.and_return %{{"rows":[{"doc":{"_id":"7","a":"a data","b":"b data","c":"c data"}}]}}
     end
-
+    
     describe "harvest" do
-      it "should yield the right data" do
+      it "yields the right data" do
         field = stub :b, :name => :b
         @source.harvest :anything, field do |id, token|
           id.should    eql(7) 
@@ -23,9 +23,9 @@ describe Sources::Couch do
         end.should have(1).item
       end
     end
-
+    
     describe "get_data" do
-      it "should yield each line" do
+      it "yields each line" do
         @source.get_data do |data|
           data.should == { "_id" => "7", "a" => "a data", "b" => "b data", "c" => "c data" }
         end.should have(1).item

data/spec/lib/sources/db_spec.rb

@@ -112,21 +112,20 @@ describe Sources::DB do
 
   describe "harvest_statement_with_offset" do
     before(:each) do
-      @source.should_receive(:type_name).any_number_of_times.and_return :books
-      @field = stub :field, :name => :some_field
-      @type  = stub :type,  :name => :some_type
+      @category = stub :category, :name => :some_category
+      @type     = stub :type,     :name => :some_type
     end
     it "should get a harvest statement and the chunksize to put the statement together" do
-      @source.should_receive(:harvest_statement).once.and_return 'some_example_statement'
-      @source.harvest_statement_with_offset(@type, @field, :some_offset)
+      @source.should_receive(:harvest_statement).once.with(@type, @category).and_return 'some_example_statement'
+      @source.harvest_statement_with_offset(@type, @category, :some_offset)
     end
     it "should add an AND if it already contains a WHERE statement" do
       @source.should_receive(:harvest_statement).and_return 'WHERE'
-      @source.harvest_statement_with_offset(@type, @field, :some_offset).should == "WHERE AND st.id > some_offset LIMIT 25000"
+      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "WHERE AND st.id > some_offset LIMIT 25000"
     end
     it "should add a WHERE if it doesn't already contain one" do
       @source.should_receive(:harvest_statement).and_return 'some_statement'
-      @source.harvest_statement_with_offset(@type, @field, :some_offset).should == "some_statement WHERE st.id > some_offset LIMIT 25000"
+      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "some_statement WHERE st.id > some_offset LIMIT 25000"
     end
   end
   

data/spec/lib/tokenizers/base_spec.rb

@@ -13,7 +13,7 @@ describe Tokenizers::Base do
       @tokenizer.substitute_characters('abcdefghijklmnopqrstuvwxyzäöü').should == 'abcdefghijklmnopqrstuvwxyzäöü'
     end
     it "uses the substituter to replace characters" do
-      @tokenizer.substitutes_characters_with CharacterSubstitution::European.new
+      @tokenizer.substitutes_characters_with CharacterSubstituters::WestEuropean.new
       
       @tokenizer.substitute_characters('abcdefghijklmnopqrstuvwxyzäöü').should == 'abcdefghijklmnopqrstuvwxyzaeoeue'
     end
@@ -121,29 +121,6 @@ describe Tokenizers::Base do
     end
   end
   
-  describe 'contracts_expressions' do
-    context 'without contract_expressions called' do
-      it 'should define a method contract' do
-        lambda { @tokenizer.contract('from this text') }.should_not raise_error
-      end
-      it 'should define a method contract that does nothing' do
-        unchanging = stub :unchanging
-        @tokenizer.contract unchanging
-      end
-    end
-    context 'with contracts_expressions called' do
-      before(:each) do
-        @tokenizer.contracts_expressions(/Mister|Mr./, 'mr')
-      end
-      it 'should define a method remove_stopwords' do
-        lambda { @tokenizer.contract('from this text') }.should_not raise_error
-      end
-      it 'should define a method contract that contracts expressions' do
-        @tokenizer.contract('Mister Meyer, Mr. Peter').should == 'mr Meyer, mr Peter'
-      end
-    end
-  end
-  
   describe 'stopwords' do
     context 'without stopwords given' do
       it 'should define a method remove_stopwords' do

data/spec/lib/tokenizers/query_spec.rb

@@ -45,7 +45,6 @@ describe Tokenizers::Query do
       
       @tokenizer.should_receive(:remove_illegals).once.ordered.with text
       @tokenizer.should_receive(:remove_non_single_stopwords).once.ordered.with text
-      @tokenizer.should_receive(:contract).once.ordered
       
       @tokenizer.preprocess text
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 2
-  version: 0.11.2
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,12 @@ files:
 - lib/deployment.rb
 - lib/picky/alias_instances.rb
 - lib/picky/application.rb
-- lib/picky/bundle.rb
 - lib/picky/cacher/convenience.rb
 - lib/picky/cacher/generator.rb
 - lib/picky/cacher/partial/default.rb
 - lib/picky/cacher/partial/none.rb
 - lib/picky/cacher/partial/strategy.rb
-- lib/picky/cacher/partial/subtoken.rb
+- lib/picky/cacher/partial/substring.rb
 - lib/picky/cacher/partial_generator.rb
 - lib/picky/cacher/similarity/default.rb
 - lib/picky/cacher/similarity/double_levenshtone.rb
@@ -62,9 +61,8 @@ files:
 - lib/picky/cacher/weights/logarithmic.rb
 - lib/picky/cacher/weights/strategy.rb
 - lib/picky/cacher/weights_generator.rb
-- lib/picky/character_substitution/european.rb
-- lib/picky/configuration/indexes.rb
-- lib/picky/configuration/queries.rb
+- lib/picky/character_substituters/west_european.rb
+- lib/picky/configuration/index.rb
 - lib/picky/cores.rb
 - lib/picky/ext/maybe_compile.rb
 - lib/picky/ext/ruby19/extconf.rb
@@ -78,25 +76,27 @@ files:
 - lib/picky/helpers/gc.rb
 - lib/picky/helpers/measuring.rb
 - lib/picky/index/bundle.rb
-- lib/picky/index/categories.rb
-- lib/picky/index/category.rb
 - lib/picky/index/file/basic.rb
 - lib/picky/index/file/json.rb
 - lib/picky/index/file/marshal.rb
 - lib/picky/index/file/text.rb
 - lib/picky/index/files.rb
-- lib/picky/index/type.rb
-- lib/picky/index/types.rb
-- lib/picky/index/wrappers/exact_first.rb
-- lib/picky/indexers/base.rb
-- lib/picky/indexers/default.rb
+- lib/picky/Index_api.rb
+- lib/picky/indexed/bundle.rb
+- lib/picky/indexed/categories.rb
+- lib/picky/indexed/category.rb
+- lib/picky/indexed/index.rb
+- lib/picky/indexed/indexes.rb
+- lib/picky/indexed/wrappers/exact_first.rb
 - lib/picky/indexers/no_source_specified_error.rb
+- lib/picky/indexers/serial.rb
 - lib/picky/indexers/solr.rb
+- lib/picky/indexes_api.rb
 - lib/picky/indexing/bundle.rb
 - lib/picky/indexing/categories.rb
 - lib/picky/indexing/category.rb
-- lib/picky/indexing/type.rb
-- lib/picky/indexing/types.rb
+- lib/picky/indexing/index.rb
+- lib/picky/indexing/indexes.rb
 - lib/picky/loader.rb
 - lib/picky/loggers/search.rb
 - lib/picky/query/allocation.rb
@@ -129,12 +129,9 @@ files:
 - lib/picky/tokenizers/base.rb
 - lib/picky/tokenizers/index.rb
 - lib/picky/tokenizers/query.rb
-- lib/picky/type.rb
-- lib/picky/types.rb
 - lib/picky-tasks.rb
 - lib/picky.rb
 - lib/tasks/application.rake
-- lib/tasks/cache.rake
 - lib/tasks/framework.rake
 - lib/tasks/index.rake
 - lib/tasks/routes.rake
@@ -163,15 +160,15 @@ files:
 - spec/lib/cacher/cacher_strategy_spec.rb
 - spec/lib/cacher/partial/default_spec.rb
 - spec/lib/cacher/partial/none_spec.rb
-- spec/lib/cacher/partial/subtoken_spec.rb
+- spec/lib/cacher/partial/substring_spec.rb
 - spec/lib/cacher/partial_generator_spec.rb
 - spec/lib/cacher/similarity/double_levenshtone_spec.rb
 - spec/lib/cacher/similarity/none_spec.rb
 - spec/lib/cacher/similarity_generator_spec.rb
 - spec/lib/cacher/weights/logarithmic_spec.rb
 - spec/lib/cacher/weights_generator_spec.rb
-- spec/lib/character_substitution/european_spec.rb
-- spec/lib/configuration/indexes_spec.rb
+- spec/lib/character_substituters/west_european_spec.rb
+- spec/lib/configuration/index_spec.rb
 - spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
 - spec/lib/extensions/hash_spec.rb
@@ -182,21 +179,21 @@ files:
 - spec/lib/helpers/cache_spec.rb
 - spec/lib/helpers/gc_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/index/bundle_spec.rb
-- spec/lib/index/category_spec.rb
 - spec/lib/index/file/basic_spec.rb
 - spec/lib/index/file/json_spec.rb
 - spec/lib/index/file/marshal_spec.rb
 - spec/lib/index/file/text_spec.rb
 - spec/lib/index/files_spec.rb
-- spec/lib/index/type_spec.rb
-- spec/lib/index/wrappers/exact_first_spec.rb
-- spec/lib/indexers/base_spec.rb
+- spec/lib/indexed/bundle_spec.rb
+- spec/lib/indexed/categories_spec.rb
+- spec/lib/indexed/category_spec.rb
+- spec/lib/indexed/index_spec.rb
+- spec/lib/indexed/wrappers/exact_first_spec.rb
+- spec/lib/indexers/serial_spec.rb
 - spec/lib/indexing/bundle_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle_spec.rb
-- spec/lib/indexing/categories_spec.rb
 - spec/lib/indexing/category_spec.rb
-- spec/lib/indexing/type_spec.rb
+- spec/lib/indexing/index_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
@@ -265,15 +262,15 @@ test_files:
 - spec/lib/cacher/cacher_strategy_spec.rb
 - spec/lib/cacher/partial/default_spec.rb
 - spec/lib/cacher/partial/none_spec.rb
-- spec/lib/cacher/partial/subtoken_spec.rb
+- spec/lib/cacher/partial/substring_spec.rb
 - spec/lib/cacher/partial_generator_spec.rb
 - spec/lib/cacher/similarity/double_levenshtone_spec.rb
 - spec/lib/cacher/similarity/none_spec.rb
 - spec/lib/cacher/similarity_generator_spec.rb
 - spec/lib/cacher/weights/logarithmic_spec.rb
 - spec/lib/cacher/weights_generator_spec.rb
-- spec/lib/character_substitution/european_spec.rb
-- spec/lib/configuration/indexes_spec.rb
+- spec/lib/character_substituters/west_european_spec.rb
+- spec/lib/configuration/index_spec.rb
 - spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
 - spec/lib/extensions/hash_spec.rb
@@ -284,21 +281,21 @@ test_files:
 - spec/lib/helpers/cache_spec.rb
 - spec/lib/helpers/gc_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/index/bundle_spec.rb
-- spec/lib/index/category_spec.rb
 - spec/lib/index/file/basic_spec.rb
 - spec/lib/index/file/json_spec.rb
 - spec/lib/index/file/marshal_spec.rb
 - spec/lib/index/file/text_spec.rb
 - spec/lib/index/files_spec.rb
-- spec/lib/index/type_spec.rb
-- spec/lib/index/wrappers/exact_first_spec.rb
-- spec/lib/indexers/base_spec.rb
+- spec/lib/indexed/bundle_spec.rb
+- spec/lib/indexed/categories_spec.rb
+- spec/lib/indexed/category_spec.rb
+- spec/lib/indexed/index_spec.rb
+- spec/lib/indexed/wrappers/exact_first_spec.rb
+- spec/lib/indexers/serial_spec.rb
 - spec/lib/indexing/bundle_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle_spec.rb
-- spec/lib/indexing/categories_spec.rb
 - spec/lib/indexing/category_spec.rb
-- spec/lib/indexing/type_spec.rb
+- spec/lib/indexing/index_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb

data/lib/picky/bundle.rb

@@ -1,33 +0,0 @@
-class Bundle
-  
-  attr_reader   :identifier, :files
-  attr_accessor :index, :weights, :similarity, :similarity_strategy
-  
-  delegate :[], :[]=, :clear, :to => :index
-  
-  def initialize name, category, type, similarity_strategy
-    @identifier = "#{type.name}: #{name} #{category.name}"
-    
-    @index      = {}
-    @weights    = {}
-    @similarity = {}
-    
-    @similarity_strategy = similarity_strategy
-    
-    # TODO inject files.
-    #
-    # TODO Move Files somewhere. Shared?
-    #
-    # Files and the identifier are parametrized, the rest is not!
-    #
-    @files = Index::Files.new name, category.name, type.name
-  end
-  
-  # Get a list of similar texts.
-  #
-  def similar text
-    code = similarity_strategy.encoded text
-    code && @similarity[code] || []
-  end
-  
-end

data/lib/picky/configuration/indexes.rb

@@ -1,51 +0,0 @@
-# TODO Remove?
-#
-module Configuration
-  
-  # Describes the container for all index configurations.
-  #
-  class Indexes
-    
-    attr_reader :types
-    
-    def initialize
-      @types = []
-    end
-    
-    def default_tokenizer options = {}
-      Tokenizers::Index.default = Tokenizers::Index.new(options)
-    end
-    
-    # TODO Move this to … where?
-    #
-    # #
-    # #
-    # def take_snapshot *type_names
-    #   only_if_included_in type_names do |type|
-    #     type.take_snapshot
-    #   end
-    # end
-    # def index *type_names
-    #   only_if_included_in type_names do |type|
-    #     type.index
-    #   end
-    # end
-    # def index_solr *type_names
-    #   only_if_included_in type_names do |type|
-    #     type.index_solr
-    #   end
-    # end
-    # 
-    # #
-    # #
-    # def only_if_included_in type_names = []
-    #   type_names = types.map(&:name) if type_names.empty?
-    #   types.each do |type|
-    #     next unless type_names.include?(type.name)
-    #     yield type
-    #   end
-    # end
-    
-  end
-
-end