+ +

diff --git a/libyelp/yelp-document.c b/libyelp/yelp-document.c index 346c411d..cfac7291 100644 --- a/libyelp/yelp-document.c +++ b/libyelp/yelp-document.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "yelp-debug.h" #include "yelp-document.h" @@ -37,6 +38,9 @@ #include "yelp-settings.h" #include "yelp-simple-document.h" #include "yelp-storage.h" +#include "yelp-transform.h" + +#define LINKS_STYLESHEET DATADIR"/yelp/xslt/links2html.xsl" enum { PROP_0, @@ -822,18 +826,116 @@ yelp_document_set_page_icon (YelpDocument *document, g_mutex_unlock (&document->priv->mutex); } + +static void +search_transform_chunk_ready (YelpTransform *transform, + gchar *chunk_id, + YelpDocument *document) +{ + gchar *content; + content = yelp_transform_take_chunk (transform, chunk_id); + yelp_document_give_contents (document, + chunk_id, + content, + "application/xhtml+xml"); + yelp_document_signal (document, + chunk_id, + YELP_DOCUMENT_SIGNAL_CONTENTS, + NULL); +} + + +static void +search_transform_finished (YelpTransform *transform, + YelpDocument *document) +{ + xmlFreeDoc (yelp_transform_get_xmldoc (transform)); + g_object_unref (transform); +} + + static gboolean document_indexed (YelpDocument *document) { g_mutex_lock (&document->priv->mutex); + while (document->priv->reqs_search != NULL) { + xmlDocPtr resultsdoc; + xmlNodePtr rootnode; + gchar *term, *text; + GVariant *value; + GVariantIter *iter; + YelpTransform *transform; + gchar **params = NULL; Request *request = (Request *) document->priv->reqs_search->data; - request->idle_funcs++; - g_idle_add ((GSourceFunc) request_idle_info, request); - g_idle_add ((GSourceFunc) request_idle_contents, request); + + resultsdoc = xmlNewDoc (BAD_CAST "1.0"); + rootnode = xmlNewDocNode (resultsdoc, NULL, BAD_CAST "links", NULL); + xmlDocSetRootElement (resultsdoc, rootnode); + xmlSetProp (rootnode, BAD_CAST "id", BAD_CAST request->page_id); + + xmlSetProp (rootnode, BAD_CAST "docref", BAD_CAST request->page_id); + + text = yelp_storage_get_root_title (yelp_storage_get_default (), + document->priv->doc_uri); + if (text) { + xmlSetProp (rootnode, BAD_CAST "docref", BAD_CAST "xref:"); + xmlSetProp (rootnode, BAD_CAST "doctitle", BAD_CAST text); + g_free (text); + } + + term = g_uri_unescape_string (request->page_id + 7, ""); + text = g_strdup_printf (_("Search results for “%s”"), term); + xmlNewTextChild (rootnode, NULL, BAD_CAST "title", BAD_CAST text); + g_free (text); + + value = yelp_storage_search (yelp_storage_get_default (), + document->priv->doc_uri, + term); + iter = g_variant_iter_new (value); + if (g_variant_iter_n_children (iter) == 0) { + xmlNewTextChild (rootnode, NULL, BAD_CAST "p", + BAD_CAST _("No matching help pages found.")); + } + else { + gchar *url, *title, *desc, *icon; /* do not free */ + while (g_variant_iter_loop (iter, "(&s&s&s&s)", &url, &title, &desc, &icon)) { + xmlNodePtr linknode; + gchar *xref_uri = NULL; + + if (g_str_has_prefix (url, document->priv->doc_uri)) { + gchar *urloffset = url + strlen(document->priv->doc_uri) + 1; /* do not free */ + if (urloffset[0] == '?') + urloffset += 1; /* handle oddity of old ghelp URIs */ + xref_uri = g_strdup_printf ("xref:%s", urloffset); + } + linknode = xmlNewChild (rootnode, NULL, BAD_CAST "link", NULL); + xmlSetProp (linknode, BAD_CAST "href", BAD_CAST xref_uri); + xmlNewTextChild (linknode, NULL, BAD_CAST "title", BAD_CAST title); + xmlNewTextChild (linknode, NULL, BAD_CAST "desc", BAD_CAST desc); + g_free (xref_uri); + } + } + g_variant_iter_free (iter); + g_variant_unref (value); + g_free (term); + + params = yelp_settings_get_all_params (yelp_settings_get_default (), 0, NULL); + transform = yelp_transform_new (LINKS_STYLESHEET); + g_signal_connect (transform, "chunk-ready", + (GCallback) search_transform_chunk_ready, + document); + g_signal_connect (transform, "finished", + (GCallback) search_transform_finished, + document); + yelp_transform_start (transform, resultsdoc, NULL, + (const gchar * const *) params); + g_strfreev (params); + document->priv->reqs_search = g_slist_delete_link (document->priv->reqs_search, document->priv->reqs_search); } + g_mutex_unlock (&document->priv->mutex); return FALSE; @@ -852,7 +954,13 @@ yelp_document_request_page (YelpDocument *document, g_return_val_if_fail (YELP_IS_DOCUMENT (document), FALSE); g_return_val_if_fail (YELP_DOCUMENT_GET_CLASS (document)->request_page != NULL, FALSE); - debug_print (DB_FUNCTION, "entering\n"); + if (page_id && g_str_has_prefix (page_id, "search=")) + return document_request_page (document, + page_id, + cancellable, + callback, + user_data, + notify); return YELP_DOCUMENT_GET_CLASS (document)->request_page (document, page_id, @@ -905,8 +1013,6 @@ document_request_page (YelpDocument *document, g_idle_add ((GSourceFunc) document_indexed, document); else yelp_document_index (document); - g_mutex_unlock (&document->priv->mutex); - return TRUE; } hash_slist_insert (document->priv->reqs_by_page_id, @@ -914,7 +1020,11 @@ document_request_page (YelpDocument *document, request); document->priv->reqs_all = g_slist_prepend (document->priv->reqs_all, request); - document->priv->reqs_pending = g_slist_prepend (document->priv->reqs_pending, request); + if (page_id && g_str_has_prefix (page_id, "search=")) { + } + else { + document->priv->reqs_pending = g_slist_prepend (document->priv->reqs_pending, request); + } if (hash_lookup (document->priv->titles, request->page_id)) { request->idle_funcs++; @@ -976,6 +1086,9 @@ yelp_document_read_contents (YelpDocument *document, g_return_val_if_fail (YELP_IS_DOCUMENT (document), NULL); g_return_val_if_fail (YELP_DOCUMENT_GET_CLASS (document)->read_contents != NULL, NULL); + if (page_id != NULL && g_str_has_prefix (page_id, "search=")) + return document_read_contents (document, page_id); + return YELP_DOCUMENT_GET_CLASS (document)->read_contents (document, page_id); } @@ -983,143 +1096,14 @@ static const gchar * document_read_contents (YelpDocument *document, const gchar *page_id) { - gchar *real, *str, **colors; + gchar *real, *str; /* do not free real */ g_mutex_lock (&document->priv->mutex); - real = hash_lookup (document->priv->page_ids, page_id); - - if (page_id != NULL && g_str_has_prefix (page_id, "search=")) { - gchar *tmp, *tmp2, *txt; - GVariant *value; - GVariantIter *iter; - gchar *url, *title, *desc, *icon; /* do not free */ - gchar *index_title; - GString *ret = g_string_new ("

"); - g_strfreev (colors); - - str = hash_lookup (document->priv->contents, real); - if (str) { - str_ref (str); - g_mutex_unlock (&document->priv->mutex); - return (const gchar *) str; - } - - txt = g_uri_unescape_string (page_id + 7, NULL); - tmp2 = g_strdup_printf (_("Search results for “%s”"), txt); - tmp = g_markup_printf_escaped ("

%s

", tmp2); - g_string_append (ret, tmp); - g_free (tmp2); - g_free (tmp); - - value = yelp_storage_search (yelp_storage_get_default (), - document->priv->doc_uri, - txt); - iter = g_variant_iter_new (value); - if (g_variant_iter_n_children (iter) == 0) { - if (index_title != NULL) { - gchar *t = g_strdup_printf (_("No matching help pages found in “%s”."), index_title); - tmp = g_markup_printf_escaped ("

", t); - g_free (t); - } - else { - tmp = g_markup_printf_escaped ("

", - _("No matching help pages found.")); - } - g_string_append (ret, tmp); - g_free (tmp); - } - else { - while (g_variant_iter_loop (iter, "(&s&s&s&s)", &url, &title, &desc, &icon)) { - gchar *xref_uri = NULL; - - if (g_str_has_prefix (url, document->priv->doc_uri)) { - gchar *urloffset = url + strlen(document->priv->doc_uri) + 1; /* do not free */ - if (urloffset[0] == '?') - urloffset += 1; /* handle oddity of old ghelp URIs */ - xref_uri = g_strdup_printf ("xref:%s", urloffset); - } - - tmp = g_markup_printf_escaped ("

" - "

", - xref_uri && xref_uri[0] != '\0' ? xref_uri : url, - title, desc); - g_string_append (ret, tmp); - g_free (xref_uri); - g_free (tmp); - } - } - g_variant_iter_free (iter); - g_variant_unref (value); - - if (index_title != NULL) - g_free (index_title); - g_free (txt); - g_string_append (ret, "

"); - - hash_replace (document->priv->contents, page_id, g_string_free (ret, FALSE)); - str = hash_lookup (document->priv->contents, page_id); - str_ref (str); - g_mutex_unlock (&document->priv->mutex); - return (const gchar *) str; - } + if (page_id != NULL && g_str_has_prefix (page_id, "search=")) + real = (gchar *) page_id; + else + real = hash_lookup (document->priv->page_ids, page_id); str = hash_lookup (document->priv->contents, real); if (str) @@ -1155,9 +1139,6 @@ yelp_document_give_contents (YelpDocument *document, { g_return_if_fail (YELP_IS_DOCUMENT (document)); - debug_print (DB_FUNCTION, "entering\n"); - debug_print (DB_ARG, " page_id = \"%s\"\n", page_id); - g_mutex_lock (&document->priv->mutex); hash_replace (document->priv->contents, @@ -1185,13 +1166,13 @@ static gchar * document_get_mime_type (YelpDocument *document, const gchar *page_id) { - gchar *real, *ret = NULL; - - if (page_id != NULL && g_str_has_prefix (page_id, "search=")) - return g_strdup ("application/xhtml+xml"); + gchar *real, *ret = NULL; /* do not free real */ g_mutex_lock (&document->priv->mutex); - real = hash_lookup (document->priv->page_ids, page_id); + if (page_id != NULL && g_str_has_prefix (page_id, "search=")) + real = (gchar *) page_id; + else + real = hash_lookup (document->priv->page_ids, page_id); if (real) { ret = hash_lookup (document->priv->mime_types, real); if (ret) diff --git a/libyelp/yelp-transform.c b/libyelp/yelp-transform.c index 0107db9a..e74eb463 100644 --- a/libyelp/yelp-transform.c +++ b/libyelp/yelp-transform.c @@ -273,6 +273,14 @@ yelp_transform_set_property (GObject *object, } } + +xmlDocPtr +yelp_transform_get_xmldoc (YelpTransform *transform) +{ + YelpTransformPrivate *priv = yelp_transform_get_instance_private (transform); + return priv->input; +} + /******************************************************************************/ YelpTransform * diff --git a/libyelp/yelp-transform.h b/libyelp/yelp-transform.h index 8e71b59d..c62b5aad 100644 --- a/libyelp/yelp-transform.h +++ b/libyelp/yelp-transform.h @@ -53,4 +53,6 @@ gchar * yelp_transform_take_chunk (YelpTransform *transform, void yelp_transform_cancel (YelpTransform *transform); GError * yelp_transform_get_error (YelpTransform *transform); +xmlDocPtr yelp_transform_get_xmldoc (YelpTransform *transform); + #endif /* __YELP_TRANSFORM_H__ */ diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c index 1f10000c..9b2e5fb2 100644 --- a/libyelp/yelp-view.c +++ b/libyelp/yelp-view.c @@ -780,17 +780,19 @@ document_callback (YelpDocument *document, contents = yelp_document_read_contents (document, data->page_id); - content_length = strlen (contents); - - stream = g_memory_input_stream_new_from_data (g_strdup (contents), content_length, g_free); - yelp_document_finish_read (document, contents); - - webkit_uri_scheme_request_finish (data->request, - stream, - content_length, - mime_type); - g_free (mime_type); - g_object_unref (stream); + if (contents) { + content_length = strlen (contents); + + stream = g_memory_input_stream_new_from_data (g_strdup (contents), content_length, g_free); + yelp_document_finish_read (document, contents); + + webkit_uri_scheme_request_finish (data->request, + stream, + content_length, + mime_type); + g_free (mime_type); + g_object_unref (stream); + } } static void -- cgit v1.2.1