* Changed Mode=WP action for iPhone/Android.

[modchxj/mod_chxj.git] / src / chxj_chtml20.c

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index 6cd86b2..e960706 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -984,7 +984,7 @@ s_chtml20_end_head_tag(void *pdoc, Node *UNUSED(child))
  * @return The conversion result is returned.
  */
 static char *
-s_chtml20_start_title_tag(void *pdoc, Node *UNUSED(node)) 
+s_chtml20_start_title_tag(void *pdoc, Node *node) 
 {
   chtml20_t   *chtml20;
   Doc         *doc;
@@ -996,6 +996,17 @@ s_chtml20_start_title_tag(void *pdoc, Node *UNUSED(node))
 
   W_L("<title>");
 
+  if (chtml20->conf->use_google_analytics) {
+    chtml20->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);
+      chtml20->pagetitle = apr_pstrcat(doc->r->pool, chtml20->pagetitle, textval, NULL);
+    }
+  }
+
   return chtml20->out;
 }
 
@@ -1260,7 +1271,7 @@ s_chtml20_end_body_tag(void *pdoc, Node *UNUSED(child))
   r       = doc->r;
 
   if (chtml20->conf->use_google_analytics) {
-    char *src = chxj_google_analytics_get_image_url(r);
+    char *src = chxj_google_analytics_get_image_url(r, chtml20->pagetitle);
     W_L("<img src=\"");
     W_V(src);
     W_L("\" />");
@@ -2673,7 +2684,7 @@ s_chtml20_start_img_tag(void *pdoc, Node *node)
 #ifdef IMG_NOT_CONVERT_FILENAME
         value = chxj_encoding_parameter(r, value, 0);
         value = chxj_add_cookie_parameter(r, value, chtml20->cookie);
-        value = chxj_add_cookie_no_update_parameter(r, value);
+        value = chxj_add_cookie_no_update_parameter(r, value, 0);
         value = chxj_img_rewrite_parameter(r,chtml20->conf,value);
         attr_src = value;
 #else