Changeset 1285f7e89455bcd74b48cf238879deba2b15b403

Timestamp:

07/18/07 23:18:21 (18 months ago)

Author:

Mark Guzman <segfault@…>

Parents:

89a3f8cdc9508c6dea8e60d6aea2dd33ee3a10a7

Children:

b9a586225c39677d89f1197d41d2eb7bf357565e

git-committer:

Mark Guzman <segfault@hasno.info> / 2007-07-19T03:18:21Z+0000

Message:

added xml attr to node
added xpath accessor to node which will ask a node for it's xpath string

git-svn-id: svn://hasno.info/fastxml/trunk@14 b3082176-f867-4bde-be85-e3c57d66f029

Files:

• ext/fastxml.c (modified) (10 diffs)

ext/fastxml.c

@@ -38 +38 @@
 static VALUE fastxml_node_innerxml(VALUE self);
 static VALUE fastxml_node_to_s(VALUE self);
+static VALUE fastxml_node_xpath(VALUE self);
+static VALUE fastxml_node_attr(VALUE self, VALUE attr_name);
 
 
@@ -66 +68 @@
     rb_define_method( rb_cFastXmlNode, "content=", fastxml_node_value_set, 1 );
     rb_define_method( rb_cFastXmlNode, "inner_xml", fastxml_node_innerxml, 0 );
+        rb_define_method( rb_cFastXmlNode, "xpath", fastxml_node_xpath, 0 );
+        rb_define_method( rb_cFastXmlNode, "attr", fastxml_node_attr, 1 );
 }
 
@@ -96 +100 @@
 
     return ret;
+}
+
+static VALUE fastxml_node_attr(VALUE self, VALUE attr_name)
+{
+        VALUE ret, dv;
+        fxml_data_t *data;
+        xmlChar *raw_ret, *name_str;
+        
+        dv = rb_iv_get( self, "@lxml_node" );
+        Data_Get_Struct( dv, fxml_data_t, data );
+        
+        name_str = (xmlChar*)StringValuePtr( attr_name );
+        raw_ret = xmlGetProp( data->node, name_str );
+        if (raw_ret == NULL)
+                return Qnil;
+                
+        ret = rb_str_new2( (const char*)raw_ret );
+        xmlFree( raw_ret );
+        
+        return ret;
+}
+
+static VALUE fastxml_node_xpath(VALUE self)
+{
+        VALUE ret, dv;
+        fxml_data_t *data;
+        xmlChar *raw_ret;
+        
+        dv = rb_iv_get( self, "@lxml_node" );
+        Data_Get_Struct( dv, fxml_data_t, data );
+        
+        raw_ret = xmlGetNodePath( data->node );
+        if (raw_ret == NULL)
+                return Qnil;
+        
+        ret = rb_str_new2( (const char*)raw_ret );
+        xmlFree( raw_ret );
+        
+        return ret;
 }
 
@@ -112 +155 @@
     spec = xmlEncodeSpecialChars( data->doc, ents );
 
-    printf("setting chars: %s\n", spec);
+   // printf("setting chars: %s\n", spec);
     xmlNodeSetContent( data->node, spec );
     xmlFree( ents );
@@ -176 +219 @@
 
     if (NIL_P(raw_xpath)) {
-        printf("got nil\n");
+        //printf("got nil\n");
         rb_raise(rb_eArgError, "nil passed as xpath");
         return Qnil;
@@ -183 +226 @@
     xpath_s = rb_obj_as_string( raw_xpath );
     xpath_expr = (xmlChar*)StringValuePtr( xpath_s );
-    printf("got xpath: %s\n", xpath_expr);
+    //printf("got xpath: %s\n", xpath_expr);
 
     dv = rb_iv_get( self, "@lxml_doc" );    
@@ -205 +248 @@
     xmlXPathFreeObject( xpath_obj );
     xmlXPathFreeContext( xpath_ctx ); 
-    printf("done\n");
+    //printf("done\n");
 
     return ret;
@@ -220 +263 @@
     ret = rb_ary_new();
     size = (nodes) ? nodes->nodeNr : 0;
-    printf("size: %d\n", size);
+    //printf("size: %d\n", size);
 
     for (i = 0; i < size; i++) {
         cur = nodes->nodeTab[i];
-        printf( "checking node: %s type: %d\n", cur->name, cur->type );
+        //printf( "checking node: %s type: %d\n", cur->name, cur->type );
         if (cur->type == XML_ELEMENT_NODE)
             continue;
@@ -301 +344 @@
 
     cstr = StringValuePtr( data_s );
-    printf( "cstr: %s\n", cstr );
+    //printf( "cstr: %s\n", cstr );
 
     xmlInitParser();
@@ -332 +375 @@
 static void fastxml_data_free( fxml_data_t *data )
 {
-    printf("attempting to free\n");
+    //printf("attempting to free\n");
     if (data != NULL)
     {