yelp r3134 - in trunk: . src

[dscorgie svn gnome org]

Author: dscorgie
Date: Sun May 25 09:22:59 2008
New Revision: 3134
URL: http://svn.gnome.org/viewvc/yelp?rev=3134&view=rev

Log:
* 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


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/yelp-search-parser.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun May 25 09:22:59 2008
@@ -135,7 +135,12 @@
 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],

Modified: trunk/src/yelp-search-parser.c
==============================================================================
--- trunk/src/yelp-search-parser.c	(original)
+++ trunk/src/yelp-search-parser.c	Sun May 25 09:22:59 2008
@@ -313,7 +313,8 @@
     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 @@
 
     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 @@
 
 	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 ();