Changeset aa4df66e877563ecf9367188566252bf929b46f0

Timestamp:

06/29/10 18:22:31 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1277835751 +0000

git-parent:

[5d3fa1939f21990710f00ef4463a193cc1024f3f]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1277835751 +0000

Message:

add XML manipulation to our lua toolchest, refs #295

Files:

• src/modules/lua_noit.c (modified) (7 diffs)

src/modules/lua_noit.c

@@ -52 +52 @@
-#include "noit_check.h"
-#include "noit_check_tools.h"
+#include "noit_xml.h"
-#include "utils/noit_log.h"
-#include "utils/noit_str.h"
@@ -1402 +1403 @@
-  if(nodeptr != lua_touserdata(L, 1))
-    luaL_error(L, "must be called as method");
+  if(lua_gettop(L) == 3 && lua_isstring(L,2)) {
+    const char *attr = lua_tostring(L,2);
+    if(lua_isnil(L,3))
+      xmlSetProp(*nodeptr, (xmlChar *)attr, NULL);
+    else
+      xmlSetProp(*nodeptr, (xmlChar *)attr, (xmlChar *)lua_tostring(L,3));
+    return 0;
+  }
-  if(lua_gettop(L) == 2 && lua_isstring(L,2)) {
-    xmlChar *v;
@@ -1423 +1432 @@
-  if(nodeptr != lua_touserdata(L, 1))
-    luaL_error(L, "must be called as method");
+  if(lua_gettop(L) == 2 && lua_isstring(L,2)) {
+    const char *data = lua_tostring(L,2);
+    xmlChar *enc = xmlEncodeEntitiesReentrant((*nodeptr)->doc, (xmlChar *)data);
+    xmlNodeSetContent(*nodeptr, (xmlChar *)enc);
+    return 0;
+  }
-  if(lua_gettop(L) == 1) {
-    xmlChar *v;
@@ -1449 +1464 @@
-    return 1;
-  }
+  return 0;
+}
+static int
+noit_lua_xmlnode_addchild(lua_State *L) {
+  xmlNodePtr *nodeptr;
+  nodeptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(nodeptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  if(lua_gettop(L) == 2 && lua_isstring(L,2)) {
+    xmlNodePtr *newnodeptr;
+    newnodeptr = (xmlNodePtr *)lua_newuserdata(L, sizeof(*nodeptr));
+    *newnodeptr = xmlNewChild(*nodeptr, NULL,
+                              (xmlChar *)lua_tostring(L,2), NULL);
+    luaL_getmetatable(L, "noit.xmlnode");
+    lua_setmetatable(L, -2);
+    return 1;
+  }
+  luaL_error(L,"must be called with one argument");
-  return 0;
-}
@@ -1465 +1498 @@
-  lua_setmetatable(L, -2);
-  lua_pushcclosure(L, noit_lua_xmlnode_next, 1);
+  return 1;
+}
+static int
+noit_lua_xml_tostring(lua_State *L) {
+  int n;
+  xmlDocPtr *docptr;
+  char *xmlstring;
+  n = lua_gettop(L);
+  /* the first arg is implicitly self (it's a method) */
+  docptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(docptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  if(n != 1) luaL_error(L, "expects no arguments, got %d", n - 1);
+  xmlstring = noit_xmlSaveToBuffer(*docptr);
+  lua_pushstring(L, xmlstring);
+  free(xmlstring);
-  return 1;
-}
@@ -1511 +1560 @@
-      LUA_DISPATCH(attr, noit_lua_xmlnode_attr);
-      LUA_DISPATCH(attribute, noit_lua_xmlnode_attr);
+      LUA_DISPATCH(addchild, noit_lua_xmlnode_addchild);
-      break;
-    case 'c':
@@ -1571 +1621 @@
-    case 'r':
-     LUA_DISPATCH(root, noit_lua_xml_docroot);
+     break;
+    case 't':
+     LUA_DISPATCH(tostring, noit_lua_xml_tostring);
-     break;
-    case 'x':