Changeset 17476 for gsdl/trunk/runtime-src

Timestamp:

2008-10-03T16:00:50+13:00 (16 years ago)

Author:

mdewsnip

Message:

Support for using MSSQL for infodb databases, many thanks to Jeffrey Ke from DL Consulting Ltd. (​http://www.dlconsulting.com). Please note that MSSQL only runs on Windows, and requires some setup before use. Documentation will be added to the Greenstone Wiki explaining this.

Location:

gsdl/trunk/runtime-src

Files:

• src/colservr/collectset.cpp (modified) (2 diffs)
• src/colservr/win32.mak (modified) (2 diffs)
• win32.mak (modified) (2 diffs)

gsdl/trunk/runtime-src/src/colservr/collectset.cpp

@@ -48 +48 @@
 #endif
 
+#ifdef USE_MSSQL
+#include "mssqldbclass.h"
+#endif
+
+
 collectset::collectset (text_t& gsdlhome, text_t& collecthome) 
 {
@@ -251 +256 @@
   }
 #endif
-
+  
+#ifdef USE_MSSQL
+  if (infodbtype == "mssql")
+  {
+    mssqldbclass *mssql_db_ptr = new mssqldbclass();
+    db_ptr = mssql_db_ptr;
+
+    // add a sql browse filter
+    sqlbrowsefilterclass *sqlbrowsefilter = new sqlbrowsefilterclass();
+    sqlbrowsefilter->set_sql_db_ptr(mssql_db_ptr);
+    cserver->add_filter (sqlbrowsefilter);  
+  }
+#endif
+  
   // Use GDBM if the infodb type is empty or not one of the values above
   if (db_ptr == NULL)

gsdl/trunk/runtime-src/src/colservr/win32.mak

@@ -36 +36 @@
 DLLDEBUG = 0
 USE_SQLITE = 0
+USE_MSSQL = 0
 
 
@@ -60 +61 @@
 !ENDIF
 
+!IF $(USE_MSSQL)
+MSSQL_DEFINES = -DUSE_MSSQL
+!ELSE
+MSSQL_DEFINES = 
+!ENDIF
+
 
 AR = lib
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
-        -DXML_STATIC $(SQLITE_DEFINES)
+        -DXML_STATIC $(SQLITE_DEFINES) $(MSSQL_DEFINES)
 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" \

gsdl/trunk/runtime-src/win32.mak

@@ -33 +33 @@
 DLLDEBUG = 0
 USE_SQLITE = 0
+USE_MSSQL = 0
 USE_Z3950 = 0
 
@@ -61 +62 @@
 !IF $(USE_SQLITE)
 MAKECMD = $(MAKECMD) USE_SQLITE=1
+!ENDIF
+!IF $(USE_MSSQL)
+MAKECMD = $(MAKECMD) USE_MSSQL=1
 !ENDIF
 !IF $(USE_Z3950)