Changeset 12915

Timestamp:

2006-09-28T16:58:10+12:00 (18 years ago)

Author:

kjdon

Message:

the compilation of the accent folding stuff (which needs unac package and iconv library) is now under the control of ENABLE_ACCENTFOLD, which gets defined in the CFLAGS if we want accent folding. turn it off in the mgpp/src/text/Makefile

Location:

trunk/gsdl/src/mgpp/text

Files:

• Makefile.in (modified) (4 diffs)
• Queryer.cpp (modified) (3 diffs)
• mgpp_stem_idx.cpp (modified) (2 diffs)
• stemmer.cpp (modified) (4 diffs)

trunk/gsdl/src/mgpp/text/Makefile.in

@@ -24 +24 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+
+ENABLE_ACCENTFOLD = 1
+ifeq ($(ENABLE_ACCENTFOLD), 1)
+AFLIBS = ../../../packages/unac/libunac.a 
+AFINCLUDES = -I../../../packages/unac
+AFFLAGS = -DENABLE_ACCENTFOLD
+else
+AFLIBS = 
+AFINCLUDES =
+AFFLAGS = 
+endif
 
 SHELL = /bin/sh
@@ -37 +48 @@
 CC = @CC@
 CXX = @CXX@
-CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
-CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX
+CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
+CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
 DEFS = @DEFS@
 RANLIB = @RANLIB@
@@ -45 +56 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
-LIBS = ../lib/libmg.a ../../../packages/unac/libunac.a -lstdc++ @LIBS@
+LIBS = ../lib/libmg.a  $(AFLIBS) -lstdc++ @LIBS@
 TOUCH = echo timestamp >
 AWK = @AWK@
@@ -95 +106 @@
 
 # want toplevel config.h, not local mg one
-INCLUDES = -I../../.. -I../lib -I. -I../../../packages/unac
+INCLUDES = -I../../.. -I../lib -I. $(AFINCLUDES)
 
 #############################################################################

trunk/gsdl/src/mgpp/text/Queryer.cpp

@@ -50 +50 @@
        << "\t.c0/.c1\t\tcasefolding off/on\n"
        << "\t.s0/.s1\t\tstemming off/on\n"
+#ifdef ENABLE_ACCENTFOLD
        << "\t.a0/.a1\t\taccentfolding off/on\n"
+#endif
        << "\t.o0/.o1\t\tshort output off/on\n"
        << "\t.m\t\tset maxnumeric (enter the number at the prompt)\n\n"
@@ -221 +223 @@
     }
       }      
+#ifdef ENABLE_ACCENTFOLD
       else if (queryArray[1] == 'a') { // accentfolding - on/off
     if (queryArray[2] == '1') defaultStemMethod |= STEM_AccentFolding;
@@ -228 +231 @@
     }
       }
+#endif
       else if (queryArray[1] == 'o') { // output - short/long
     if (queryArray[2] == '1') shortOutput = true;

trunk/gsdl/src/mgpp/text/mgpp_stem_idx.cpp

@@ -216 +216 @@
     case '?':
       fprintf (stderr, "usage: %s [-d directory] "
-           "[-b entries-per-block] [-h] -s 1|2|3 "
-           "[-a stemmer-method] -f name\n", argv[0]);
+           "[-b entries-per-block] [-h] -s 1|2|3", argv[0]);
+#ifdef ENABLE_ACCENTFOLD
+      fprintf (stderr, "|4|5|6|7");
+#endif
+      fprintf (stderr, " [-a stemmer-method] -f name\n");
       exit (1);
     }
@@ -225 +228 @@
   if (stemMethod < STEM_MIN || stemMethod > STEM_MAX) 
     FatalError (1, "Stem method must be between %d and %d", STEM_MIN, STEM_MAX);
-
+#ifndef ENABLE_ACCENTFOLD
+  if (stemMethod & STEM_AccentFolding) {
+    // accent folding not enabled
+    return -1;
+  }
+#endif
   // read in the dictionary and create the in memory dictionary
   StemMapDict stemDict;

trunk/gsdl/src/mgpp/text/stemmer.cpp

@@ -27 +27 @@
 #include "unitool.h"
 
+#ifdef ENABLE_ACCENTFOLD
 /* [JFG - Mar 06: Accent folding patch] */
 #include "unac.h"
+#endif
 
 #define LOVINSTEMMER        0
@@ -55 +57 @@
 }
 
+#ifdef ENABLE_ACCENTFOLD
 /* [JFG - Mar 06: Accent folding patch] */
 /* =========================================================================
@@ -75 +78 @@
   return;
 }
-
+#endif
       
 int mgpp_stemmernumber (u_char *stemmerdescription) {
@@ -123 +126 @@
   }
 
+#ifdef ENABLE_ACCENTFOLD
   if (method & STEM_AccentFolding) {
     mgpp_unicode_accentfold (word);
   }
+#endif
 
   if (method & STEM_Stemming) {