Changeset 819 for trunk

Timestamp:

1999-12-11T04:02:41+13:00 (24 years ago)

Author:

cs025

Message:

Omission of stemmer number in parameters to stemmer and parser corrected

File:

• trunk/gsdl/packages/mg/src/text/bool_parser.y (modified) (6 diffs)

trunk/gsdl/packages/mg/src/text/bool_parser.y

@@ -49 +49 @@
 static bool_tree_node *tree_base = NULL;
 static TermList **term_list;
+static int stemmer_num;
 static int stem_method;
 /* [RPAP - Jan 97: Stem Index Change] */
@@ -77 +78 @@
  
  
-term:     TERM  { $$ = CreateBoolTermNode(term_list, $1, 1, word_num, count, doc_count, invf_ptr, invf_len); }
+term:     TERM  { $$ = CreateBoolTermNode(term_list, $1, 1, word_num, count, doc_count, invf_ptr, invf_len, stemmer_num); }
         | '(' or ')' { $$ = $2; }
         | '*' { $$ = CreateBoolTreeNode(N_all, NULL, NULL); }
@@ -139 +140 @@
     buf_ptr++;
  
-      if (INAWORD(*buf_ptr))
+      if (inaword(buf_ptr, end))
     {
       static char word[MAXSTEMLEN + 1]; /* [RJM 07/98: Memory Leak] */
@@ -168 +169 @@
 
       bcopy ((char *) word, (char *) sWord, *word + 1);
-      stemmer (stem_to_apply, sWord);
+      stemmer (stem_to_apply, stemmer_num, sWord);
 
       if (stem_to_apply == 0 || !indexed || p__sd == NULL)
@@ -290 +291 @@
 bool_tree_node *
 ParseBool(char *query_line, int query_len,
-          TermList **the_term_list, int the_stem_method, int *res,
+          TermList **the_term_list, int the_stemmer_num, int the_stem_method, int *res,
       stemmed_dict * the_sd, int is_indexed,   /* [RPAP - Jan 97: Stem Index Change] */
       QueryTermList **the_query_term_list)  /* [RPAP - Feb 97: Term Frequency] */
@@ -296 +297 @@
   /* global variables to be accessed by bison/yacc created parser */
   term_list = the_term_list;
+  stemmer_num = the_stemmer_num;
   stem_method = the_stem_method;
   ch_buf = query_line;