[Dotgnu-libs-commits] CVS: dotgnu.rdf DotGNU.Rdf.build,1.3,1.4 FeatureTable.cs,1.1,1.2 RdfParser.cs,1.3,1.4 RdfSerializer.cs,1.1,1.2

[Adam Ballai <address@hidden>]

Update of /cvsroot/dotgnu-libs/dotgnu.rdf
In directory subversions:/tmp/cvs-serv31675

Modified Files:
        DotGNU.Rdf.build FeatureTable.cs RdfParser.cs RdfSerializer.cs 
Log Message:


Index: DotGNU.Rdf.build
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu.rdf/DotGNU.Rdf.build,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DotGNU.Rdf.build    8 Feb 2003 18:35:07 -0000       1.3
--- DotGNU.Rdf.build    15 Feb 2003 13:35:42 -0000      1.4
***************
*** 21,24 ****
--- 21,26 ----
                                <includes name="RdfParserFactory.cs" />
                                <includes name="RdfParser_SystemXml.cs" />
+                               <includes name="RdfSerializer.cs" />
+                               <includes name="FeatureTable.cs" />
                        </sources>
  

Index: FeatureTable.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu.rdf/FeatureTable.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FeatureTable.cs     15 Feb 2003 12:58:29 -0000      1.1
--- FeatureTable.cs     15 Feb 2003 13:35:42 -0000      1.2
***************
*** 25,34 ****
  namespace DotGNU.Rdf
  {
        class FeatureTable
        {
!               struct Feature
                {
!               RdfUri uri,
!               String value;
                }
  
--- 25,67 ----
  namespace DotGNU.Rdf
  {
+       using System;
+ 
        class FeatureTable
        {
!               internal class Feature
                {
!                       private RdfUri uri;
!                       private String uValue;
! 
!                       public Feature(RdfUri uri, String uValue)
!                       {
!                               uri = uri;
!                               uValue = uValue;
!                       }
! 
!                       public RdfUri Uri
!                       {
!                               get
!                               {
!                                       return uri;
!                               }
!                               set
!                               {
!                                       uri = value;
!                               }
!                       }
! 
!                       public String UValue
!                       {
! 
!                               get
!                               {
!                                       return uValue;
!                               }
!                               set
!                               {
!                                       uValue = value;
!                               }
!                       }
                }
  
***************
*** 42,67 ****
                }
                
!               public Feature Features[int index]
                {
!                       get
                        {
!                               if(index > -1 && features != null && index != 
features.Length)
!                               {
!                                       features[index];
!                               }
!                               else
!                               {
!                                       throw new ArgumentException(
!                                                       
S._("ArgumentException_IndexBad"));
!                               }
                        }
                }
  
                public void AppendFeature(RdfUri uri, String value)
                {
!                       Feature newFeature = new Feature();
!                       newFeature.uri = uri;
!                       newFeature.value = value;
!                       features[index];
                        index++;
                }
--- 75,95 ----
                }
                
!               public Feature Features(int index)
                {
!                       if((index > -1) && (index != features.Length))
                        {
!                               return features[index];
!                       }
!                       else
!                       {
!                               throw new 
ArgumentException("ArgumentException_IndexBad");
                        }
+                       return null;
                }
  
                public void AppendFeature(RdfUri uri, String value)
                {
!                       Feature newFeature = new Feature(uri, value);
!                       features[index] = newFeature;
                        index++;
                }

Index: RdfParser.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu.rdf/RdfParser.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RdfParser.cs        8 Feb 2003 18:35:07 -0000       1.3
--- RdfParser.cs        15 Feb 2003 13:35:42 -0000      1.4
***************
*** 30,65 ****
        {
                // *factory
!       public  delegate void Factory(RdfParserFactory parser_factory);
                
                // librdf_parser_register_factory
!       public abstract void ParserRegisterFactory(RdfWorld world, String name, 
String mime_type, String uri_string, Factory parser_factory);
! 
! 
!       // Constructor.
!       // librdf_new_parser
!       extern public  RdfParser(RdfWorld world, 
                          String name,
                          String mime_type,
                          RdfUri type_uri);
  
!       // Constructor.
!       // librdf_new_parser_from_factory
!       extern public RdfParser(RdfWorld world, RdfParserFactory 
parser_factory);
  
  
  
                // librdf_get_parser_factory
!       /*
                librdf_parser_factory* librdf_get_parser_factory(librdf_world 
*world, 
                        const char *name, 
                        const char *mime_type, 
                        librdf_uri *type_uri);
!       */
! 
! 
!       public 
!               abstract 
!                       RdfParserFactory 
!                               GetParserFactory(
                                        RdfWorld world, 
                                        String name, 
--- 30,59 ----
        {
                // *factory
!               public  delegate void Factory(RdfParserFactory parser_factory);
                
                // librdf_parser_register_factory
!               public abstract void ParserRegisterFactory(RdfWorld world, 
String name, String mime_type, String uri_string, Factory parser_factory);
!               
!               // Constructor.
!               // librdf_new_parser
!               extern public  RdfParser(RdfWorld world, 
                          String name,
                          String mime_type,
                          RdfUri type_uri);
  
!               // Constructor.
!               // librdf_new_parser_from_factory
!               extern public RdfParser(RdfWorld world, RdfParserFactory 
parser_factory);
  
  
  
                // librdf_get_parser_factory
!               /*
                librdf_parser_factory* librdf_get_parser_factory(librdf_world 
*world, 
                        const char *name, 
                        const char *mime_type, 
                        librdf_uri *type_uri);
!               */
!               public abstract RdfParserFactory GetParserFactory(
                                        RdfWorld world, 
                                        String name, 
***************
*** 68,90 ****
  
  
- 
                // librdf_free_parser
!       public abstract void ParserFree(RdfParser parser);
  
                // librdf_parser_parse_as_stream
!       public abstract RdfStream ParserParseAsStream(RdfParser parser, RdfUri 
uri, RdfUri base_uri);
  
                // librdf_parser_parse_into_model
                // non-zero on failure
!       public abstract int ParserParseIntoModel(RdfParser parser, RdfUri uri, 
RdfUri base_uri, RdfModel model);
  
                // librdf_init_parser
!       public abstract void ParserInit(RdfWorld world);
  
                // librdf_finish_parser
!       public abstract void ParserFinish(RdfWorld world);
! 
                // *error_fn
!       public delegate void ErrorFn(IntPtr user_data, 
                                     String msg, 
                                     Object[] paramlist
--- 62,83 ----
  
  
                // librdf_free_parser
!               public abstract void ParserFree(RdfParser parser);
  
                // librdf_parser_parse_as_stream
!               public abstract RdfStream ParserParseAsStream(RdfParser parser, 
RdfUri uri, RdfUri base_uri);
  
                // librdf_parser_parse_into_model
                // non-zero on failure
!               public abstract int ParserParseIntoModel(RdfParser parser, 
RdfUri uri, RdfUri base_uri, RdfModel model);
  
                // librdf_init_parser
!               public abstract void ParserInit(RdfWorld world);
  
                // librdf_finish_parser
!               public abstract void ParserFinish(RdfWorld world);
!       
                // *error_fn
!               public delegate void ErrorFn(IntPtr user_data, 
                                     String msg, 
                                     Object[] paramlist
***************
*** 92,111 ****
                
                // librdf_parser_set_error
!       public abstract void ParserSetError(RdfParser parser, ErrorFn errorfn);
  
                // *warning_fn
!       public  delegate  void WarningFn(IntPtr user_data, 
                                       String msg, 
                                       Object[] paramlist);
  
                // librdf_parser_set_warning
!       public abstract void ParserSetWarning(RdfParser parser, IntPtr 
user_data, WarningFn warningfn);
  
                // librdf_parser_get_feature
!       public abstract String Feature(RdfParser parser, RdfUri feature);
  
                // librdf_parser_set_feature
                // return non-zero on failure ... negative if no such feature
!       public abstract int Feature(RdfParser parser, RdfUri feature, String 
value);
                
        }
--- 85,106 ----
                
                // librdf_parser_set_error
!               public abstract void ParserSetError(RdfParser parser, ErrorFn 
errorfn);
! 
  
                // *warning_fn
!               public delegate void WarningFn(IntPtr user_data, 
                                       String msg, 
                                       Object[] paramlist);
  
+ 
                // librdf_parser_set_warning
!               public abstract void ParserSetWarning(RdfParser parser, IntPtr 
user_data, WarningFn warningfn);
  
                // librdf_parser_get_feature
!               public abstract String Feature(RdfParser parser, RdfUri 
feature);
  
                // librdf_parser_set_feature
                // return non-zero on failure ... negative if no such feature
!               public abstract int Feature(RdfParser parser, RdfUri feature, 
String value);
                
        }

Index: RdfSerializer.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/dotgnu.rdf/RdfSerializer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** RdfSerializer.cs    15 Feb 2003 12:58:29 -0000      1.1
--- RdfSerializer.cs    15 Feb 2003 13:35:42 -0000      1.2
***************
*** 23,28 ****
  {
        using System;
-       using System.Xml;
-       using System.Collections;
  
        public abstract class RdfSerializer
--- 23,26 ----
***************
*** 34,63 ****
                protected FeatureTable featureTable;
                
!               public RdfSerializer(RdfWorld world, String name, String 
mimetype, RdfUri uri)
!               {
!                       world = world;
!                       featureTable = new FeatureTable();
!               }
! 
!               abstract void SetError(
  
                public String Uri
                {
-                       set
-                       {
-                               uri = value;
-                       }
                        get
                        {
                                return uri;
                        }
                }
-                               
-               abstract bool SetFeature(RdfUri name, String value);            
                
!               abstract bool GetFeature(RdfUri name);
! 
!               abstract void SerializeModel(String filename, RdfModel model, 
RdfUri baseuri);
                
        }
  
--- 32,60 ----
                protected FeatureTable featureTable;
                
!               public extern RdfSerializer(RdfWorld world, String name, String 
mimetype, RdfUri uri);
  
+               public abstract void SetError(IntPtr user_data, ErrorFn 
error_fn);
+                       
                public String Uri
                {
                        get
                        {
                                return uri;
                        }
+                       set
+                       {
+                               uri = value;
+                       }
+                       
                }
                
!               public abstract bool SetFeature(RdfUri name, String value);     
        
                
+               public abstract bool GetFeature(RdfUri name);
+ 
+               public abstract void SerializeModel(String filename, RdfModel 
model, RdfUri baseuri);
+ 
+               // *error_fn
+               public delegate void ErrorFn(IntPtr user_data, String msg, 
Object[] paramlist);
        }