[yelp] Use the new yelp-xsl, transition to the new Mallard Cache namespace
- From: Shaun McCance <shaunm src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [yelp] Use the new yelp-xsl, transition to the new Mallard Cache namespace
- Date: Tue, 5 Jan 2010 21:10:45 +0000 (UTC)
commit a2828a79dd45095d3e0b77d1acccebdd529e700a
Author: Shaun McCance <shaunm gnome org>
Date: Tue Jan 5 15:10:22 2010 -0600
Use the new yelp-xsl, transition to the new Mallard Cache namespace
configure.in | 12 ++++++------
src/yelp-mallard.c | 24 ++++++++++++++----------
2 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/configure.in b/configure.in
index b70d9d7..fc50441 100644
--- a/configure.in
+++ b/configure.in
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES(YELP,
[
gio-2.0
gconf-2.0
- gnome-doc-utils >= 0.17.2
+ yelp-xsl >= 0.99.1
gtk+-unix-print-2.0
gtk+-2.0 >= 2.18.0
libxml-2.0 >= 2.6.5
@@ -84,20 +84,20 @@ AC_SUBST([YELP_LIBS])
AC_PATH_PROGS(SED, gsed sed)
-XSLT_PATH="`$PKG_CONFIG --variable=xsltdir gnome-doc-utils`"
+XSLT_PATH="`$PKG_CONFIG --variable=xsltdir yelp-xsl`"
DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
AC_SUBST(DB_TITLE)
-DB2HTML="`$PKG_CONFIG --variable=db2xhtml gnome-doc-utils`"
+DB2HTML="`$PKG_CONFIG --variable=db2xhtml yelp-xsl`"
AC_SUBST(DB2HTML)
-MAL2HTML="`$PKG_CONFIG --variable=mal2xhtml gnome-doc-utils`"
+MAL2HTML="`$PKG_CONFIG --variable=mal2xhtml yelp-xsl`"
AC_SUBST(MAL2HTML)
-GDU_GETTEXT="`$PKG_CONFIG --variable=gettext gnome-doc-utils`"
+GDU_GETTEXT="`$PKG_CONFIG --variable=gettext yelp-xsl`"
AC_SUBST(GDU_GETTEXT)
-GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir gnome-doc-utils`"
+GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir yelp-xsl`"
AC_SUBST(GDU_ICON_PATH)
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
diff --git a/src/yelp-mallard.c b/src/yelp-mallard.c
index 6b355a4..51bf0d3 100644
--- a/src/yelp-mallard.c
+++ b/src/yelp-mallard.c
@@ -39,6 +39,7 @@
#define STYLESHEET DATADIR"/yelp/xslt/mal2html.xsl"
#define MALLARD_NS "http://projectmallard.org/1.0/"
+#define MALLARD_CACHE_NS "http://projectmallard.org/cache/1.0/"
#define YELP_MALLARD_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_MALLARD, YelpMallardPriv))
@@ -73,7 +74,8 @@ struct _YelpMallardPriv {
GSList *pending;
xmlDocPtr cache;
- xmlNsPtr cache_ns;
+ xmlNsPtr cache_mal_ns;
+ xmlNsPtr cache_cache_ns;
GHashTable *pages_hash;
};
@@ -166,11 +168,13 @@ mallard_init (YelpMallard *mallard)
priv->transforms_running = 0;
priv->cache = xmlNewDoc (BAD_CAST "1.0");
- priv->cache_ns = xmlNewNs (NULL, BAD_CAST MALLARD_NS, BAD_CAST "mal");
- cur = xmlNewDocNode (priv->cache, priv->cache_ns, BAD_CAST "cache", NULL);
+ priv->cache_cache_ns = xmlNewNs (NULL, BAD_CAST MALLARD_CACHE_NS, BAD_CAST "cache");
+ priv->cache_mal_ns = xmlNewNs (NULL, BAD_CAST MALLARD_NS, BAD_CAST "mal");
+ cur = xmlNewDocNode (priv->cache, priv->cache_cache_ns, BAD_CAST "cache", NULL);
xmlDocSetRootElement (priv->cache, cur);
- priv->cache_ns->next = cur->nsDef;
- cur->nsDef = priv->cache_ns;
+ priv->cache_cache_ns->next = priv->cache_mal_ns;
+ priv->cache_mal_ns->next = cur->nsDef;
+ cur->nsDef = priv->cache_cache_ns;
priv->pages_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL,
(GDestroyNotify) mallard_page_data_free);
@@ -415,7 +419,7 @@ mallard_page_data_walk (MallardPageData *page_data)
goto done;
page_data->cache = xmlNewChild (page_data->cache,
- page_data->mallard->priv->cache_ns,
+ page_data->mallard->priv->cache_mal_ns,
page_data->cur->name,
NULL);
@@ -429,7 +433,7 @@ mallard_page_data_walk (MallardPageData *page_data)
}
info = xmlNewChild (page_data->cache,
- page_data->mallard->priv->cache_ns,
+ page_data->mallard->priv->cache_mal_ns,
BAD_CAST "info", NULL);
page_data->link_title = FALSE;
page_data->sort_title = FALSE;
@@ -442,14 +446,14 @@ mallard_page_data_walk (MallardPageData *page_data)
else if (xmlStrEqual (child->name, BAD_CAST "title")) {
xmlNodePtr node;
xmlNodePtr title_node = xmlNewChild (page_data->cache,
- page_data->mallard->priv->cache_ns,
+ page_data->mallard->priv->cache_mal_ns,
BAD_CAST "title", NULL);
for (node = child->children; node; node = node->next) {
xmlAddChild (title_node, xmlCopyNode (node, 1));
}
if (!page_data->link_title) {
xmlNodePtr title_node = xmlNewChild (info,
- page_data->mallard->priv->cache_ns,
+ page_data->mallard->priv->cache_mal_ns,
BAD_CAST "title", NULL);
xmlSetProp (title_node, BAD_CAST "type", BAD_CAST "link");
for (node = child->children; node; node = node->next) {
@@ -458,7 +462,7 @@ mallard_page_data_walk (MallardPageData *page_data)
}
if (!page_data->sort_title) {
xmlNodePtr title_node = xmlNewChild (info,
- page_data->mallard->priv->cache_ns,
+ page_data->mallard->priv->cache_mal_ns,
BAD_CAST "title", NULL);
xmlSetProp (title_node, BAD_CAST "type", BAD_CAST "sort");
for (node = child->children; node; node = node->next) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]