[ruby-list:35971] namadu patch for rbnamazu-0.4

Beyond です。

分散namazu が、rbnamazu-0.4 で動かなかったので、とりあえず動く程度に 
patch をあてました。

rbnamazu-0.4 をスレッドセーフ化するのは諦め、ほぼシングルスレッドにて動
作します。

$ diff -u -2 -p namadu.rb.org namadu.rb
--- namadu.rb.org	Fri Jul 21 01:58:49 2000
+++ namadu.rb	Thu Sep 19 13:01:41 2002
@@ -62,5 +62,5 @@ class Namazu
       @summary = nil
       if querystring
-	nmzresults = @nmzindices.collect() do |nmzindex|
+	nmzresults = @indices.collect() do |nmzindex|
 	  nmzindex.search(querystring)
 	end
@@ -72,5 +72,5 @@ class Namazu
 	    nmzresult = nmzresults[i]
 	    next unless nmzresult
-	    nmzindex = @nmzindices[i]
+	    nmzindex = @indices[i]
 	    for docid in nmzresult.docids()
 	      nmzdoc = Hash.new()	# Document -> Hash
@@ -87,5 +87,5 @@ class Namazu
 	  @summary.hitnum = @summary.length()
 	  @summary.whence = get_whence()
-	  @summary.max = get_max()
+	  @summary.maxlength = get_maxlength()
 	end
       end
@@ -108,5 +108,5 @@ class Namadu
     public
     def search(querystring, sortkey=nil, max=nil, whence=nil)
-      summarizer = Namazu::HashSummarizer.new(@nmzindices, @nmzoptions)
+      summarizer = Namazu::Summarizer.new(@indices, @options)
       if summarizer.summarize(querystring)
 	if sortkey
@@ -116,9 +116,12 @@ class Namadu
 	end
 	summarizer.sort!(sort)
-	summarizer.summary()[summarizer.get_whence(whence), summarizer.get_max(max)]
+	summarizer.summary().get(summarizer.get_whence(whence), summarizer.get_maxlength(max))
       else
 	nil
       end
     end
+
+    include MutexM
+    synchronized :search
   end

---------------------
Beyond