Changeset 324 for trunk/gsdl/src/colservr

Timestamp:

1999-07-01T15:52:05+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added a function to get the equivalent terms of a query term. I also
fixed a small bug that was causing massive slowdown :-

Location:

trunk/gsdl/src/colservr

Files:

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

trunk/gsdl/src/colservr/mgq.c

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/07/01 03:52:05  rjmcnab
+   Added a function to get the equivalent terms of a query term. I also
+   fixed a small bug that was causing massive slowdown :-^
+
    Revision 1.5  1999/06/30 04:04:11  rjmcnab
    made stemming functions available from mgsearch and made the stems
@@ -67 +71 @@
 #include "words.h"
 #include "stemmer.h"
+#include "stem_search.h"
   
 #ifdef __cplusplus
@@ -214 +219 @@
   } while (NextDoc (qd) && output_failure == 0 && --howmany > 0);
   
-  if (need_text) FreeTextBuffer (qd);
+  /*  if (need_text) FreeTextBuffer (qd);*/
   
   return (DocCount);
@@ -567 +572 @@
 }
 
+/* get all the terms that match wordstem using the current stemmer and */
+/* stemming method. The callback is the same style used by mgq_results */
+int mgq_equivterms (unsigned char *wordstem, int (*sender)(char *, int, int, float, void *),
+            void *ptr) {
+  int stem_method = 0;
+  query_data *qd = NULL;
+  TermList *equivterms = NULL;  /* used for equivalent terms */
+
+  if (cur_cachenum == -1) return 0;
+  qd = dbcache[cur_cachenum].qd;
+  if (qd == NULL || wordstem == NULL || sender == NULL) return 0;
+
+  if (qd->sd->sdh.indexed) {
+    stem_method = BooleanEnv(GetEnv("casefold"),0) | (BooleanEnv(GetEnv("stem"),0) << 1);
+  } else {
+    stem_method = qd->sd->sdh.stem_method;
+  }
+
+  /* make the term list */
+  equivterms = MakeTermList (0);
+  
+  /* expand out this word */
+  if (FindWords (qd->sd, wordstem, stem_method, &equivterms) > 0) {
+    int i;
+    for (i=0; i < equivterms->num; i++) {
+      (* sender)((char *)(equivterms->TE[i].Word+1), equivterms->TE[i].Word[0], 
+         equivterms->TE[i].Count, (float)0.0, ptr);
+    }
+  }
+
+  /* free the term list */
+  if (equivterms != NULL) FreeTermList (&equivterms);
+
+  return 0;
+}
 
 /* use mgq_getmaxstemlen to determine the length of the word stems to pass */
@@ -628 +668 @@
   /* search for the index */
   i = search_gensuffix (gensuffix);
-  if (i > 0) {
+  if (i >= 0) {
     make_current (i);
     return 1;

trunk/gsdl/src/colservr/mgq.h

@@ -27 +27 @@
 
 int mgq_ask(char *line);
-int mgq_results(enum result_kinds kind,int skip, int howmany,
+int mgq_results(enum result_kinds kind, int skip, int howmany,
         int (*sender)(char *, int, int, float, void *), void *ptr);
 int mgq_numdocs(void);
 int mgq_numterms(void);
 
+/* get all the terms that match wordstem using the current stemmer and */
+/* stemming method. The callback is the same style used by mgq_results */
+int mgq_equivterms (unsigned char *wordstem, int (*sender)(char *, int, int, float, void *),
+            void *ptr);
+  
 /* use mgq_getmaxstemlen to determine the length of the word stems to pass */
 /* to mgq_stemword */