Changeset 12881 for trunk

Timestamp:

2006-09-28T10:28:56+12:00 (18 years ago)

Author:

kjdon

Message:

Accent folding patch thanks to Juan Grigera. file suffixes with numbers in them now generated using a pattern and make suffix. added some #defines for stem/case flags for use with query parser

File:

• trunk/gsdl/src/mgpp/text/mg_files.h (modified) (3 diffs)

trunk/gsdl/src/mgpp/text/mg_files.h

@@ -51 +51 @@
 #define MAGIC_PARAGRAPH     GEN_MAGIC('M','G','P', 0 )
 /* [RPAP - Jan 97: Stem Index Change] */
-#define MAGIC_STEM_1            GEN_MAGIC('M','G','s','1')
-#define MAGIC_STEM_2            GEN_MAGIC('M','G','s','2')
-#define MAGIC_STEM_3            GEN_MAGIC('M','G','s','3')
-
+/* [JFG - Mar 06: Accent folding patch] */
+enum stemMethods {
+    STEM_None       =   0,
+    STEM_CaseFolding    =   0x1,
+    STEM_Stemming       =   0x2,
+    STEM_AccentFolding  =   0x4,
+};
+
+/* This is for the QueryParser */
+#define CHAR_FLAG_STEM_CaseFold    'i'  // ignore case
+#define CHAR_FLAG_STEM_NoCaseFold  'c'  // case sensitive
+#define CHAR_FLAG_STEM_Stemming    's'  // stem words
+#define CHAR_FLAG_STEM_NoStemming  'u'  // do not stem words
+#define CHAR_FLAG_STEM_AccentFold  'f'  // accent fold
+#define CHAR_FLAG_STEM_NoAccentFold  'a'    // do no accent folding
+#define CHAR_FLAG_STEM_Validator  "icsufa"  // all of the above
+
+
+#define STEM_MIN 1
+#define STEM_MAX (STEM_CaseFolding | STEM_Stemming | STEM_AccentFolding)
+#define STEM_PARTIAL_MATCH  (STEM_MAX+1)
+#define STEM_INVALID        (STEM_MAX+2)
+#define MAGIC_STEM_GEN(x)       GEN_MAGIC('M', 'G', 's', x)
 #define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
 
@@ -219 +238 @@
 
 /* [RPAP - Jan 97: Stem Index Change] */
+/* [JFG - Mar 06: Accent folding patch] 
+ * Use the pattern with make_suffix */
 /* The casefolded index into the stemmed dictionary */
 #ifdef SHORT_SUFFIX
-# define INVF_DICT_BLOCKED_1_SUFFIX ".ib1"
-#else
-# define INVF_DICT_BLOCKED_1_SUFFIX ".invf.dict.blocked.1"
-#endif
-
-/* [RPAP - Jan 97: Stem Index Change] */
-/* The stemmed index into the stemmed dictionary */
-#ifdef SHORT_SUFFIX
-# define INVF_DICT_BLOCKED_2_SUFFIX ".ib2"
-#else
-# define INVF_DICT_BLOCKED_2_SUFFIX ".invf.dict.blocked.2"
-#endif
-
-/* [RPAP - Jan 97: Stem Index Change] */
-/* The casefolded and stemmed  index into the stemmed dictionary */
-#ifdef SHORT_SUFFIX
-# define INVF_DICT_BLOCKED_3_SUFFIX ".ib3"
-#else
-# define INVF_DICT_BLOCKED_3_SUFFIX ".invf.dict.blocked.3"
-#endif
+# define INVF_DICT_BLOCKED_SUFFIX_PAT ".ib%d"
+#else
+# define INVF_DICT_BLOCKED_SUFFIX_PAT ".invf.dict.blocked.%d"
+#endif
+
 
 /* [RPAP - Feb 97: WIN32 Port] */
@@ -264 +270 @@
 char *make_name (const char *name, const char *suffix, char *buffer);
 
-
+/* [JFG - Mar 06: Accent folding patch] */
+/* This generates the suffix of a file. It places the name in the buffer
+   specified or if that is NULL it uses a static buffer. */
+char *make_suffix (const char *suffix_format, const char suffix_arg, char *buffer);