Changeset 114 for trunk/gsdl/src/colservr

Timestamp:

1999-01-19T14:38:20+13:00 (25 years ago)

Author:

rjmcnab

Message:

Made the source more portable.

Location:

trunk/gsdl/src/colservr

Files:

• gdbmclass.cpp (modified) (2 diffs)
• mgsearch.cpp (modified) (8 diffs)
• querycache.cpp (modified) (2 diffs)
• queryinfo.h (modified) (2 diffs)

trunk/gsdl/src/colservr/gdbmclass.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/01/19 01:38:15  rjmcnab
+
+   Made the source more portable.
+
    Revision 1.2  1999/01/12 01:51:01  rjmcnab
 
@@ -31 +35 @@
 #include <string.h>
 
-#ifndef USE_OBJECTSPACE
+#if defined(GSDL_NEED_STRINGS_H)
+#include <strings.h>
+#endif
+
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\algorithm>
+#elif defined(GSDL_USE_STL_H)
+#  if defined(GSDL_USE_ALGO_H)
+#    include <algo.h>
+#  else
+#    include <algorithm.h>
+#  endif
+#else
 #  include <algorithm>
-#else
-#  include <ospace\std\algorithm>
 #endif
 

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/01/19 01:38:17  rjmcnab
+
+   Made the source more portable.
+
    Revision 1.2  1999/01/12 01:51:02  rjmcnab
 
@@ -23 +27 @@
 
 
+#include "gsdlconf.h"
 #include "mgsearch.h"
 
@@ -30 +35 @@
 #include <ctype.h>
 
-#ifdef __GNUG__
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\iostream>
+#elif defined(GSDL_USE_IOS_H)
 #  include <iostream.h>
-#  include <gdbm.h>
-
 #else
-#  ifndef USE_OBJECTSPACE
-#    include <iostream>
-#  else
-#    include <ospace\std\iostream>
-#  endif
-
+#  include <iostream>
+#endif
+
+#if defined(__WIN32__)
 // gdbm stuff
 #  include "autoconf.h"
@@ -46 +49 @@
 #  include "gdbmconst.h"
 #  include "gdbm.h"
+#else
+#  include <gdbm.h>
 #endif
+
   
 #include <assert.h>
@@ -203 +209 @@
 // it assumes that cache_num is set up correctly to point to
 // a suitable result cache
-int ourquerycallback(char *UDoc, int ULen, int DocNum, 
+int ourquerycallback(char *UDoc, int /*ULen*/, int DocNum, 
              float Weight, void *info) {
 
@@ -227 +233 @@
 // This callback is called once for each term in the query
 int termfreqcallback(char *Word, int ULen,  int Freq, 
-             float Weight,  void *info) {
+             float /*Weight*/,  void *info) {
   queryresultsclass *queryresults = (queryresultsclass *)info;
 
@@ -241 +247 @@
 
 // this callback is called once for each variation of each term
-int termscallback(char *Word, int ULen, int Freq,
-          float Weight, void *info) {
+int termscallback(char *Word, int ULen, int /*Freq*/,
+          float /*Weight*/, void *info) {
 
   text_t term;
@@ -253 +259 @@
 
 // This callback is for getting document text
-int doctextcallback(char *Word, int ULen,  int Freq, 
-            float Weight,  void *info) {
+int doctextcallback(char *Word, int ULen,  int /*Freq*/, 
+            float /*Weight*/,  void *info) {
   text_t *output = (text_t *)info;
   if (output == NULL) return 0;

trunk/gsdl/src/colservr/querycache.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/01/19 01:38:17  rjmcnab
+
+   Made the source more portable.
+
    Revision 1.2  1999/01/12 01:51:02  rjmcnab
 
@@ -94 +98 @@
   for (i=0; i < maxcachesize; i++)
     {
-      if (resultcache[i].accessnum < minaccessnum)
+      if (resultcache[i].accessnum < minaccessnum) {
+    minaccessnum = resultcache[i].accessnum;
     minaccessi = i;
+      }
     }
 
-  return i;
+  return minaccessi;
 }
 

trunk/gsdl/src/colservr/queryinfo.h

@@ -15 +15 @@
 
 
+#include "gsdlconf.h"
 #include "text_t.h"
 
-#ifndef USE_OBJECTSPACE
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace\std\vector>
+#  include <ospace\std\algorithm>
+#elif defined(GSDL_USE_STL_H)
+#  include <vector.h>
+#  if defined(GSDL_USE_ALGO_H)
+#    include <algo.h>
+#  else
+#    include <algorithm.h>
+#  endif
+#else
 #  include <vector>
 #  include <algorithm>
-#else
-#  include <ospace\std\vector>
-#  include <ospace\std\algorithm>
 #endif
 
@@ -75 +83 @@
 {
 public:
+  docresultclass(void) {docnum=-1;docweight=0.0;};
+  ~docresultclass(void) {};
+
   int docnum;
   float docweight;