Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_weights_build.c

Timestamp:

2012-02-28T13:59:00+13:00 (12 years ago)

Author:

kjdon

Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:

• main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_weights_build.c (modified) (13 diffs)

main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_weights_build.c

@@ -38 +38 @@
 #include "words.h"
 
-#define MAXBITS (sizeof(unsigned long) * 8)
+#define MAXBITS (sizeof(mg_u_long) * 8)
 
 /*
@@ -81 +81 @@
 static char *file_name = "";
 static char *text_file_name = "";
-static unsigned long NumPara = 0;
-static unsigned long StaticNumOfDocs = 0;
-
-unsigned long get_NumPara (void);
-unsigned long get_StaticNumOfDocs (void);
+static mg_u_long NumPara = 0;
+static mg_u_long StaticNumOfDocs = 0;
+
+mg_u_long get_NumPara (void);
+mg_u_long get_StaticNumOfDocs (void);
 void GenerateWeights (void);
 void Make_weight_approx (void);
@@ -141 +141 @@
 
 
-unsigned long 
+mg_u_long 
 get_NumPara (void)
 {
@@ -158 +158 @@
 
 
-unsigned long 
+mg_u_long 
 get_StaticNumOfDocs (void)
 /* the static number of documents is the N parameter used to
@@ -253 +253 @@
     {
       u_char dummy1, dummy2[MAXSTEMLEN + 1];
-      unsigned long fcnt, wcnt, blk, CurrDoc, p, j;
+      mg_u_long fcnt, wcnt, blk, CurrDoc, p, j;
       float idf;
 
@@ -281 +281 @@
       /* check the inverted file index entry for this word */
       {
-    unsigned long loc;
+    mg_u_long loc;
     fread ((char *) &loc, sizeof (loc), 1, idx);
     NTOHUL(loc);  /* [RPAP - Jan 97: Endian Ordering] */
@@ -292 +292 @@
       for (j = 0; j < p; j++)
     {
-      unsigned long x, tf;
+      mg_u_long x, tf;
       BBLOCK_DECODE (x, blk);
       CurrDoc += x;
@@ -346 +346 @@
 {
   int i, pos, max;
-  unsigned long buf;
+  mg_u_long buf;
   double U, L, B;
   FILE *approx, *exact;
@@ -368 +368 @@
 
     }
-  fseek (exact, sizeof (u_long), SEEK_SET);
+  fseek (exact, sizeof (mg_u_long), SEEK_SET);
 
   B = pow (U / L, pow (2.0, -(double) bits));
@@ -392 +392 @@
   for (buf = pos = i = 0; i < NumPara; i++)
     {
-      unsigned long fx;
+      mg_u_long fx;
       float wgt;
       fread ((char *) &wgt, sizeof (wgt), 1, exact);
@@ -476 +476 @@
     struct
       {
-    unsigned long Start;
+    mg_u_long Start;
     float Weight;
       }
@@ -483 +483 @@
       {
     int count;
-    fread ((char *) &data.Start, sizeof (unsigned long), 1, idx);
+    fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx);
     if (para && i < cth.num_of_docs)
       {
@@ -502 +502 @@
       }
     /* Write out the extra entry for the idx file */
-    fread ((char *) &data.Start, sizeof (unsigned long), 1, idx);
+    fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx);
     data.Weight = 0;
     fwrite((char*)&data, sizeof(data), 1, idx_wgt);