Can now limit the number of error kept for validations

Author: MatthD

libxml-syntax-error.cpp

@@ -2,6 +2,7 @@
 * This is the Errros Class script, for wellformed & validation DTD
 */
 #include <cstring>
+#include <iostream>
 #include "libxml-syntax-error.h"
 
 void setStringField(v8::Local<v8::Object> obj, const char* name, const char* value) {
@@ -37,12 +38,20 @@ XmlSyntaxError::BuildSyntaxError(xmlError* error) {
   return scope.Escape(err);
 }
 
+int XmlSyntaxError::maxError {100};
+
+void XmlSyntaxError::ChangeMaxNumberOfError(int max){
+  XmlSyntaxError::maxError = max;
+}
+
 void
 XmlSyntaxError::PushToArray(void* errs, xmlError* error) {
   Nan::HandleScope scope;
   v8::Local<v8::Array> errors = *reinterpret_cast<v8::Local<v8::Array>*>(errs);
+  if(errors->Length() >= maxError){
+    return;
+  }
   v8::Local<v8::Function> push = v8::Local<v8::Function>::Cast(errors->Get(Nan::New<v8::String>("push").ToLocalChecked()));
-
   v8::Local<v8::Value> argv[1] = { XmlSyntaxError::BuildSyntaxError(error) };
   push->Call(errors, 1, argv);
 }

libxml-syntax-error.h

@@ -6,7 +6,10 @@
 #include "libxml.h"
 
 class XmlSyntaxError {
+  static int maxError;
 public:
+  static void ChangeMaxNumberOfError(int max);
+
   // push xmlError onto v8::Array
   static void PushToArray(void* errs, xmlError* error);
 

libxml.cpp

@@ -227,6 +227,10 @@ NAN_METHOD(Libxml::validateAgainstDtds){
     return;
   }
 
+  if(int newMaxNbError = info[0]->IntegerValue()){
+    XmlSyntaxError::ChangeMaxNumberOfError(newMaxNbError);
+  }
+
   //Setting contexte of validation 
   const char* dtdValidationErrorsPath;
   bool oneOfTheDtdValidate = false;
@@ -238,6 +242,7 @@ NAN_METHOD(Libxml::validateAgainstDtds){
 
   for (vector<xmlDtdPtr>::iterator dtd = libxml->dtdsPaths.begin(); dtd != libxml->dtdsPaths.end() ; ++dtd){
     const char* dtdName = (const char *)(*dtd)->SystemID;
+    //Local<Array> errors = New<v8::Array>(3);
     v8::Local<v8::Array> errors = Nan::New<v8::Array>();
     xmlResetLastError();
     xmlSetStructuredErrorFunc(reinterpret_cast<void *>(&errors),
@@ -286,6 +291,9 @@ NAN_METHOD(Libxml::validateAgainstSchemas){
     return;
   }
 
+  if(int newMaxNbError = info[0]->IntegerValue()){
+    XmlSyntaxError::ChangeMaxNumberOfError(newMaxNbError);
+  }
   //Setting contexte of validation 
   const char* schemaValidationErrorsPath;
   bool oneOfTheSchemaValidate = false;

test/data/test-not-valid-dtd.xml

@@ -1,4 +1,12 @@
 <!DOCTYPE article PUBLIC "my doctype of doom" "mydoctype.dtd">
 <data>
     Parthénogénese du poulpe en milieu sub-aquatique
+    <jojo>
+    </jojo>
+    <bar>
+    </bar>
+    <foo>
+    </foo>
+    <foo2>
+    </foo2>
 </data>

test/libxml-test.js

@@ -35,11 +35,12 @@ describe('Node-Libxml', function () {
     let libxml = new Libxml();
     let testInvalidWf = libxml.loadXml('test/data/test-not-valid-dtd.xml');
     libxml.loadDtds(['test/dtd/mydoctype.dtd']);
-    let testInvalid = libxml.validateAgainstDtds();
+    let testInvalid = libxml.validateAgainstDtds(3);
     expect(testInvalidWf).to.be.true;
     expect(testInvalid).to.be.false;
     expect(libxml).to.have.property('validationDtdErrors');
     expect(libxml.validationDtdErrors).to.be.an('object');
+    expect(libxml.validationDtdErrors['test/dtd/mydoctype.dtd'].length).to.be.equal(3);
     libxml.freeDtds();
     libxml.freeXml();
   });