Changeset 23701 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp

Timestamp:

2011-02-15T13:12:21+13:00 (13 years ago)

Author:

sjm84

Message:

A few more fixes for 64-bit mgpp

File:

• main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp (modified) (2 diffs)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp

@@ -140 +140 @@
 }
 
-static u_long GetStemMethod(LexEl &el, int defaultStemMethod) {
+static mg_u_long GetStemMethod(LexEl &el, int defaultStemMethod) {
   // here expect el to contain some of c,s,i,u,f,a -- see mg_files.h CHAR_FLAG_STEM_* constants
-  u_long stem = (u_long)defaultStemMethod;
+  mg_u_long stem = (mg_u_long)defaultStemMethod;
       
   UCArray::const_iterator here = el.text.begin();
@@ -205 +205 @@
     if (termNode.stemMethod == STEM_INVALID) { // error so backtrack
       here = oldHere;
-      termNode.stemMethod = (u_long)defaultStemMethod;
+      termNode.stemMethod = (mg_u_long)defaultStemMethod;
     } 
       } else here = oldHere; //ignore - wrong syntax