Commit f978eef7 by Francois Gygi

Changed validation scheme to Val_Auto to allow successful parsing in the absence…

Changed validation scheme to Val_Auto to allow successful parsing in the absence of a local copy of sample.xsd or species.xsd. Warning message is printed if files are not found.


git-svn-id: http://qboxcode.org/svn/qb/trunk@583 cba15fb0-1239-40c8-b417-11db7ca47a34
parent 4114f6e6
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// SampleReader.C: // SampleReader.C:
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// $Id: SampleReader.C,v 1.25 2008-03-05 04:04:48 fgygi Exp $ // $Id: SampleReader.C,v 1.26 2008-03-21 00:29:09 fgygi Exp $
#include "Sample.h" #include "Sample.h"
...@@ -48,8 +48,8 @@ void SampleReader::readSample (Sample& s, const string uri, bool serial) ...@@ -48,8 +48,8 @@ void SampleReader::readSample (Sample& s, const string uri, bool serial)
tm.start(); tm.start();
#if USE_XERCES #if USE_XERCES
const char* encodingName = "UTF-8"; const char* encodingName = "UTF-8";
//SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Auto; SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Auto;
SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Always; //SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Always;
//SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Never; //SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Never;
bool expandNamespaces = false; bool expandNamespaces = false;
bool doNamespaces = true; bool doNamespaces = true;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// SpeciesReader.C: // SpeciesReader.C:
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// $Id: SpeciesReader.C,v 1.8 2008-02-12 05:39:18 fgygi Exp $ // $Id: SpeciesReader.C,v 1.9 2008-03-21 00:29:09 fgygi Exp $
#include "Species.h" #include "Species.h"
#include "SpeciesReader.h" #include "SpeciesReader.h"
...@@ -38,8 +38,8 @@ void SpeciesReader::readSpecies (Species& sp, const string uri) ...@@ -38,8 +38,8 @@ void SpeciesReader::readSpecies (Species& sp, const string uri)
if ( ctxt_.onpe0() ) if ( ctxt_.onpe0() )
{ {
const char* encodingName = "UTF-8"; const char* encodingName = "UTF-8";
//SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Auto; SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Auto;
SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Always; //SAX2XMLReader::ValSchemes valScheme = SAX2XMLReader::Val_Always;
bool expandNamespaces = false; bool expandNamespaces = false;
bool doNamespaces = true; bool doNamespaces = true;
bool doSchema = true; bool doSchema = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment