Changeset 115 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:

• mgq.c (modified) (19 diffs)
• mgq.h (modified) (1 diff)

trunk/gsdl/src/colservr/mgq.c

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/01/19 01:38:16  rjmcnab
+   Made the source more portable.
+
    Revision 1.2  1999/01/12 01:51:02  rjmcnab
 
@@ -128 +131 @@
 }
 
-static int ProcessDocs (query_data * qd, int num, int skip, int howmany, int verbatim,
-            enum result_kinds kind, FILE * Output,
+static int ProcessDocs (query_data * qd, int skip, int howmany, 
+            enum result_kinds kind, 
             int (*sender)(char *,int,int,float,void *), void *ptr)
 {
@@ -150 +153 @@
     {
       u_char *UDoc = NULL;
-      unsigned long ULen;
+      unsigned long ULen=0;
       
       if (need_text)
@@ -179 +182 @@
         case result_docs:
           if (sender != NULL)
-        output_failure = (*sender)(UDoc,ULen,docnum,GetDocWeight(qd),ptr);
+        output_failure = (*sender)((char *)UDoc,ULen,docnum,GetDocWeight(qd),ptr);
           break;
         default:
@@ -202 +205 @@
                   int (*sender)(char *,int,int,float,void *), void *ptr)
 {
-  int i;
+  int i = 0;
   for (i = 0; i < qtl->num; i++)
     if (sender != NULL) {
       /*      word = word2str(qtl->QTE[i].Term); 
           (* sender)(word, strlen(word), qtl->QTE[i].Count, (float)0.0, ptr); */
-      (* sender)(qtl->QTE[i].Term+1, qtl->QTE[i].Term[0], 
+      (* sender)((char *)(qtl->QTE[i].Term+1), qtl->QTE[i].Term[0], 
          qtl->QTE[i].Count, (float)0.0, ptr);
     }
@@ -222 +225 @@
       /*      word = word2str(qtl->TE[i].Word);
           (* sender)(word, strlen(word), qtl->TE[i].Count, (float)0.0, ptr);*/
-      (* sender)(qtl->TE[i].Word+1, qtl->TE[i].Word[0], 
+      (* sender)((char *)(qtl->TE[i].Word+1), qtl->TE[i].Word[0], 
          qtl->TE[i].Count, (float)0.0, ptr);
     }
@@ -243 +246 @@
   case result_docnums:
     if (qd->num_of_ans > 0)
-      ProcessDocs (qd, qd->DL->num, skip, howmany,
-           BooleanEnv (GetEnv ("verbatim"), 1),
-           kind, NULL, sender, ptr);
+      ProcessDocs (qd, skip, howmany, kind, sender, ptr);
     break;
   case result_termfreqs:
@@ -267 +268 @@
 /* init_dbcache should be called at the start of each */
 /* function which deals with the database cache */
-static void init_dbcache () {
+static void init_dbcache (void) {
   static int dbcacheinited = 0;
-  int i;
+  int i = 0;
 
   if (dbcacheinited) return;
@@ -288 +289 @@
 
 /* returns the next cache access number and increments it */
-static int get_next_accessnum () {
+static int get_next_accessnum (void) {
   return cache_nextaccessnum++;
 }
@@ -295 +296 @@
 /* was used the longest time ago */
 /* init_dbcache should be called before this function */
-static int get_free_dbcache () {
-  int i;
+static int get_free_dbcache (void) {
+  int i = 0;
   int minaccessnum = cache_nextaccessnum; /* the current max */
   int minpos = 0;
@@ -315 +316 @@
 /* init_dbcache should be called before this function */
 static int search_doc_collect (char *collection) {
-  int i;
+  int i = 0;
 
   for (i=0; i<MAXNUMDATABASEINFO; i++) {
@@ -334 +335 @@
 /* init_dbcache should be called before this function */
 static int search_gensuffix (char *gensuffix) {
-  int i;
+  int i = 0;
 
   for (i=0; i<MAXNUMDATABASEINFO; i++) {
@@ -423 +424 @@
 int mgq_ask(char *line)
 {
-  query_data *qd = NULL;
-  char QueryType;  char OutputType;  char *LinePtr;
+  query_data *qd = (query_data *)NULL;
+  char QueryType = QUERY_BOOLEAN;
+  char OutputType = QUERY_DOCNUMS;
+  char *LinePtr = (char *)NULL;
 
   if (cur_cachenum == -1) return 0;
@@ -461 +464 @@
     case QUERY_BOOLEAN:
       {
-    char *maxdocs;
+    char *maxdocs = (char *)NULL;
     BooleanQueryInfo bqi;
     maxdocs = GetDefEnv ("maxdocs", "all");
@@ -477 +480 @@
     case QUERY_RANKED:
       {
-    char *maxdocs;
-    char *maxterms;
-    char *maxaccum;
+    char *maxdocs = (char *)NULL;
+    char *maxterms = (char *)NULL;
+    char *maxaccum = (char *)NULL;
     RankedQueryInfo rqi;
     maxdocs = GetDefEnv ("maxdocs", "all");
@@ -547 +550 @@
 
 
-int is_dbcache_full () {
+int is_dbcache_full (void) {
   init_dbcache ();
   if (cache_numloaded >= MAXNUMDATABASEINFO) return 1;
@@ -555 +558 @@
 int load_database (char *collection, char *mgdir, 
            char *gensuffix, char *textsuffix) {
-  int i;
+  int i = 0;
   query_data *qd = NULL;
   /*  FILE *deb = NULL; */
@@ -608 +611 @@
 /* specified collection current */
 int load_text_database (char *collection) {
-  int i;
+  int i = 0;
   init_dbcache ();
 
@@ -622 +625 @@
 }
 
-void close_all_databases () {
-  int i;
+void close_all_databases (void) {
+  int i = 0;
   init_dbcache ();
   

trunk/gsdl/src/colservr/mgq.h

@@ -31 +31 @@
 
 
-int is_dbcache_full ();
+int is_dbcache_full (void);
 int load_database (char *collection, char *mgdir, char *gensuffix, char *textsuffix);
 int load_text_database (char *collection);
-void close_all_databases ();
+void close_all_databases (void);