*** empty log message ***

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1054 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 16a9da0..7d13746 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -244,6 +244,8 @@ module AP_MODULE_DECLARE_DATA chxj_module;
 #define DBG1(X,Y,Za)  ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,(X),(Y),(Za))
 #define DBG2(X,Y,Za,Zb)  ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,(X),(Y),(Za),(Zb))
 #define DBG3(X,Y,Za,Zb,Zc)  ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,(X),(Y),(Za),(Zb),(Zc))
+#define DBG4(X,Y,Za,Zb,Zc,Zd)  ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,(X),(Y),(Za),(Zb),(Zc),(Zd))
+#define DBG5(X,Y,Za,Zb,Zc,Zd,Ze)  ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,(X),(Y),(Za),(Zb),(Zc),(Zd),(Ze))
 #define ERR(X,Y)  ap_log_rerror(APLOG_MARK,APLOG_ERR,0,(X),(Y))
 #define ERR1(X,Y,Za)  ap_log_rerror(APLOG_MARK,APLOG_ERR,0,(X),(Y),(Za))
 

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index 9584b65..5201db7 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 #include "mod_chxj.h"
+#include "chxj_encoding.h"
 #include "chxj_xhtml_mobile_1_0.h"
 #include "chxj_hdml.h"
 #include "chxj_dump.h"
@@ -1197,12 +1198,27 @@ s_xhtml_1_0_start_a_tag(xhtml_t* xhtml, Node* node)
     }
     else
     if ((*name == 'h' || *name == 'H') && strcasecmp(name, "href") == 0) {
+#if 0
+      apr_size_t ilen;
+      char* dbuf;
+      ap_unescape_url(value);
+      ilen = strlen(value); 
+      dbuf = chxj_encoding(r, (const char*)value, (apr_size_t*)&ilen);
+      dbuf = ap_escape_uri(r->pool,dbuf);
+      xhtml->out = apr_pstrcat(r->pool, 
+                      xhtml->out, 
+                      " href=\"", 
+                      dbuf, 
+                      "\"", 
+                      NULL);
+#else
       xhtml->out = apr_pstrcat(r->pool, 
                       xhtml->out, 
                       " href=\"", 
                       value, 
                       "\"", 
                       NULL);
+#endif
     }
     else
     if ((*name == 'a' || *name == 'A') && strcasecmp(name, "accesskey") == 0) {

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 5f38694..d872d03 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -33,6 +33,7 @@
 #include "apr_pools.h"
 
 #include "mod_chxj.h"
+#include "chxj_encoding.h"
 #include "qs_ignore_sp.h"
 #include "qs_log.h"
 #include "qs_malloc.h"

diff --git a/src/qs_parse_string.c b/src/qs_parse_string.c
index 631c2cc..99b6f2f 100644 (file)
--- a/src/qs_parse_string.c
+++ b/src/qs_parse_string.c
@@ -244,14 +244,12 @@ qs_dump_node(Doc* doc, Node* node, int indent)
   for (;p;p = (Node*)qs_get_next_node(doc,p)) {
     Attr* attr;
     if ((char*)qs_get_node_value(doc,p) != NULL) {
-      ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0, doc->r,
-        "%*.*sNode:[%s][%s]\n", indent,indent," ",
+      DBG5(doc->r,"%*.*sNode:[%s][%s]\n", indent,indent," ",
                       (char*)qs_get_node_name(doc,p),
                       (char*)qs_get_node_value(doc,p));
     }
     else {
-      ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0, doc->r,
-        "%*.*sNode:[%s]\n", indent,indent," ", qs_get_node_name(doc,p));
+      DBG4(doc->r,"%*.*sNode:[%s]\n", indent,indent," ", qs_get_node_name(doc,p));
     }
     for (attr = (Attr*)qs_get_attr(doc,p); attr; attr = (Attr*)qs_get_next_attr(doc,attr)) {
       ap_log_rerror(APLOG_MARK, APLOG_DEBUG,0, doc->r,