Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dump.cpp

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/mgpp/text/mgpp_invf_dump.cpp (modified) (7 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dump.cpp

@@ -52 +52 @@
                invf_file_header &ifh,
                word_dict_el &wordEl,
-               unsigned long wordStart,
+               mg_u_long wordStart,
                bool printFrags) {
   cout << wordEl.frag_occur << " \"" << wordEl.el << "\"\n";
@@ -62 +62 @@
     stdio_bitio_buffer buffer(invfFile);
     
-    unsigned long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);
-    unsigned long fragNum = 0;
-    unsigned long i;
+    mg_u_long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);
+    mg_u_long fragNum = 0;
+    mg_u_long i;
     for (i=0; i<wordEl.frag_occur; ++i) {
-      unsigned long delta = buffer.bblock_decode (B, NULL);
+      mg_u_long delta = buffer.bblock_decode (B, NULL);
       fragNum += delta;
       cout << " " << fragNum;
       
       if (!ifh.word_level_index ) {
-    unsigned long count = buffer.gamma_decode (NULL);
+    mg_u_long count = buffer.gamma_decode (NULL);
     cout << "(" << count << ")";
       } else {
@@ -88 +88 @@
               invf_file_header &/*ifh*/,
               dict_el &tagEl,
-              unsigned long tagStart,
+              mg_u_long tagStart,
               bool printFrags) {
   cout << tagEl.frag_occur << " \"<" << tagEl.el << ">\"\n";
@@ -98 +98 @@
     stdio_bitio_buffer buffer(invfFile);
     
-    unsigned long pTag = tagEl.frag_occur*2;
-    unsigned long B = BIO_Bblock_Init (idh.num_frags+pTag, pTag);
-    unsigned long fragNum = 0;
-    unsigned long i;
+    mg_u_long pTag = tagEl.frag_occur*2;
+    mg_u_long B = BIO_Bblock_Init (idh.num_frags+pTag, pTag);
+    mg_u_long fragNum = 0;
+    mg_u_long i;
     for (i=0; i<tagEl.frag_occur; ++i) {
-      unsigned long delta = buffer.bblock_decode (B, NULL)-1;
+      mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
       fragNum += delta;
       cout << " " << fragNum;
@@ -169 +169 @@
   // process all the words
   if (printWords) {
-    unsigned long wordNum;
-    unsigned long wordStart;
+    mg_u_long wordNum;
+    mg_u_long wordStart;
     word_dict_el wordEl;
     wordEl.SetNumLevels (idh.num_levels);
@@ -182 +182 @@
   // process all the tags
   if (printTags) {
-    unsigned long tagNum;
-    unsigned long tagStart;
+    mg_u_long tagNum;
+    mg_u_long tagStart;
     dict_el tagEl;
     for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
@@ -199 +199 @@
 
 int main (int argc, char **argv) {
-  char *dir_name, *filename = "";
+  char *dir_name, *filename = (char*)"";
   int ch;
   msg_prefix = argv[0];