Add support for newer releases of Beagle bug #511244 - patch from Arun

* configure.in:
* src/yelp-search-parser.c (check_finished), (snippet_response),
(search_parser_process_idle):
Add support for newer releases of Beagle
bug #511244 - patch from Arun Raghavan

svn path=/trunk/; revision=3134

3 files changed, 18 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 16cf0b80..57e64c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-25  Don Scorgie  <dscorgie@svn.gnome.org>
+
+	* configure.in:
+	* src/yelp-search-parser.c (check_finished), (snippet_response),
+	(search_parser_process_idle):
+	Add support for newer releases of Beagle
+	bug #511244 - patch from Arun Raghavan
+
 2008-05-23  Don Scorgie  <dscorgie@svn.gnome.org>
 
 	* src/yelp-search-parser.c (search_clean_snippet):
diff --git a/configure.in b/configure.in
index cd154155..2a2ab806 100644
--- a/configure.in
+++ b/configure.in
@@ -135,7 +135,12 @@ dnl ******
 dnl beagle
 dnl ******
 
-BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4"
+BEAGLE_MODULES=
+if $PKG_CONFIG --exists libbeagle-1.0; then
+	BEAGLE_MODULES="libbeagle-1.0 >= 0.3.0"
+else
+	BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4"
+fi
 
 AC_ARG_WITH([search],
 	[AC_HELP_STRING([--with-search=basic|beagle|auto],
diff --git a/src/yelp-search-parser.c b/src/yelp-search-parser.c
index ea073a1b..06938cc0 100644
--- a/src/yelp-search-parser.c
+++ b/src/yelp-search-parser.c
@@ -313,7 +313,8 @@ check_finished (YelpSearchParser *parser)
     g_free (check);
     xmlNewTextChild (parser->root, NULL, BAD_CAST "online1", BAD_CAST split[1]);
 
-    parser->finished = TRUE;
+    if (parser->snippet_request_count == 0)
+      parser->finished = TRUE;
 
 }
 
@@ -366,7 +367,7 @@ snippet_response (BeagleSnippetRequest *request, BeagleSnippetResponse *response
 
     const char *xml = beagle_snippet_response_get_snippet (response);
 
-    if (xml == NULL) {
+    if (xml == NULL || strlen (xml) == 0) {
 	debug_print (DB_DEBUG, "snippet_response empty\n");
 	return;
     }
@@ -561,7 +562,7 @@ search_parser_process_idle (YelpSearchParser *parser)
 
 	beagle_query_set_max_hits (query, 10000);
 	beagle_query_add_text (query, parser->search_terms);
-	beagle_query_add_source (query, "documentation");
+	beagle_query_add_text (query, "source:documentation OR source:manpages");
 
 	parser->hits = g_ptr_array_new ();