OSDN Git Service

(root) / dennco / dennco.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f32fdf2)
fixed xhtml parser related bugs.
authortkawata <takuji.kawata@gmail.com>
Tue, 10 Jan 2012 15:21:03 +0000 (00:21 +0900)
committertkawata <takuji.kawata@gmail.com>
Tue, 10 Jan 2012 15:21:03 +0000 (00:21 +0900)
Samples/HTML/Sample1.html patch | blob | history
Source/DNContainerBuilder.cpp patch | blob | history
Source/platform/osx/OSXDNXMLImpl.mm patch | blob | history

diff --git a/Samples/HTML/Sample1.html b/Samples/HTML/Sample1.html
index d3f50b4..9ceb55b 100644 (file)
--- a/Samples/HTML/Sample1.html
+++ b/Samples/HTML/Sample1.html
@@ -1,4 +1,5 @@
 <html>
+    <head>
     <title>Denco</title>
     <style type="text/css">
         <!--
diff --git a/Source/DNContainerBuilder.cpp b/Source/DNContainerBuilder.cpp
index 7d3f77b..94cfd8e 100644 (file)
--- a/Source/DNContainerBuilder.cpp
+++ b/Source/DNContainerBuilder.cpp
@@ -26,6 +26,7 @@
 #include "DNXMLElement.h"
 #include "TKLog.h"
 #include "DNUtils.h"
+#include "TKDebug.h"
 
 #include "DNContainerBuilder.h"
 
@@ -69,10 +70,10 @@ void DNContainerBuilder::parseXHTML(const char *fpath)
     
     DNXMLElement *classElement = NULL;
     DNXMLElement *classScriptElement = NULL;
+    DNXMLElement *classAPIElement = NULL;
     std::string  className;
 
     DNXMLElement *cellElement = NULL;
-    DNXMLElement *cellAPIElement = NULL;
     DNXMLElement *cellScriptElement = NULL;
     std::string  cellName;
     std::string  cellCodeClassName;
@@ -194,11 +195,11 @@ void DNContainerBuilder::parseXHTML(const char *fpath)
             while(te)
             {
                 std::string teclass = te->getAttributeValue("class");
-                if (teclass == "dennco-cell")
+                if (teclass == "dennco-classdef")
                 {
-                    if (cellElement && cellElement == te)
+                    if (classElement && classElement == te)
                     {
-                        cellAPIElement = element;
+                        classAPIElement = element;
                     }
                     else
                     {
@@ -226,38 +227,36 @@ void DNContainerBuilder::parseXHTML(const char *fpath)
         {
             // go next 
             do {
-            
+                if (!element->next)
+                {
+                    element = element->outer;
+                }
+
                 // the processed element was cell code class definition.
                 // define it now.
-                if (classElement && element->depth == classElement->depth)
+                if (classElement && (element == NULL || element->depth <= classElement->depth))
                 {
-                    TKLog::printf("TODO define code class here..class:%s", className.c_str());
+                    DEBUG_TRACE("\n===== Define cell code class ===== \nClass:%s\nAPI:%s\n%s\n==================================\n\n", className.c_str(), classAPIElement->text.c_str(), classScriptElement->text.c_str());
                     //scriptless classdef
                     classElement = NULL;
                     classScriptElement = NULL;
+                    classAPIElement = NULL;
                     className = "";
                 }
             
                 // the processed element was cell definition.
                 // define it now.
-                if (cellElement && element->depth == cellElement->depth)
+                if (cellElement && (element == NULL || element->depth <= cellElement->depth))
                 {
-                    TKLog::printf("TODO define cell here..cellName:%s", cellName.c_str());
+                    DEBUG_TRACE("\n===== Define cell ===== \nName:%s\nClass:%s\nStartup script:\n%s\n=======================\n\n", cellName.c_str(), cellCodeClassName.c_str(),cellScriptElement->text.c_str());
                     //scriptless celldef
                     cellElement = NULL;
-                    cellAPIElement = NULL;
                     cellScriptElement = NULL;
                     cellName = "";
                     cellCodeClassName = "";
                 }
                 
-                if (!element->next)
-                {
-                    element = element->outer;
-                }
-                if (!element)
-                    break;
-            } while(!element->next && element != xml->getRoot());
+            } while(element && !element->next && element != xml->getRoot());
             
             if (!element)
                 break;
diff --git a/Source/platform/osx/OSXDNXMLImpl.mm b/Source/platform/osx/OSXDNXMLImpl.mm
index cb8fffa..38e84c3 100644 (file)
--- a/Source/platform/osx/OSXDNXMLImpl.mm
+++ b/Source/platform/osx/OSXDNXMLImpl.mm
@@ -95,6 +95,7 @@ DNXMLElement* OSXDNXMLImpl::getRoot()
                 cname = "";
             }
             DNXMLElement *dnelement = new DNXMLElement(cname);
+            dnelement->depth = depth;
             NSXMLElement *aElement = (NSXMLElement*) aNode;
             for( NSXMLNode *attribute in [aElement attributes] ) {
                 const char *name = [[attribute name] UTF8String];
@@ -146,7 +147,6 @@ DNXMLElement* OSXDNXMLImpl::getRoot()
         }
         else if ( [aNode kind] == NSXMLTextKind )
         {
-            NSLog(@"body:%@", [aNode stringValue]);
             NSXMLNode *parent = [aNode parent];
             if (parent)
             {
About OSDN
Find Software
Develop Software
Help