cvs commit: xml-xerces/c/src/xercesc/internal IGXMLScanner2.cpp

[knoaman]

knoaman     2003/11/28 10:33:15

  Modified:    c/src/xercesc/internal IGXMLScanner2.cpp
  Log:
  PSVI update. Thanks to David Cargill.
  
  Revision  Changes    Path
  1.47      +8 -4      xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
  
  Index: IGXMLScanner2.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- IGXMLScanner2.cpp 28 Nov 2003 05:13:29 -0000      1.46
  +++ IGXMLScanner2.cpp 28 Nov 2003 18:33:15 -0000      1.47
  @@ -542,10 +542,14 @@
                               , false
                               , elemDecl
                           );
  -                        attrValidator = 
((SchemaValidator*)fValidator)->getMostRecentAttrValidator();
  -                        if(getPSVIHandler() && fGrammarType == 
Grammar::SchemaGrammarType
  +
  +                        if(fGrammarType == Grammar::SchemaGrammarType)
  +                        {
  +                            attrValidator = 
((SchemaValidator*)fValidator)->getMostRecentAttrValidator();
  +                            if (getPSVIHandler()
                                   && ((SchemaValidator 
*)fValidator)->getErrorOccurred())
  -                            attrValid = PSVIItem::VALIDITY_INVALID;
  +                                attrValid = PSVIItem::VALIDITY_INVALID;
  +                        }
                       }
                       else if(fGrammarType == Grammar::SchemaGrammarType)
                           attrValidator = 
DatatypeValidatorFactory::getBuiltInRegistry()->get(SchemaSymbols::fgDT_ANYSIMPLETYPE);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]