lib/milkode/cdweb/lib/database.rb in milkode-0.9.5 vs lib/milkode/cdweb/lib/database.rb in milkode-0.9.6

@@ -86,24 +86,27 @@
         end
       end
 
       # 検索
       result, total_records = [], 0
-      
-      unless is_not_search
-        result, total_records = @documents.search_with_match(
-          :patterns  => patterns,
-          :keywords  => keywords,
-          :paths     => paths,
-          :packages  => packages,
-          :strict_packages  => strict_packages,
-          :restpaths => fpaths,
-          :suffixs   => suffixs,
-          :fpath_or_packages => fpath_or_packages,
-          :offset    => offset,
-          :limit     => limit
-        )
+
+      begin
+        unless is_not_search
+          result, total_records = @documents.search_with_match(
+            :patterns  => patterns,
+            :keywords  => keywords,
+            :paths     => paths,
+            :packages  => packages,
+            :strict_packages  => strict_packages,
+            :restpaths => fpaths,
+            :suffixs   => suffixs,
+            :fpath_or_packages => fpath_or_packages,
+            :offset    => offset,
+            :limit     => limit
+          )
+        end
+      rescue Groonga::TooLargeOffset
       end
 
       # 結果
       return result.map{|r| DocumentRecord.new(r)}, total_records
     end
@@ -196,11 +199,12 @@
     end
 
     def update_in(package)
       updater = Updater.new(@grndb, package.name)
       updater.set_package_ignore IgnoreSetting.new("/", package.ignore)
-      updater.enable_no_auto_ignore       if package.options[:no_auto_ignore]
-      updater.enable_update_with_git_pull if package.options[:update_with_git_pull]
+      updater.enable_no_auto_ignore         if package.options[:no_auto_ignore]
+      updater.enable_update_with_git_pull   if package.options[:update_with_git_pull]
+      updater.enable_update_with_svn_update if package.options[:update_with_svn_update]
       updater.exec
       updater.result
     end
 
   end