[Corelinux-clcvs] CVS: clfw/clfw/Persist SchemaDataDescriptor.hpp,NONE,1.1 Makefile.am,1.6,1.7 Persist.hpp,1.5,1.6 SchemaAbstractStore.hpp,1.3,1.4

[Frank V. C. <fr...@us...>]

Update of /cvsroot/corelinux/clfw/clfw/Persist
In directory usw-pr-cvs1:/tmp/cvs-serv13712/clfw/Persist

Modified Files:
	Makefile.am Persist.hpp SchemaAbstractStore.hpp 
Added Files:
	SchemaDataDescriptor.hpp 
Log Message:
Refined schema store operations and objects

***** Error reading new file: [Errno 2] No such file or directory: 'SchemaDataDescriptor.hpp'
Index: Makefile.am
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Persist/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.am	2001/04/17 09:59:43	1.6
--- Makefile.am	2001/04/22 14:30:51	1.7
***************
*** 14,24 ****
  includedir	= @includedir@/Persist
  include_HEADERS	= Persist.hpp 	 \
! 	StoreSponsor.hpp		\
! 	StoreCatalog.hpp		\
! 	Store.hpp				\
! 	SchemaSponsor.hpp		\
! 	SchemaCatalog.hpp		\
! 	SchemaAbstractStore.hpp	\
! 	SchemaCatStore.hpp		\
  	SchemaStore.hpp
  	
--- 14,25 ----
  includedir	= @includedir@/Persist
  include_HEADERS	= Persist.hpp 	 \
! 	StoreSponsor.hpp			\
! 	StoreCatalog.hpp			\
! 	Store.hpp					\
! 	SchemaDataDescriptor.hpp	\
! 	SchemaSponsor.hpp			\
! 	SchemaCatalog.hpp			\
! 	SchemaAbstractStore.hpp		\
! 	SchemaCatStore.hpp			\
  	SchemaStore.hpp
  	

Index: Persist.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Persist/Persist.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Persist.hpp	2001/04/15 16:36:08	1.5
--- Persist.hpp	2001/04/22 14:30:51	1.6
***************
*** 40,48 ****
  //
  
! #define INCL_SchemaSponsor                  <clfw/Persist/SchemaSponsor.hpp>
! #define INCL_SchemaCatalog                  <clfw/Persist/SchemaCatalog.hpp>
! #define INCL_SchemaAbstractStore            <clfw/Persist/SchemaAbstractStore.hpp>
! #define INCL_SchemaCatStore                 <clfw/Persist/SchemaCatStore.hpp>
! #define INCL_SchemaStore                    <clfw/Persist/SchemaStore.hpp>
  
  /*
--- 40,49 ----
  //
  
! #define  INCL_SchemaDataDescriptor           <clfw/Persist/SchemaDataDescriptor.hpp>
! #define  INCL_SchemaSponsor                  <clfw/Persist/SchemaSponsor.hpp>
! #define  INCL_SchemaCatalog                  <clfw/Persist/SchemaCatalog.hpp>
! #define  INCL_SchemaAbstractStore            <clfw/Persist/SchemaAbstractStore.hpp>
! #define  INCL_SchemaCatStore                 <clfw/Persist/SchemaCatStore.hpp>
! #define  INCL_SchemaStore                    <clfw/Persist/SchemaStore.hpp>
  
  /*

Index: SchemaAbstractStore.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Persist/SchemaAbstractStore.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SchemaAbstractStore.hpp	2001/04/21 21:39:01	1.3
--- SchemaAbstractStore.hpp	2001/04/22 14:30:51	1.4
***************
*** 30,42 ****
  #endif
  
  namespace   corelinux
  {
-    struct __SchemaDD
-    {
-       char     *data;
-       Dword    dataSize;
-    } ;
- 
-    DECLARE_TYPE( struct __SchemaDD, SchemaDataDescriptor );
  
     DECLARE_CLASS( SchemaAbstractStore );
--- 30,39 ----
  #endif
  
+ #if   !defined(__SCHEMADATADESCRIPTOR_HPP)
+ #include <clfw/Persist/SchemaDataDescriptor.hpp>
+ #endif
+ 
  namespace   corelinux
  {
  
     DECLARE_CLASS( SchemaAbstractStore );
***************
*** 95,108 ****
     protected:
  
!                void                 closeStore( void );
!                bool                 exists( CharPtr );
!                Handle               openRead( CharPtr );
!                Handle               openWrite( CharPtr );
!                bool                 hasKey( CharPtr );
!                void                 updateDesc( CharPtr, SchemaDataDescriptorCref );
!                SchemaDataDescriptor fetchDesc( CharPtr );
!                SchemaDataDescriptor fetchDesc( SchemaDataDescriptorCref );
!                SchemaDataDescriptor fetchFirstKey( void );
!                SchemaDataDescriptor fetchNextKey( SchemaDataDescriptorCref );
  
     protected:
--- 92,133 ----
     protected:
  
!                void     closeStore( void );
!                bool     exists( CharPtr );
!                Handle   openRead( CharPtr );
!                Handle   openWrite( CharPtr );
!                bool     hasKey( CharPtr );
! 
!                void     updateDesc
!                   ( 
!                      CharPtr, 
!                      SchemaDataDescriptorCref 
!                   );
! 
!                void     updateDesc
!                   ( 
!                      CharPtr, 
!                      Int,
!                      CharPtr
!                   );
! 
!                void  fetchDesc
!                   ( 
!                      CharPtr, 
!                      SchemaDataDescriptorRef
!                   );
! 
!                void  fetchDesc
!                   ( 
!                      SchemaDataDescriptorCref, 
!                      SchemaDataDescriptorRef
!                   );
! 
!                void  fetchFirstKey( SchemaDataDescriptorRef );
! 
!                void  fetchNextKey
!                   ( 
!                      SchemaDataDescriptorCref , 
!                      SchemaDataDescriptorRef
!                   );
  
     protected: