activedocument 0.4.1 → 0.4.2

data/lib/ActiveDocument/finder.rb

@@ -52,11 +52,23 @@ module ActiveDocument
     end
 
     def self.search(search_string, start = 1, page_length = 10, options = nil)
-      if start.nil? : start = 1 end
-      if page_length.nil? : page_length = 10 end
+      start ||= 1
+      page_length ||= 10
       search_text = @@xquery_builder.search(search_string, start, page_length, options)
       SearchResults.new(@@ml_http.send_xquery(search_text)) # todo support options node
     end
+
+    # returns a hash where the key is the terms of the co-occurrence separated by a | and the value is the frequency count
+    def self.co_occurrence(element1, element1_namespace, element2, element2_namespace, query)
+      pairs = @@ml_http.send_xquery(@@xquery_builder.co_occurrence(element1, element1_namespace, element2, element2_namespace, query)).split("*")
+      pair_hash = Hash.new
+      pairs.each do |p|
+        temp = p.split("|")
+        pair_hash[temp[0] + '|' + temp[1]] = temp[2]
+      end
+      return pair_hash
+    end
+
     private
 
     def self.configure_logger(config)

data/lib/ActiveDocument/mark_logic_query_builder.rb

@@ -87,5 +87,18 @@ CONSTRAINT
       GENERATED
     end
 
+    def co_occurrence(element1, element1_namespace, element2, element2_namespace, query)
+      <<-GENERATED
+declare namespace one = "#{element1_namespace}";
+declare namespace two = "#{element2_namespace}";
+import module namespace search = "http://marklogic.com/appservices/search"at "/MarkLogic/appservices/search/search.xqy";
+let $pairs := cts:element-value-co-occurrences(xs:QName('one:#{element1}'), xs:QName('two:#{element2}'), ('frequency-order', 'fragment-frequency','ordered'), cts:query(search:parse('#{query}')))
+return
+for $pair in $pairs
+return
+  ($pair/cts:value[1]/text(),"|",$pair/cts:value[2]/text(),"|",cts:frequency($pair),"*")
+      GENERATED
+    end
+
   end # end class
 end # end module

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Clark D. Richey, Jr.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -04:00
+date: 2010-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency