You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2001/11/12 21:36:54 UTC

cvs commit: xml-xerces/c/src/util SchemaDateTimeException.hpp XMLUni.hpp XMLUni.cpp XMLExceptMsgs.hpp XMLDateTime.hpp XMLDateTime.cpp Makefile.in

peiyongz    01/11/12 12:36:54

  Modified:    c/src/util XMLUni.hpp XMLUni.cpp XMLExceptMsgs.hpp
                        XMLDateTime.hpp XMLDateTime.cpp Makefile.in
  Added:       c/src/util SchemaDateTimeException.hpp
  Log:
  SchemaDateTimeException defined
  
  Revision  Changes    Path
  1.32      +2 -1      xml-xerces/c/src/util/XMLUni.hpp
  
  Index: XMLUni.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLUni.hpp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- XMLUni.hpp	2001/11/02 14:18:22	1.31
  +++ XMLUni.hpp	2001/11/12 20:36:54	1.32
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: XMLUni.hpp,v 1.31 2001/11/02 14:18:22 knoaman Exp $
  + * $Id: XMLUni.hpp,v 1.32 2001/11/12 20:36:54 peiyongz Exp $
    */
   
   
  @@ -203,6 +203,7 @@
   	static const XMLCh fgParseException_Name[];
   	static const XMLCh fgInvalidDatatypeFacetException_Name[];
   	static const XMLCh fgInvalidDatatypeValueException_Name[];
  +	static const XMLCh fgSchemaDateTimeException_Name[];
       static const XMLCh fgXPathException_Name[];
   
       static const XMLCh fgNegINFString[];
  
  
  
  1.32      +10 -1     xml-xerces/c/src/util/XMLUni.cpp
  
  Index: XMLUni.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLUni.cpp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- XMLUni.cpp	2001/11/02 14:18:22	1.31
  +++ XMLUni.cpp	2001/11/12 20:36:54	1.32
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: XMLUni.cpp,v 1.31 2001/11/02 14:18:22 knoaman Exp $
  + * $Id: XMLUni.cpp,v 1.32 2001/11/12 20:36:54 peiyongz Exp $
    */
   
   
  @@ -758,6 +758,15 @@
       ,   chLatin_d, chLatin_D, chLatin_a, chLatin_t, chLatin_a, chLatin_t
       ,   chLatin_y, chLatin_p, chLatin_e, chLatin_V, chLatin_a, chLatin_l
       ,   chLatin_u, chLatin_e, chLatin_E, chLatin_x, chLatin_c, chLatin_e
  +    ,   chLatin_p, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
  +};
  +
  +const XMLCh XMLUni::fgSchemaDateTimeException_Name[] =
  +{
  +        chLatin_S, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a
  +    ,   chLatin_D, chLatin_a, chLatin_t, chLatin_e
  +    ,   chLatin_T, chLatin_i, chLatin_m, chLatin_e
  +    ,   chLatin_E, chLatin_x, chLatin_c, chLatin_e
       ,   chLatin_p, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
   };
   
  
  
  
  1.26      +36 -5     xml-xerces/c/src/util/XMLExceptMsgs.hpp
  
  Index: XMLExceptMsgs.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLExceptMsgs.hpp,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- XMLExceptMsgs.hpp	2001/11/02 14:18:22	1.25
  +++ XMLExceptMsgs.hpp	2001/11/12 20:36:54	1.26
  @@ -305,11 +305,42 @@
         , XPath_InvalidChar                  = 294
         , XPath_TokenNotSupported            = 295
         , XPath_FindSolution                 = 296
  -      , E_HighBounds                       = 297
  -      , W_LowBounds                        = 298
  -      , W_HighBounds                       = 299
  -      , F_LowBounds                        = 300
  -      , F_HighBounds                       = 301
  +      , DateTime_Assert_Buffer_Fail        = 297
  +      , DateTime_dt_missingT               = 298
  +      , DateTime_gDay_invalid              = 299
  +      , DateTime_gMth_invalid              = 300
  +      , DateTime_gMthDay_invalid           = 301
  +      , DateTime_dur_Start_dashP           = 302
  +      , DateTime_dur_noP                   = 303
  +      , DateTime_dur_DashNotFirst          = 304
  +      , DateTime_dur_inv_b4T               = 305
  +      , DateTime_dur_NoTimeAfterT          = 306
  +      , DateTime_dur_NoElementAtAll        = 307
  +      , DateTime_date_incomplete           = 308
  +      , DateTime_date_invalid              = 309
  +      , DateTime_time_incomplete           = 310
  +      , DateTime_time_invalid              = 311
  +      , DateTime_ms_noDigit                = 312
  +      , DateTime_ym_incomplete             = 313
  +      , DateTime_ym_invalid                = 314
  +      , DateTime_year_tooShort             = 315
  +      , DateTime_year_leadingZero          = 316
  +      , DateTime_ym_noMonth                = 317
  +      , DateTime_tz_noUTCsign              = 318
  +      , DateTime_tz_stuffAfterZ            = 319
  +      , DateTime_tz_invalid                = 320
  +      , DateTime_year_zero                 = 321
  +      , DateTime_mth_invalid               = 322
  +      , DateTime_day_invalid               = 323
  +      , DateTime_hour_invalid              = 324
  +      , DateTime_min_invalid               = 325
  +      , DateTime_second_invalid            = 326
  +      , DateTime_tz_hh_invalid             = 327
  +      , E_HighBounds                       = 328
  +      , W_LowBounds                        = 329
  +      , W_HighBounds                       = 330
  +      , F_LowBounds                        = 331
  +      , F_HighBounds                       = 332
       };
   
   };
  
  
  
  1.3       +7 -4      xml-xerces/c/src/util/XMLDateTime.hpp
  
  Index: XMLDateTime.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLDateTime.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLDateTime.hpp	2001/11/09 20:41:45	1.2
  +++ XMLDateTime.hpp	2001/11/12 20:36:54	1.3
  @@ -55,8 +55,11 @@
    */
   
   /*
  - * $Id: XMLDateTime.hpp,v 1.2 2001/11/09 20:41:45 peiyongz Exp $
  + * $Id: XMLDateTime.hpp,v 1.3 2001/11/12 20:36:54 peiyongz Exp $
    * $Log: XMLDateTime.hpp,v $
  + * Revision 1.3  2001/11/12 20:36:54  peiyongz
  + * SchemaDateTimeException defined
  + *
    * Revision 1.2  2001/11/09 20:41:45  peiyongz
    * Fix: compilation error on Solaris and AIX.
    *
  @@ -72,7 +75,7 @@
   #include <util/XMLNumber.hpp>
   #include <util/XMLString.hpp>
   #include <util/XMLUniDefs.hpp>
  -#include <util/RuntimeException.hpp>
  +#include <util/SchemaDateTimeException.hpp>
   
   class XMLUTIL_EXPORT XMLDateTime : public XMLNumber
   {
  @@ -337,8 +340,8 @@
       if ( ( !fBuffer )            || 
            ( fBuffer[0] == chNull ) )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //" buffer not set properly"
  +        ThrowXML(SchemaDateTimeException
  +               , XMLExcepts::DateTime_Assert_Buffer_Fail);
       }
   
   }
  
  
  
  1.3       +108 -52   xml-xerces/c/src/util/XMLDateTime.cpp
  
  Index: XMLDateTime.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLDateTime.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLDateTime.cpp	2001/11/09 20:41:45	1.2
  +++ XMLDateTime.cpp	2001/11/12 20:36:54	1.3
  @@ -55,8 +55,11 @@
    */
   
   /*
  - * $Id: XMLDateTime.cpp,v 1.2 2001/11/09 20:41:45 peiyongz Exp $
  + * $Id: XMLDateTime.cpp,v 1.3 2001/11/12 20:36:54 peiyongz Exp $
    * $Log: XMLDateTime.cpp,v $
  + * Revision 1.3  2001/11/12 20:36:54  peiyongz
  + * SchemaDateTimeException defined
  + *
    * Revision 1.2  2001/11/09 20:41:45  peiyongz
    * Fix: compilation error on Solaris and AIX.
    *
  @@ -125,7 +128,7 @@
   // see 3.2.6 duration W3C schema datatype specs
   //
   // the dates are in format: {CCYY,MM,DD, H, S, M, MS, timezone}  
  -const int DATETIMES[][XMLDateTime::TOTAL_SIZE] = 
  +static const int DATETIMES[][XMLDateTime::TOTAL_SIZE] = 
   {
       {1696, 9, 1, 0, 0, 0, 0, XMLDateTime::UTC_STD},     
   	{1697, 2, 1, 0, 0, 0, 0, XMLDateTime::UTC_STD},
  @@ -502,8 +505,9 @@
   
       //fStart is supposed to point to 'T'
       if (fBuffer[fStart++] != DATETIME_SEPARATOR)
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //("CCYY-MM must be followed by '-' sign");
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_dt_missingT
  +                , fBuffer);
   
       getTime();
       validateDateTime();
  @@ -549,8 +553,9 @@
           fBuffer[1] != DATE_SEPARATOR || 
           fBuffer[2] != DATE_SEPARATOR  ) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -			//"Error in day parsing");
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_gDay_invalid
  +                , fBuffer);
       }
   
       //initialize values 
  @@ -563,8 +568,9 @@
           int sign = findUTCSign(DAY_SIZE);
           if ( sign < 0 ) 
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -			//"Error in day parsing");
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_gDay_invalid
  +                    , fBuffer);
           }
           else 
           {
  @@ -589,8 +595,9 @@
           fBuffer[4] != DATE_SEPARATOR ||
           fBuffer[5] != DATE_SEPARATOR  )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //("Invalid format for gMonth: "+str);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_gMth_invalid
  +                , fBuffer);
       }
   
       //set constants
  @@ -603,8 +610,9 @@
           int sign = findUTCSign(MONTH_SIZE);
           if ( sign < 0 ) 
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -            //"Error in month parsing: "+str);
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_gMth_invalid
  +                    , fBuffer);
           }
           else 
           {
  @@ -658,8 +666,9 @@
           fBuffer[1] != DATE_SEPARATOR || 
           fBuffer[4] != DATE_SEPARATOR )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //("Invalid format for gMonthDay: "+str);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_gMthDay_invalid
  +                , fBuffer);
       }
   
   
  @@ -673,8 +682,9 @@
           int sign = findUTCSign(MONTHDAY_SIZE);
           if ( sign<0 ) 
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -            //"Error in month parsing: "+str);
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_gMthDay_invalid
  +                    , fBuffer);
           }
           else 
           {
  @@ -716,17 +726,18 @@
       if ( (c != DURATION_STARTER) && 
            (c != chDash)            ) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //"Error in month parsing: "+str);
  -        //SchemaDateTimeException();
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_dur_Start_dashP
  +                , fBuffer);
       }
   
       // 'P' must ALWAYS be present in either case
       if ( (c == chDash) && 
            (fBuffer[fStart++]!= DURATION_STARTER ))
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //SchemaDateTimeException();
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_dur_noP
  +                , fBuffer);
       }
   
       // java code
  @@ -743,8 +754,9 @@
       //
       if (indexOf(fStart, fEnd, chDash) != NOT_FOUND)
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //SchemaDateTimeException();
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_dur_DashNotFirst
  +                , fBuffer);
       }
   
       //at least one number and designator must be seen after P
  @@ -787,8 +799,9 @@
       if ( (fEnd == endDate) &&   // 'T' absent
            (fStart != fEnd)   )   // something after Day
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //SchemaDateTimeException();
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_dur_inv_b4T
  +                , fBuffer);
       }
   
       if ( fEnd != endDate ) // 'T' present
  @@ -834,20 +847,22 @@
               designator = true;
           }
   
  -        // no additional data shouls appear after last item
  +        // no additional data should appear after last item
           // P1Y1M1DT is illigal value as well
           if ( (fStart != fEnd) || 
                 fBuffer[--fStart] == DATETIME_SEPARATOR ) 
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -            //SchemaDateTimeException();
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_dur_NoTimeAfterT
  +                    ,fBuffer);
           }
       }
   
       if ( !designator ) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //SchemaDateTimeException();
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_dur_NoElementAtAll
  +                , fBuffer);
       }
   
   }
  @@ -869,15 +884,18 @@
   
       // Ensure enough chars in buffer
       if ( (fStart+YMD_MIN_SIZE) > fEnd)
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  -        //"Imcomplete Date Format";
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_date_incomplete
  +                , fBuffer);
   
       getYearMonth();    // Scan YearMonth and 
                          // fStart point to the next '-' 
   
       if (fBuffer[fStart++] != DATE_SEPARATOR) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_date_invalid
  +                , fBuffer);
           //("CCYY-MM must be followed by '-' sign");
       }
   
  @@ -901,14 +919,18 @@
   
       // Ensure enough chars in buffer
       if ( (fStart+TIME_MIN_SIZE) > fEnd)
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_time_incomplete
  +                , fBuffer);
           //"Imcomplete Time Format"
   
       // check (fixed) format first
       if ((fBuffer[fStart + 2] != TIME_SEPARATOR) ||
           (fBuffer[fStart + 5] != TIME_SEPARATOR)  )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_time_invalid
  +                , fBuffer);
           //("Error in parsing time" );
       }
   
  @@ -935,7 +957,9 @@
           // make sure we have some thing between the '.' and fEnd
           if (fStart >= fEnd)
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_ms_noDigit
  +                    , fBuffer);
               //("ms shall be present once '.' is present" );
           }
   
  @@ -968,7 +992,9 @@
   
       // Ensure enough chars in buffer
       if ( (fStart+YMONTH_MIN_SIZE) > fEnd)
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_ym_incomplete
  +                , fBuffer);
           //"Imcomplete YearMonth Format";
   
       // skip the first leading '-'
  @@ -979,19 +1005,25 @@
       //
       int yearSeparator = indexOf(start, fEnd, DATE_SEPARATOR);
       if ( yearSeparator == NOT_FOUND) 
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_ym_invalid
  +                , fBuffer);
           //("Year separator is missing or misplaced");
   
       int length = yearSeparator - start;
       if (length < 4) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_year_tooShort
  +                , fBuffer);
           //"Year must have 'CCYY' format");
       }
       else if (length > 4 && 
                fBuffer[start] == chDigit_0)
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_year_leadingZero
  +                , fBuffer);
           //"Leading zeros are required if the year value would otherwise have fewer than four digits; 
           // otherwise they are forbidden");
       }
  @@ -1003,7 +1035,9 @@
       //gonna check we have enough byte for month
       //
       if ((fStart + 2) > fEnd )
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_ym_noMonth
  +                , fBuffer);
           //"no month in buffer"
   
       fValue[Month] = parseInt(fStart, yearSeparator + 3);
  @@ -1019,7 +1053,9 @@
           int sign = findUTCSign(fStart);
           if ( sign < 0 ) 
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_tz_noUTCsign
  +                    , fBuffer);
               //("Error in month parsing");
           }
           else 
  @@ -1045,7 +1081,9 @@
       {
           if ((sign + 1) != fEnd )
           {
  -            ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +            ThrowXML1(SchemaDateTimeException
  +                    , XMLExcepts::DateTime_tz_stuffAfterZ
  +                    , fBuffer);
               //"Error in parsing time zone");
           }		
   
  @@ -1061,7 +1099,9 @@
       if ( ( ( sign + TIMEZONE_SIZE + 1) != fEnd )      ||
            ( fBuffer[sign + 3] != TIMEZONE_SEPARATOR ) )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_tz_invalid
  +                , fBuffer);
           //("Error in parsing time zone");
       }
   
  @@ -1138,21 +1178,27 @@
       //          or reporting an error message should be sufficient?  
       if ( fValue[CentYear] == 0 ) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_year_zero
  +                , fBuffer);
           //"The year \"0000\" is an illegal year value");
       }
   
       if ( fValue[Month] < 1  || 
            fValue[Month] > 12  ) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_mth_invalid
  +                , fBuffer);
   		//"The month must have values 1 to 12");
       }
   
       //validate days
       if ( fValue[Day] > maxDayInMonthFor( fValue[CentYear], fValue[Month])) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_day_invalid
  +                , fBuffer);
           //"The day must have values 1 to 31");
       }
   
  @@ -1160,7 +1206,9 @@
       if ( fValue[Hour] < 0  ||
            fValue[Hour] > 23  ) 
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_hour_invalid
  +                , fBuffer);
           //("Hour must have values 0-23");
       }
   
  @@ -1168,7 +1216,9 @@
       if ( fValue[Minute] < 0 ||
            fValue[Minute] > 59 )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_min_invalid
  +                , fBuffer);
           //"Minute must have values 0-59");
       }
   
  @@ -1176,7 +1226,9 @@
       if ( fValue[Second] < 0 ||
            fValue[Second] > 60 )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_second_invalid
  +                , fBuffer);
           //"Second must have values 0-60");
       }
   
  @@ -1184,7 +1236,9 @@
       if ( fTimeZone[hh] < -14 || 
            fTimeZone[hh] > 14 )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_tz_hh_invalid
  +                , fBuffer);
           //"Time zone should have range -14..+14");
       }
   
  @@ -1192,7 +1246,9 @@
       if ( fTimeZone[mm] < -59 || 
            fTimeZone[mm] > 59   )
       {
  -        ThrowXML(RuntimeException, XMLExcepts::SubGrpComparator_NGR);
  +        ThrowXML1(SchemaDateTimeException
  +                , XMLExcepts::DateTime_min_invalid
  +                , fBuffer);
           //("Minute must have values 0-59");
       }
   	
  
  
  
  1.50      +4 -0      xml-xerces/c/src/util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/Makefile.in,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Makefile.in	2001/11/07 19:16:03	1.49
  +++ Makefile.in	2001/11/12 20:36:54	1.50
  @@ -55,6 +55,9 @@
   #
   #
   # $Log: Makefile.in,v $
  +# Revision 1.50  2001/11/12 20:36:54  peiyongz
  +# SchemaDateTimeException defined
  +#
   # Revision 1.49  2001/11/07 19:16:03  peiyongz
   # DateTime Port
   #
  @@ -347,6 +350,7 @@
       RefStackOf.hpp \
       RefVectorOf.hpp \
       RuntimeException.hpp \
  +    SchemaDateTimeException.hpp \
       StringPool.hpp \
       XMLStringTokenizer.hpp \
       TransENameMap.hpp \
  
  
  
  1.1                  xml-xerces/c/src/util/SchemaDateTimeException.hpp
  
  Index: SchemaDateTimeException.hpp
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Xerces" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache\@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation, and was
   * originally based on software copyright (c) 2001, International
   * Business Machines, Inc., http://www.ibm.com .  For more information
   * on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  /*
   * $Id: SchemaDateTimeException.hpp,v 1.1 2001/11/12 20:36:54 peiyongz Exp $
   * $Log: SchemaDateTimeException.hpp,v $
   * Revision 1.1  2001/11/12 20:36:54  peiyongz
   * SchemaDateTimeException defined
   *
   *
   */
  
  
  #if !defined(SCHEMA_DATETIME_EXCEPTION_HPP)
  #define SCHEMA_DATETIME_EXCEPTION_HPP
  
  #include <util/XercesDefs.hpp>
  #include <util/XMLException.hpp>
  
  
  MakeXMLException(SchemaDateTimeException, XMLUTIL_EXPORT)
  
  #endif
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org