Skip to content

Commit

Permalink
The stream_handler hook needs to return a file size. Not all files
Browse files Browse the repository at this point in the history 
opened by this function are ASCII text.  Reset the base_location
properly when switching documents. Add debugging. #101783


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7721 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
David Hampton committed Dec 24, 2002
1 parent 6af4501 commit 3d406ca
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 13 deletions.
10 changes: 10 additions & 0 deletions ChangeLog
View file
@@ -1,5 +1,15 @@
2002-12-23 David Hampton <hampton@employees.org>

* src/gnome-utils/gnc-html.c: The stream_handler hook needs to
return a file size. Not all files opened by this function are
ASCII text. Reset the base_location properly when switching
documents. Add debugging. #101783

* src/report/report-gnome/window-report.c: Update the various
functions used as stream_handlers to return correct file
sizes. #101783


* configure.in: When checking for gtkhtml-1.1, make the lack of
pkg-config a fatal error. Also check for pkgconfig due to some
clueless software mismanagement.
Expand Down
49 changes: 40 additions & 9 deletions src/gnome-utils/gnc-html.c
View file
Expand Up @@ -182,6 +182,8 @@ gnc_html_parse_url(gnc_html * html, const gchar * url,
int found_protocol=0, found_path=0, found_label=0;
URLType retval;

DEBUG("parsing %s, base_location %s", url,
html ? html->base_location : "<null hmtl>");
regcomp(&compiled, uri_rexp, REG_EXTENDED);

if(!regexec(&compiled, url, 6, match, 0)) {
Expand Down Expand Up @@ -285,6 +287,7 @@ extract_base_name(URLType type, const gchar * path)
char * machine=NULL, * location = NULL, * base=NULL;
char * basename=NULL;

DEBUG("");
if(!path) return NULL;

regcomp(&compiled_m, machine_rexp, REG_EXTENDED);
Expand Down Expand Up @@ -386,6 +389,7 @@ gnc_build_url (URLType type, const gchar * location, const gchar * label)
{
char * type_name;

DEBUG("");
type_name = g_hash_table_lookup (gnc_html_type_to_proto_hash, type);
if (!type_name)
type_name = "";
Expand Down Expand Up @@ -444,6 +448,7 @@ gnc_html_http_request_cb(const gchar * uri, int completed_ok,
GList * handles = NULL;
GList * current;

DEBUG("uri %s, ok %d, body %10.10s, body len %d", uri, completed_ok, body, body_len);
g_hash_table_lookup_extended(html->request_info, uri,
(gpointer *)&location,
(gpointer *)&handles);
Expand Down Expand Up @@ -530,6 +535,7 @@ gnc_html_start_request(gnc_html * html, gchar * uri, GtkHTMLStream * handle)
/* we want to make a list of handles to fill with this URI.
* multiple handles with the same URI will all get filled when the
* request comes in. */
DEBUG("requesting %s", uri);
handles = g_hash_table_lookup(html->request_info, uri);
if(!handles) {
need_request = TRUE;
Expand Down Expand Up @@ -558,7 +564,9 @@ gnc_html_load_to_stream(gnc_html * html, GtkHTMLStream * handle,
const gchar * label)
{
char * fdata = NULL;
int fdata_len = 0;

DEBUG("type %s, location %s, label %s", type, location, label);
if(!html) {
return;
}
Expand All @@ -568,11 +576,11 @@ gnc_html_load_to_stream(gnc_html * html, GtkHTMLStream * handle,

stream_handler = g_hash_table_lookup (gnc_html_stream_handlers, type);
if (stream_handler) {
gboolean ok = stream_handler (location, &fdata);
gboolean ok = stream_handler (location, &fdata, &fdata_len);

if(ok) {
fdata = fdata ? fdata : g_strdup ("");
gtk_html_write(GTK_HTML(html->html), handle, fdata, strlen (fdata));
gtk_html_write(GTK_HTML(html->html), handle, fdata, fdata_len);
gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_OK);
}
else {
Expand Down Expand Up @@ -647,6 +655,7 @@ gnc_html_link_clicked_cb(GtkHTML * html, const gchar * url, gpointer data)
char * label = NULL;
gnc_html * gnchtml = (gnc_html *)data;

DEBUG("Clicked %s", url);
type = gnc_html_parse_url(gnchtml, url, &location, &label);
gnc_html_show_url(gnchtml, type, location, label, 0);
g_free(location);
Expand All @@ -668,6 +677,7 @@ gnc_html_url_requested_cb(GtkHTML * html, char * url,
char * label=NULL;
gnc_html * gnchtml = (gnc_html *)data;

DEBUG("requesting %s", url);
type = gnc_html_parse_url(gnchtml, url, &location, &label);
gnc_html_load_to_stream(gnchtml, handle, type, location, label);
g_free(location);
Expand All @@ -687,6 +697,7 @@ gnc_html_object_requested_cb(GtkHTML * html, GtkHTMLEmbedded * eb,
gnc_html * gnchtml = data;
GncHTMLObjectCB h;

DEBUG("");
if(!eb || !(eb->classid) || !gnc_html_object_handlers) return FALSE;

h = g_hash_table_lookup(gnc_html_object_handlers, eb->classid);
Expand All @@ -708,6 +719,7 @@ gnc_html_on_url_cb(GtkHTML * html, const gchar * url, gpointer data)
{
gnc_html * gnchtml = (gnc_html *) data;

DEBUG("Rollover %s", url);
g_free(gnchtml->current_link);
gnchtml->current_link = g_strdup(url);
if(gnchtml->flyover_cb) {
Expand All @@ -729,6 +741,7 @@ gnc_html_set_base_cb(GtkHTML * gtkhtml, const gchar * base,
char * location = NULL;
char * label = NULL;

DEBUG("Setting base location to %s", base);
type = gnc_html_parse_url(html, base, &location, &label);

g_free(html->base_location);
Expand All @@ -750,6 +763,7 @@ gnc_html_button_press_cb(GtkWidget * widg, GdkEventButton * event,
{
gnc_html * html = user_data;

DEBUG("Button Press");
if(html->button_cb) {
(html->button_cb)(html, event, html->button_cb_data);
return TRUE;
Expand All @@ -768,7 +782,10 @@ gnc_html_button_press_cb(GtkWidget * widg, GdkEventButton * event,
GHashTable *
gnc_html_unpack_form_data(const char * encoding)
{
GHashTable * rv = g_hash_table_new(g_str_hash, g_str_equal);
GHashTable * rv;

DEBUG("");
rv = g_hash_table_new(g_str_hash, g_str_equal);
gnc_html_merge_form_data(rv, encoding);
return rv;
}
Expand All @@ -782,6 +799,7 @@ gnc_html_merge_form_data(GHashTable * rv, const char * encoding)
char * extr_name = NULL;
char * extr_value = NULL;

DEBUG("");
if(!encoding) {
return;
}
Expand Down Expand Up @@ -815,6 +833,7 @@ gnc_html_merge_form_data(GHashTable * rv, const char * encoding)
static gboolean
free_form_data_helper(gpointer k, gpointer v, gpointer user)
{
DEBUG("");
g_free(k);
g_free(v);
return TRUE;
Expand All @@ -823,6 +842,7 @@ free_form_data_helper(gpointer k, gpointer v, gpointer user)
void
gnc_html_free_form_data(GHashTable * d)
{
DEBUG("");
g_hash_table_foreach_remove(d, free_form_data_helper, NULL);
g_hash_table_destroy(d);
}
Expand All @@ -836,6 +856,7 @@ pack_form_data_helper(gpointer key, gpointer val,
char * enc_val = gnc_html_encode_string((char *)val);
char * new_str = NULL;

DEBUG("");
if(old_str) {
new_str = g_strconcat(old_str, "&", enc_key, "=", enc_val, NULL);
}
Expand All @@ -850,6 +871,7 @@ char *
gnc_html_pack_form_data(GHashTable * form_data)
{
char * encoded = NULL;
DEBUG("");
g_hash_table_foreach(form_data, pack_form_data_helper, &encoded);
return encoded;
}
Expand All @@ -870,10 +892,12 @@ gnc_html_submit_cb(GtkHTML * html, const gchar * method,
char * new_loc = NULL;
char * label = NULL;
char ** action_parts;
GHashTable * form_data = gnc_html_unpack_form_data(encoded_form_data);
GHashTable * form_data;
URLType type;
GncHTMLActionCB cb;

DEBUG("");
form_data = gnc_html_unpack_form_data(encoded_form_data);
type = gnc_html_parse_url(gnchtml, action, &location, &label);

if(!safe_strcmp (type, URL_TYPE_ACTION)) {
Expand Down Expand Up @@ -943,7 +967,10 @@ void
gnc_html_show_data(gnc_html * html, const char * data,
int datalen)
{
GtkHTMLStream * handle = gtk_html_begin(GTK_HTML(html->html));
GtkHTMLStream * handle;

DEBUG("datalen %d, data %20.20s", datalen, data);
handle = gtk_html_begin(GTK_HTML(html->html));
gtk_html_write(GTK_HTML(html->html), handle, data, datalen);
gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_OK);
}
Expand All @@ -966,6 +993,7 @@ gnc_html_show_url(gnc_html * html, URLType type,
GtkHTMLStream * handle;
gboolean new_window;

DEBUG("");
if (!html) return;
if (!location) return;

Expand Down Expand Up @@ -1032,7 +1060,9 @@ gnc_html_show_url(gnc_html * html, URLType type,

g_free (html->base_location);
html->base_type = result.base_type;
html->base_location = g_strdup (result.base_location);
html->base_location =
g_strdup (extract_base_name(result.base_type, new_location));
DEBUG("resetting base location to %s", html->base_location);

stream = gtk_html_begin (GTK_HTML(html->html));
gnc_html_load_to_stream (html, stream, result.url_type,
Expand Down Expand Up @@ -1119,7 +1149,10 @@ gnc_html_show_url(gnc_html * html, URLType type,
void
gnc_html_reload(gnc_html * html)
{
gnc_html_history_node * n = gnc_html_history_get_current(html->history);
gnc_html_history_node * n;

DEBUG("");
n = gnc_html_history_get_current(html->history);
if(n) {
gnc_html_show_url(html, n->type, n->location, n->label, 0);
}
Expand Down Expand Up @@ -1181,8 +1214,6 @@ gnc_html_new(void)
gtk_signal_connect (GTK_OBJECT(retval->html), "submit",
GTK_SIGNAL_FUNC(gnc_html_submit_cb), (gpointer)retval);

gtk_widget_show_all(GTK_WIDGET(retval->html));

gtk_html_load_empty(GTK_HTML(retval->html));

return retval;
Expand Down
2 changes: 1 addition & 1 deletion src/gnome-utils/gnc-html.h
View file
Expand Up @@ -85,7 +85,7 @@ typedef int (* GncHTMLObjectCB)(gnc_html * html, GtkHTMLEmbedded * eb,
gpointer data);
typedef int (* GncHTMLActionCB)(gnc_html * html, const char * method,
const char * action, GHashTable * form_data);
typedef gboolean (* GncHTMLStreamCB)(const char *location, char **data);
typedef gboolean (* GncHTMLStreamCB)(const char *location, char **data, int *datalen);
typedef gboolean (* GncHTMLUrlCB)(const char *location, const char *label,
gboolean new_window, GNCURLResult * result);

Expand Down
8 changes: 5 additions & 3 deletions src/report/report-gnome/window-report.c
View file
Expand Up @@ -1115,13 +1115,14 @@ gnc_report_raise_editor(SCM report)
}

static gboolean
gnc_html_file_stream_cb (const char *location, char ** data)
gnc_html_file_stream_cb (const char *location, char ** data, int *len)
{
return (gncReadFile (location, data) > 0);
*len = gncReadFile (location, data);
return (*len > 0);
}

static gboolean
gnc_html_report_stream_cb (const char *location, char ** data)
gnc_html_report_stream_cb (const char *location, char ** data, int *len)
{
gboolean ok;

Expand All @@ -1133,6 +1134,7 @@ gnc_html_report_stream_cb (const char *location, char ** data)
_("Report error"),
_("An error occurred while running the report."));

*len = strlen(*data);
return ok;
}

Expand Down

0 comments on commit 3d406ca

Please sign in to comment.