Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/src/text/backend.h

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/backend.h (modified) (11 diffs)

main/trunk/greenstone2/common-src/indexers/mg/src/text/backend.h

@@ -40 +40 @@
   {
     File *InvfFile;
-    unsigned long N;
-    unsigned long Nstatic;  /* N parameter for decoding inverted file entries */
+    mg_u_long N;
+    mg_u_long Nstatic;  /* N parameter for decoding inverted file entries */
     struct invf_file_header ifh;
   }
@@ -51 +51 @@
     File *TextIdxFile;
     File *TextIdxWgtFile;
-    long current_pos;
+    mg_s_long current_pos;
     struct
       {
-    unsigned long Start;
+    mg_u_long Start;
     float Weight;
       }
@@ -78 +78 @@
     compression_dict_header cdh;
     comp_frags_header *cfh[2];
-    unsigned long MemForCompDict;
+    mg_u_long MemForCompDict;
     u_char ***values[2];
     u_char *escape[2];
     huff_data *chars_huff[2];
-    u_long **chars_vals[2];
+    mg_u_long **chars_vals[2];
     huff_data *lens_huff[2];
-    u_long **lens_vals[2];
+    mg_u_long **lens_vals[2];
     auxiliary_dict *ad;
     int fast_loaded;
@@ -96 +96 @@
     struct stem_idx_header sih;
     u_char **index;
-    unsigned long *pos;
+    mg_u_long *pos;
     int active;
     u_char *buffer;
-    unsigned long MemForStemIdx;
+    mg_u_long MemForStemIdx;
   }
 stemmed_idx;
@@ -109 +109 @@
     struct stem_dict_header sdh;
     u_char **index;
-    unsigned long *pos;
+    mg_u_long *pos;
     int active;
     u_char *buffer;
-    unsigned long MemForStemDict;
+    mg_u_long MemForStemDict;
 
     /* [RPAP - Jan 97: Stem Index Change] */
@@ -126 +126 @@
     double L;
     double B;
-    unsigned long *DocWeights;
+    mg_u_long *DocWeights;
     char bits;
     float *table;
-    unsigned long mask;
-    unsigned long MemForWeights;
-    unsigned long num_of_docs;
+    mg_u_long mask;
+    mg_u_long MemForWeights;
+    mg_u_long num_of_docs;
   }
 approx_weights_data;
@@ -140 +140 @@
     int QueryFreqs;
     int Exact;           /* use exact weights for ranking or not */
-    long MaxDocsToRetrieve; /* may be -1 for all */
-    long MaxParasToRetrieve;
+    mg_s_long MaxDocsToRetrieve;    /* may be -1 for all */
+    mg_s_long MaxParasToRetrieve;
     int Sort;        
     char AccumMethod;       /* 'A' = array,  'S' = splay tree,  'H' = hash_table */
-    long MaxAccums;     /* may be -1 for all */
-    long MaxTerms;      /* may be -1 for all */
+    mg_s_long MaxAccums;        /* may be -1 for all */
+    mg_s_long MaxTerms;     /* may be -1 for all */
     int StopAtMaxAccum; /* Stop at maximum accumulator or not */
-    long HashTblSize;
+    mg_s_long HashTblSize;
     char *skip_dump;
   }
@@ -156 +156 @@
 typedef struct BooleanQueryInfo
   {
-    long MaxDocsToRetrieve;
+    mg_s_long MaxDocsToRetrieve;
   }
 BooleanQueryInfo;
@@ -191 +191 @@
     File *File_invf;
     File *File_weight_approx;
-    unsigned long mem_in_use, max_mem_in_use;
-    unsigned long num_of_ptrs, tot_num_of_ptrs;
-    unsigned long num_of_terms, tot_num_of_terms;
-    unsigned long num_of_accum, tot_num_of_accum;
-    unsigned long num_of_ans, tot_num_of_ans;
-    unsigned long hops_taken, tot_hops_taken;
-    unsigned long text_idx_lookups, tot_text_idx_lookups;
-    unsigned long max_buffers;
+    mg_u_long mem_in_use, max_mem_in_use;
+    mg_u_long num_of_ptrs, tot_num_of_ptrs;
+    mg_u_long num_of_terms, tot_num_of_terms;
+    mg_u_long num_of_accum, tot_num_of_accum;
+    mg_u_long num_of_ans, tot_num_of_ans;
+    mg_u_long hops_taken, tot_hops_taken;
+    mg_u_long text_idx_lookups, tot_text_idx_lookups;
+    mg_u_long max_buffers;
     unsigned doc_pos;
     unsigned buf_in_use;
@@ -226 +226 @@
 query_data *InitQuerySystem (char *dir, char *name, char *textname, InitQueryTimes * iqt);
 
-void ChangeMemInUse (query_data * qd, long delta);
+void ChangeMemInUse (query_data * qd, mg_s_long delta);
 
 void FinishQuerySystem (query_data * qd);
@@ -251 +251 @@
 float GetDocWeight (query_data * qd);
 
-long GetDocCompLength (query_data * qd);
-
-u_char *GetDocText (query_data * qd, unsigned long *len);
+mg_s_long GetDocCompLength (query_data * qd);
+
+u_char *GetDocText (query_data * qd, mg_u_long *len);
 
 DocEntry *GetDocChain (query_data * qd);