[naviserver-commits] modules/nsdbbdb Makefile,1.1.1.1,1.2 nsdbbdb.c,1.1,1.2

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsdbbdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6694

Modified Files:
	Makefile nsdbbdb.c 
Log Message:
removed old compat functions


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdbbdb/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	20 May 2005 20:37:12 -0000	1.1.1.1
--- Makefile	1 Aug 2005 19:30:26 -0000	1.2
***************
*** 6,15 ****
  # Module name
  #
! MOD      =  nsberkeleydb.so
  
  #
  # Objects to build.
  #
! OBJS     = nsberkeleydb.o
  MODLIBS  = -ldb
  
--- 6,15 ----
  # Module name
  #
! MOD      =  nsdbbdb.so
  
  #
  # Objects to build.
  #
! OBJS     = nsdbbdb.o
  MODLIBS  = -ldb
  

Index: nsdbbdb.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdbbdb/nsdbbdb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nsdbbdb.c	17 Jun 2005 02:44:45 -0000	1.1
--- nsdbbdb.c	1 Aug 2005 19:30:26 -0000	1.2
***************
*** 119,125 ****
      Ns_DStringInit(&ds);
      configPath = Ns_ConfigGetPath(0,0,"db","pool",hModule);
!     if(!(dbDelimiter = Ns_ConfigGet(configPath,"delimiter"))) dbDelimiter = "\n";
!     if((dbHome = Ns_ConfigGet(configPath,"home"))) Ns_DStringAppend(&ds,dbHome);
!     if(!ds.length) Ns_DStringPrintf(&ds,"%s/db",Ns_InfoHome());
      dbHome = ns_strdup(ds.string);
      Ns_ConfigGetInt(configPath,"pagesize",&dbPageSize);
--- 119,125 ----
      Ns_DStringInit(&ds);
      configPath = Ns_ConfigGetPath(0,0,"db","pool",hModule);
!     if(!(dbDelimiter = Ns_ConfigGetValue(configPath,"delimiter"))) dbDelimiter = "\n";
!     if((dbHome = Ns_ConfigGetValue(configPath,"home"))) Ns_DStringAppend(&ds,dbHome);
!     if(!ds.length) Ns_DStringPrintf(&ds,"%s/db",Ns_InfoHomePath());
      dbHome = ns_strdup(ds.string);
      Ns_ConfigGetInt(configPath,"pagesize",&dbPageSize);
***************
*** 129,137 ****
  
      // Db flags
!     if(!(str = Ns_ConfigGet(configPath,"dbflags"))) str = "";
      if(strstr(str,"dup")) dbDbFlags |= DB_DUP;
  
      // Environment flags
!     if(!(str = Ns_ConfigGet(configPath,"envflags"))) str = "";
      if(!strstr(str,"nolock")) dbEnvFlags |= DB_INIT_LOCK;
      if(!strstr(str,"nolog")) dbEnvFlags |= DB_INIT_LOG;
--- 129,137 ----
  
      // Db flags
!     if(!(str = Ns_ConfigGetValue(configPath,"dbflags"))) str = "";
      if(strstr(str,"dup")) dbDbFlags |= DB_DUP;
  
      // Environment flags
!     if(!(str = Ns_ConfigGetValue(configPath,"envflags"))) str = "";
      if(!strstr(str,"nolock")) dbEnvFlags |= DB_INIT_LOCK;
      if(!strstr(str,"nolog")) dbEnvFlags |= DB_INIT_LOG;
***************
*** 517,521 ****
  DbServerInit(char *hServer, char *hModule, char *hDriver)
  {
!     return Ns_TclInitInterps(hServer,DbInterpInit,NULL);
  }
  
--- 517,522 ----
  DbServerInit(char *hServer, char *hModule, char *hDriver)
  {
!     Ns_TclRegisterTrace(hServer, DbInterpInit, 0, NS_TCL_TRACE_CREATE);
!     return NS_OK;
  }