Changeset 97564968f9aed076ddedd60a97b504b972e3f7fc

Timestamp:

06/22/08 11:38:00 (7 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

b82c99a2260ab756fe85d7b61da340581dc3b461

Children:

a249f609ee1784b37b8bce802dfa88406cc2c3fd

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-06-22T11:38:00Z+1000

Message:

Fixed ruby bindings and added Index#term_vector

* Added Index#term_vector method
* In Rakefile: need to use ln_sf instead of ln or we can't rebuild
* Added ext/scanner_utf8.c to .gitignore
* temporary fix to #define FRT_REALLOC_N REALLOC_N

Location:

ruby

Files:

• .gitignore (modified) (1 diff)
• Rakefile (modified) (1 diff)
• ext/lang.h (modified) (1 diff)
• lib/ferret/index.rb (modified) (1 diff)

ruby/.gitignore

@@ -99 +99 @@
 ext/scanner.[ch]
 ext/scanner_mb.c
+ext/scanner_utf8.c
 ext/search.c
 ext/search.h

ruby/Rakefile

@@ -84 +84 @@
     # prepend lib files to avoid conflicts
     file dest_fn => fn do |t|
-      ln fn, dest_fn
+      ln_sf File.expand_path(fn), File.expand_path(dest_fn)
 
       if fn =~ /stemmer/

ruby/ext/lang.h

@@ -14 +14 @@
 #define frt_ecalloc(n) xcalloc(n, 1)
 #define frt_erealloc xrealloc
+/* FIXME: should eventually delete this */
+#define FRT_REALLOC_N REALLOC_N
 
 

ruby/lib/ferret/index.rb

@@ -480 +480 @@
     alias :[] :doc
 
+    # Retrieves the term_vector for a document. The document can be referenced
+    # by either a string id to match the id field or an integer corresponding
+    # to Ferret's document number.
+    #
+    # See Ferret::Index::IndexReader#term_vector
+    def term_vector(id, field)
+      @dir.synchronize do
+        ensure_reader_open()
+        if id.kind_of?(String) or id.kind_of?(Symbol)
+          term_doc_enum = @reader.term_docs_for(@id_field, id.to_s)
+          if term_doc_enum.next?
+            id = @reader[term_doc_enum.doc]
+          else
+            return nil
+          end
+        end
+        return @reader.term_vector(id, field)
+      end
+    end
+
     # iterate through all documents in the index. This method preloads the
     # documents so you don't need to call #load on the document to load all the