ferret 0.9.4 → 0.9.5

data/ext/store.h

@@ -121,6 +121,7 @@ llong is_read_long(InStream *is);
 unsigned int is_read_uint(InStream *is);
 ullong is_read_ulong(InStream *is);
 ullong is_read_vint(InStream *is);
+void is_skip_vints(InStream *is, register int cnt);
 void is_read_chars(InStream *is, char* buffer, int off, int len) ;
 char *is_read_string(InStream *is);
 void os_write_int(OutStream *os, int l);

data/ext/termdocs.c

@@ -233,9 +233,7 @@ void stpe_close(TermDocEnum *tde)
 
 void stpe_skip_prox(SegmentTermDocEnum *stde)
 {
-  int i;
-  for (i = 0; i < stde->freq; i++)
-    is_read_vint(stde->prox_in);
+  is_skip_vints(stde->prox_in, stde->freq);
 }
 
 void stpe_seek_prox(SegmentTermDocEnum *stde, int prox_pointer)
@@ -247,11 +245,9 @@ void stpe_seek_prox(SegmentTermDocEnum *stde, int prox_pointer)
 bool stpe_next(TermDocEnum *tde)
 {
   SegmentTermDocEnum *stde = (SegmentTermDocEnum *)tde->data;
-  int i;
-  for (i = 0; i < stde->prox_cnt; i++)
-    is_read_vint(stde->prox_in);
+  is_skip_vints(stde->prox_in, stde->prox_cnt);
 
-  // if super
+  /* if super */
   if (stde_next(tde)) {
     stde->prox_cnt = stde->freq;
     stde->position = 0;

data/ext/vector.c

@@ -98,12 +98,12 @@ void tvw_write_field(TermVectorsWriter *tvw)
   TVOffsetInfo *tmp_offset;
   TVTerm **terms = tvw->terms;
   TVTerm *term;
-  /* remember where this field is written */
   OutStream *tvf = tvw->tvf;
   int store_positions = tvw->curr_field->store_positions;
   int store_offsets = tvw->curr_field->store_offsets;
   uchar bits = 0x0;
 
+  /* remember where this field is written */
   tvw->curr_field->tvf_pointer = os_pos(tvf);
   
   /* write the number of terms */

data/lib/ferret.rb

@@ -22,7 +22,7 @@
 #++
 # :include: ../TUTORIAL
 module Ferret
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end
 
 # try and load the C extension but it isn't necessary.

data/lib/ferret/store/ram_store.rb

@@ -7,12 +7,15 @@ module Ferret::Store
     def initialize(dir = nil, close_dir = false)
       super()
       @files = Hash.new
-      unless dir.nil?
+      if dir
+        buf = BUFFER.clone
         dir.each do |file|
           os = create_output(file)    # make a place on ram disk
           is = dir.open_input(file)   # read the current file
           len = is.length             # and copy the file to ram disk
-          buf = Array.new(len)
+          if len > buf.size
+            buf << " " * (len - buf.size)
+          end
           is.read_bytes(buf, 0, len)
           os.write_bytes(buf, len)
           is.close()

data/lib/rferret.rb

@@ -23,7 +23,7 @@ $: << File.dirname(__FILE__)
 #++
 # :include: ../TUTORIAL
 module Ferret
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end
 
 $ferret_pure_ruby = true

data/test/unit/index/tc_index_reader.rb

@@ -532,7 +532,11 @@ class IndexReaderTest < Test::Unit::TestCase
   end
 
   def test_ir_multivalue_fields()
-    iw = IndexWriter.new(@dir, :analyzer => WhiteSpaceAnalyzer.new(), :create => true)
+    @fs_dpath = File.expand_path(File.join(File.dirname(__FILE__),
+                                           '../../temp/fsdir'))
+    @fs_dir = Ferret::Store::FSDirectory.new(@fs_dpath, true)
+
+    iw = IndexWriter.new(@fs_dir, :analyzer => WhiteSpaceAnalyzer.new(), :create => true)
     doc = Document.new()
     doc << Field.new("tag", "Ruby", Field::Store::YES, Field::Index::NO, Field::TermVector::NO)
     doc << Field.new("tag", "C", Field::Store::YES, Field::Index::UNTOKENIZED, Field::TermVector::NO)
@@ -555,6 +559,7 @@ class IndexReaderTest < Test::Unit::TestCase
     iw << doc
     iw.close()
 
+    @dir = Ferret::Store::RAMDirectory.new(@fs_dir, true)
     ir = IndexReader.open(@dir, false)
 
     doc = ir.get_document(0)

data/test/unit/search/tc_search_and_sort.rb

@@ -146,7 +146,7 @@ class SearchAndSortTest < Test::Unit::TestCase
     do_test_top_docs(is, q, [8,7,5,3,1,0,2,4,6,9], Sort.new("float", true))
     do_test_top_docs(is, q, [0,6,1,5,9,4,8,7,2,3], Sort.new(["int", "string"], true))
     do_test_top_docs(is, q, [3,2,7,8,4,9,5,1,6,0], Sort.new(["int", "string"]))
-    do_test_top_docs(is, q, [3,2,7,8,4,9,5,1,6,0], ["int", "string"])
+    do_test_top_docs(is, q, [3,2,7,8,4,9,5,1,6,0], [:int, "string"])
   end
 
   #LENGTH = SortField::SortType.new("length", lambda{|str| str.length})

data/test/unit/store/tc_fs_store.rb

@@ -8,7 +8,7 @@ class FSStoreTest < Test::Unit::TestCase
   include StoreLockTest
   def setup
     @dpath = File.expand_path(File.join(File.dirname(__FILE__),
-                       '../../temp/fsdir'))
+                                        '../../temp/fsdir'))
     @dir = FSDirectory.new(@dpath, true)
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
-date: 2006-07-01 00:00:00 +09:00
+  version: 0.9.5
+date: 2006-08-07 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
 - lib
@@ -12,7 +12,7 @@ email: dbalmain@gmail.com
 homepage: http://ferret.davebalmain.com/trac
 rubyforge_project: ferret
 description: Ferret is a port of the Java Lucene project. It is a powerful indexing and search library.
-autorequire: 
+autorequire: ferret
 default_executable: 
 bindir: bin
 has_rdoc: true
@@ -51,7 +51,6 @@ files:
 - ext/document.c
 - ext/compound_io.c
 - ext/index_rw.c
-- ext/termdocs.c
 - ext/vector.c
 - ext/field.c
 - ext/term.c
@@ -369,6 +368,7 @@ files:
 - test/utils/number_to_spoken.rb
 - test/unit/analysis/data/wordfile
 - rake_utils/code_statistics.rb
+- ext/termdocs.c
 test_files: []
 
 rdoc_options: