[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/kxsldbg/kxsldbgpart/libxsldbg
From:       Keith Isdale <k_isdale () tpg ! com ! au>
Date:       2008-03-30 1:20:54
Message-ID: 1206840054.316476.29342.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 791619 by isdale:

Entities in XML document are not listed and unable to set breakpoints on
nodes in extenal Entites (both xsldbg and kxsldbg)

Will be integrated to the trunk branch of kxsldbg at a later date

BUG:160085


 M  +9 -12     xsldbg.cpp  


--- branches/KDE/3.5/kdewebdev/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp \
#791618:791619 @@ -909,11 +909,7 @@
 
     if (optionsGetIntOption(OPTIONS_TIMING))
         startTimer();
-#if LIBXML_VERSION >= 2006000
-    style = xmlSAXParseFile(&mySAXhdlr, (const char *) \
                optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME), 0);
-#else
     style = xmlParseFile((const char *) \
                optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME));
-#endif
     if (optionsGetIntOption(OPTIONS_TIMING))
         endTimer(i18n("Parsing stylesheet %1").arg((const \
char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));  if (style == NULL) {
@@ -961,8 +957,13 @@
 xsldbgLoadXmlData(void)
 {
     xmlDocPtr doc = NULL;
+    xmlSAXHandler mySAXHandler;
     doc = NULL;
 
+    xmlSAXVersion(&mySAXHandler,2);
+    oldGetEntity = mySAXHandler.getEntity;
+    mySAXHandler.getEntity = xsldbgGetEntity;
+
     if (optionsGetIntOption(OPTIONS_TIMING))
         startTimer();
 #ifdef LIBXML_HTML_ENABLED
@@ -979,8 +980,9 @@
                             NULL);
     else
 #endif
-#if LIBXML_VERSION >= 2006000
-        doc = xmlSAXParseFile(&xmlDefaultSAXHandler,
+
+#if LIBXML_VERSION >= 20600
+        doc = xmlSAXParseFile(&mySAXHandler,
 			     (char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), 0);
 #else
         doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME));
@@ -1184,7 +1186,6 @@
 
     if (!initialized) {
         sscanf(xmlParserVersion, "%d", &xmlVer);
-        xsldbgHasLineNumberFix = (xmlVer >= 20508);
         if (!debugInit()) {
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
             xsltGenericError(xsltGenericErrorContext,
@@ -1221,7 +1222,7 @@
         /* set up the parser */
         xmlInitParser();
 #if 0
-#if LIBXML_VERSION >= 2006000
+#if LIBXML_VERSION >= 20600
      xmlSetGenericErrorFunc(NULL,  NULL);
      xmlSetStructuredErrorFunc(NULL , \
(xmlStructuredErrorFunc)xsldbgStructErrorHandler);  #else
@@ -1238,10 +1239,6 @@
 	 */
 	xmlDefaultSAXHandlerInit();
 	xmlDefaultSAXHandler.cdataBlock = NULL;
-if (xsldbgHasLineNumberFix){
-	oldGetEntity = xmlDefaultSAXHandler.getEntity;
-	xmlDefaultSAXHandler.getEntity = xsldbgGetEntity;
-}
 
         if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) {
             initialized = 1;


[prev in list] [next in list] [prev in thread] [next in thread]