From c964e1d8c0ff4e645691386ff92b41440223649b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 28 Mar 2010 20:04:12 +0200
Subject: Add facet support for other string-based types (serializer)

---
 libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx')

diff --git a/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx b/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
index e417b98..f336620 100644
--- a/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
+++ b/libxsde/xsde/cxx/serializer/validating/nmtoken-stl.cxx
@@ -6,6 +6,7 @@
 #include <xsde/cxx/xml/char-table.hxx>
 
 #include <xsde/cxx/serializer/validating/nmtoken-stl.hxx>
+#include <xsde/cxx/serializer/validating/string-common.hxx>
 
 namespace xsde
 {
@@ -42,10 +43,17 @@ namespace xsde
               ok = false;
           }
 
-          if (ok)
-            _characters (tmp.c_str (), tmp.size ());
-          else
+          if (!ok)
+          {
             _schema_error (schema_error::invalid_nmtoken_value);
+            return;
+          }
+
+          if (!string_common::validate_facets (
+                tmp.c_str (), tmp.size (), _facets (), _context ()))
+            return;
+
+          _characters (tmp.c_str (), tmp.size ());
         }
       }
     }
-- 
cgit v1.1