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

List:       kwrite-devel
Subject:    Re: [Patch] XML validator plugin
From:       Dominik Haumann <dhdev () gmx ! de>
Date:       2010-08-30 19:34:08
Message-ID: 201008302134.08390.dhdev () gmx ! de
[Download RAW message or body]

Hi Luigi,

On Saturday 26 June 2010, Luigi Toscano wrote:
> Hello,
> the attached patch makes the XML validator plugin working again. The code
> was  not working even before my changes to docbook support in kdelibs,
> because it contained references to old files (i.e. SGML catalog instead
> of XML one). Can I commit the patch to trunk (svn) and backport it to
> 4.5 if the branch will be created in the meanwhile?

Nice. Meanwhile certainly: You have to also backport to branch.
I'll give my comments below. They are probably not that useful, given
that I don't know much about this...

> PS. Please CC me, I'm not subscribed to kwrite-devel.
> 
> Regards
> -- 
> Luigi
> xmlcheck_fixdocbook.diff
> Index: xmlcheck/plugin_katexmlcheck.cpp
> ===================================================================
> --- xmlcheck/plugin_katexmlcheck.cpp    (revision 1142867)
> +++ xmlcheck/plugin_katexmlcheck.cpp    (working copy)
> @@ -269,18 +269,16 @@
> }
> 
> // use catalogs for KDE docbook:
> -       if( ! getenv("SGML_CATALOG_FILES") ) {
> +       if( ! getenv("XML_CATALOG_FILES") ) {

I have no idea whether this is correct, you'll probably know this
much better. So I leave this to you. If this is correct, of course ok
to commit.

> KComponentData ins("katexmlcheckplugin");
> QString catalogs;
> -               catalogs += ins.dirs()->findResource("data", \
>                 "ksgmltools2/customization/catalog");
> -               catalogs += ':';
> -               catalogs += ins.dirs()->findResource("data", \
> "ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat"); +               catalogs += \
> ins.dirs()->findResource("data", "ksgmltools2/customization/catalog.xml");

The file "ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat" at least exists for me.
No idea, if it's needed, though. If this is correct, of course ok to commit.

> kDebug() << "catalogs: " << catalogs;
> -               setenv("SGML_CATALOG_FILES", QFile::encodeName( catalogs ).data(), \
> 1); +               setenv("XML_CATALOG_FILES", QFile::encodeName( catalogs \
>                 ).data(), 1); }
> -       //kDebug() << "**catalogs: " << getenv("SGML_CATALOG_FILES");
> +       //kDebug() << "**catalogs: " << getenv("XML_CATALOG_FILES");
> 
> -       *m_proc << exe << "--catalogs" << "--noout";
> +       *m_proc << exe << "--noout";

no idea why --catalogs is not needed anymore. If this is correct, of course ok to \
commit.

Greetings,
Dominik
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel


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