Changeset b19646bb6e2ebc2bbc3854e36fd29ca5f91f4481

Timestamp:

10/17/07 00:23:08 (15 months ago)

Author:

Mark Guzman <segfault@…>

Parents:

ecdb845a0ca9053bc4c21b1ea3560fe344b076a2

Children:

7a0abd0654bc03960da3384f2d96e68aa85c5984

git-committer:

Mark Guzman <segfault@hasno.info> / 2007-10-17T04:23:08Z+0000

Message:

adding options to direct the parser
added optional block parameter

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

Location:

ext

Files:

• fastxml.c (modified) (3 diffs)
• fastxml.h (modified) (1 diff)
• fastxml_doc.c (modified) (2 diffs)
• fastxml_doc.h (modified) (1 diff)

ext/fastxml.c

@@ -11 +11 @@
 VALUE rb_cFastXmlNode;
 VALUE rb_cFastXmlNodeList;
+VALUE rb_sValidateDtd;
+VALUE rb_sForgivingParse;
 ID s_readlines;
 ID s_to_s;
@@ -34 +36 @@
 
     /* Doc */
-    rb_define_method( rb_cFastXmlDoc, "initialize", fastxml_doc_initialize, 1 );
+    rb_sValidateDtd = ID2SYM( rb_intern("validate") );
+    rb_sForgivingParse = ID2SYM( rb_intern("forgiving") );
+    rb_define_method( rb_cFastXmlDoc, "initialize", fastxml_doc_initialize, -1 );
     rb_define_method( rb_cFastXmlDoc, "search", fastxml_doc_search, 1 );
     rb_define_method( rb_cFastXmlDoc, "to_s", fastxml_doc_to_s, 0 );
@@ -245 +249 @@
 
         xpath_obj = xmlXPathCompiledEval( xpath_xpr, xpath_ctx );
-    if(xpath_obj == NULL) {
+    if (xpath_obj == NULL) {
         rb_raise( rb_eRuntimeError, "unable to evaluate xpath expression" );
                 xmlXPathFreeCompExpr( xpath_xpr );

ext/fastxml.h

@@ -39 +39 @@
 RUBY_EXTERN VALUE rb_cFastXmlNode;
 
+RUBY_EXTERN VALUE rb_sValidateDtd;
+RUBY_EXTERN VALUE rb_sForgivingParse;
+
 RUBY_EXTERN ID s_readlines;
 RUBY_EXTERN ID s_to_s;

ext/fastxml_doc.c

@@ -121 +121 @@
 }
 
-VALUE fastxml_doc_initialize(VALUE self, VALUE xml_doc_str)
+VALUE fastxml_doc_initialize(int argc, VALUE* argv, VALUE self)
 {
-    VALUE data_s, dv, lines;
+    VALUE data_s, dv, lines, xml_doc_str, opts, blk;
     fxml_data_t *data;
     int parser_opts = XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
-    int parse_dtd = XML_PARSE_DTDLOAD | XML_PARSE_DTDATTR | XML_PARSE_DTDVALID;
-    int parse_forgiving = XML_PARSE_RECOVER;
+
+    if (rb_scan_args( argc, argv, "11&", &xml_doc_str, &opts, &blk ) == 0)
+        return Qnil; // error state
 
     if (NIL_P(xml_doc_str)) {
         rb_raise(rb_eArgError, "nil passed as xml document");
         return Qnil;
+    }
+
+    if (opts != Qnil) {
+        if (rb_hash_aref(opts, rb_sValidateDtd) != Qnil) 
+            parser_opts = parser_opts | XML_PARSE_DTDLOAD | XML_PARSE_DTDATTR | XML_PARSE_DTDVALID;
+        
+        if (rb_hash_aref(opts, rb_sForgivingParse) != Qnil) 
+            parser_opts = parser_opts | XML_PARSE_RECOVER;
     }
 
@@ -157 +166 @@
     rb_iv_set(self, "@lxml_doc", dv );
 
+    if (blk != Qnil)
+        rb_yield( self );
+
     return self;
 }

ext/fastxml_doc.h

@@ -5 +5 @@
 #ifndef fastxml_doc_h
 #define fastxml_doc_h
-RUBY_EXTERN VALUE fastxml_doc_initialize(VALUE self, VALUE data);
+RUBY_EXTERN VALUE fastxml_doc_initialize(int argc, VALUE* argv, VALUE self);
 RUBY_EXTERN VALUE fastxml_doc_search(VALUE self, VALUE raw_xpath, VALUE blk);
 RUBY_EXTERN VALUE fastxml_doc_to_s(VALUE self);