OSDN Git Service

(root) / modchxj / mod_chxj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 145d843)
* Added test code of the <div> tag 2 for au XHTML converter.
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sun, 13 Apr 2008 10:15:28 +0000 (10:15 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sun, 13 Apr 2008 10:15:28 +0000 (10:15 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2199 1a406e8e-add9-4483-a2c8-d8cac5b7c224

src/chxj_xhtml_mobile_1_0.c patch | blob | history
test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c patch | blob | history

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index ee77739..b936003 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -2174,8 +2174,12 @@ s_xhtml_1_0_start_div_tag(void *pdoc, Node *child)
     char *nm  = qs_get_attr_name(doc,attr);
     char *val = qs_get_attr_value(doc,attr);
     if (STRCASEEQ('a','A',"align",nm)) {
-      /* CHTML version 3.2 */
-      align = apr_pstrdup(doc->buf.pool, val);
+      /*=====================================================================*/
+      /* CHTML version 3.2                                                   */
+      /*=====================================================================*/
+      if (val && (STRCASEEQ('l','L',"left",val) || STRCASEEQ('r','R',"right",val) || STRCASEEQ('c','C',"center",val))) {
+        align = apr_pstrdup(doc->buf.pool, val);
+      }
     }
   }
   if (align) {
diff --git a/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c b/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c
index 3ee5ed0..0454aed 100644 (file)
--- a/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c
+++ b/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c
@@ -521,8 +521,8 @@ main()
   CU_add_test(xhtml_suite, "test <dd> with void value.",                        test_xhtml_dd_tag_002);
 
   CU_add_test(xhtml_suite, "test <div>.",                                       test_xhtml_div_tag_001);
-#if 0
   CU_add_test(xhtml_suite, "test <div> with align attribute(left).",            test_xhtml_div_tag_002);
+#if 0
   CU_add_test(xhtml_suite, "test <div> with align attribute(right).",           test_xhtml_div_tag_003);
   CU_add_test(xhtml_suite, "test <div> with align attribute(center).",          test_xhtml_div_tag_004);
   CU_add_test(xhtml_suite, "test <div> with align attribute(void).",            test_xhtml_div_tag_005);
@@ -2594,11 +2594,10 @@ void test_xhtml_div_tag_001()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
-/* KONNO */
 void test_xhtml_div_tag_002() 
 {
-#define  TEST_STRING "<html><head></head><body><div align=\"left\"></div></body></html>"
-#define  RESULT_STRING "<html><head></head><body><div align=\"left\"></div></body></html>"
+#define  TEST_STRING "<div align=\"left\"></div>"
+#define  RESULT_STRING "<div align=\"left\"></div>\r\n"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -2615,6 +2614,7 @@ void test_xhtml_div_tag_002()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
   ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "ret=[%s]",ret);
   CU_ASSERT(ret != NULL);
   CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
   CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
@@ -2623,6 +2623,7 @@ void test_xhtml_div_tag_002()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+/* KONNO */
 void test_xhtml_div_tag_003() 
 {
 #define  TEST_STRING "<html><head></head><body><div align=\"right\"></div></body></html>"
mod_chxj
About OSDN
Find Software
Develop Software
Help