X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fchxj_android.c;h=57def6ca1559fa08975be0dc673ddb82618da022;hb=651a102146748117ea4d9b271e8eaf65299fa5c8;hp=ec2580613adfb6889ad1af876e22d877517af0b8;hpb=a8e953da7b20fe91b4069428f79d822f851904e6;p=modchxj%2Fmod_chxj.git
diff --git a/src/chxj_android.c b/src/chxj_android.c
index ec258061..57def6ca 100644
--- a/src/chxj_android.c
+++ b/src/chxj_android.c
@@ -1418,7 +1418,7 @@ s_android_end_head_tag(void *pdoc, Node *UNUSED(child))
* @return The conversion result is returned.
*/
static char *
-s_android_start_title_tag(void *pdoc, Node *UNUSED(node))
+s_android_start_title_tag(void *pdoc, Node *node)
{
android_t *android;
Doc *doc;
@@ -1429,6 +1429,17 @@ s_android_start_title_tag(void *pdoc, Node *UNUSED(node))
r = doc->r;
W_L("
");
+ if (android->conf->use_google_analytics) {
+ android->pagetitle = "";
+ Node *child;
+ for (child = qs_get_child_node(doc,node);
+ child;
+ child = qs_get_next_node(doc,child)) {
+ char *textval = qs_get_node_value(doc,child);
+ android->pagetitle = apr_pstrcat(doc->r->pool, android->pagetitle, textval, NULL);
+ }
+ }
+
return android->out;
}
@@ -1715,7 +1726,7 @@ s_android_end_body_tag(void *pdoc, Node *UNUSED(child))
r = doc->r;
if (android->conf->use_google_analytics) {
- char *src = chxj_google_analytics_get_image_url(r);
+ char *src = chxj_google_analytics_get_image_url(r, android->pagetitle);
W_L("");
@@ -4032,14 +4043,14 @@ s_android_start_img_tag(void *pdoc, Node *node)
#ifdef IMG_NOT_CONVERT_FILENAME
value = chxj_encoding_parameter(r, value, 1);
value = chxj_jreserved_tag_to_safe_for_query_string(r, value, android->entryp, 1);
- value = chxj_add_cookie_no_update_parameter(r, value);
+ value = chxj_add_cookie_no_update_parameter(r, value, 1);
value = chxj_img_rewrite_parameter(r,android->conf,value);
attr_src = value;
#else
value = chxj_img_conv(r, spec, value);
value = chxj_encoding_parameter(r, value, 1);
value = chxj_jreserved_tag_to_safe_for_query_string(r, value, android->entryp, 1);
- value = chxj_add_cookie_no_update_parameter(r, value);
+ value = chxj_add_cookie_no_update_parameter(r, value, 1);
value = chxj_img_rewrite_parameter(r,android->conf,value);
attr_src = value;
#endif