Changeset 23701 for main/branches/64_bit_Greenstone/greenstone2

Timestamp:

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

Author:

sjm84

Message:

A few more fixes for 64-bit mgpp

Location:

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp

Files:

• lib/bitio_m_stdio.h (modified) (1 diff)
• lib/win32in.h (modified) (1 diff)
• text/GSDLQueryParser.cpp (modified) (2 diffs)
• text/Queryer.cpp (modified) (1 diff)
• text/mgpp_decompress_text.cpp (modified) (1 diff)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.h

@@ -50 +50 @@
   mg_u_long GetBytesWritten () { return bytesWritten; }
   
-  void seek (u_int byte, unsigned char bit);
+  void seek (mg_u_long byte, unsigned char bit);
   void seek (mg_u_long topos);
   void error();

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/lib/win32in.h

@@ -6 +6 @@
 
 #include "longlong.h"
+#include "mglong.h"
 #ifdef __cplusplus
 extern "C" {

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

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

@@ -186 +186 @@
     // print
     UCArray docText;
-    u_long docNum = 0;
+    mg_u_long docNum = 0;
     cin >> docNum;
     cin.getline(query, 2048, '\n'); // eat up return

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

@@ -78 +78 @@
   
   TextLevelInfo levelInfo = td.levels.levelInfo[level];
-  u_long docNum = 1;
+  mg_u_long docNum = 1;
   UCArray docText;
   while (docNum <= levelInfo.numEntries) {