Ignore:
Timestamp:
2012-02-28T13:59:00+13:00 (12 years ago)
Author:
kjdon
Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r16583 r25147  
    5050    << t.stemMethod << ")equiv terms(";
    5151 
    52   unsigned long i;
     52  mg_u_long i;
    5353  for (i=0; i<t.equivTerms.size(); ++i) {
    5454    s << t.equivTerms[i] << ", ";
    … …  
    8383
    8484  s << "termFreqs: ";
    85   for (unsigned long i=0; i<termFreqs.size(); ++i)
     85  for (mg_u_long i=0; i<termFreqs.size(); ++i)
    8686    s << termFreqs[i] << ", ";
    8787 
    … …  
    9494ostream &operator<< (ostream &s, const QueryResult &r) {
    9595  s << "docs: ";
    96   unsigned long i;
     96  mg_u_long i;
    9797  for (i=0; i<r.docs.size(); ++i)
    9898    s << r.docs[i] << ", ";
    … …  
    136136ostream &operator<< (ostream &s, const ExtQueryResult &r) {
    137137  s << "docs: ";
    138   unsigned long i;
     138  mg_u_long i;
    139139  for (i=0; i<r.docs.size(); ++i)
    140140    s << r.docs[i] << ", ";
    … …  
    181181ostream &operator<< (ostream &s, const BrowseQueryResult &r) {
    182182  s << "terms: ";
    183   unsigned long i;
     183  mg_u_long i;
    184184  for (i=0; i<r.termFreqs.size(); ++i)
    185185    s << r.termFreqs[i] << ", ";
    … …  
    207207void FindWordNumbers (IndexData &indexData,
    208208              const UCArray &term,
    209               unsigned long stemMethod,
    210               vector<unsigned long> &equivWords) {
     209              mg_u_long stemMethod,
     210              vector<mg_u_long> &equivWords) {
    211211  equivWords.erase (equivWords.begin(), equivWords.end());
    212212
    … …  
    222222    // don't need to stem the word,
    223223    // find the word number(s) for this term
    224     unsigned long wordElNum = 0;
    225     unsigned long numLevels = indexData.bdh.num_levels;
     224    mg_u_long wordElNum = 0;
     225    mg_u_long numLevels = indexData.bdh.num_levels;
    226226    word_block_dict_el wordDictEl;
    227227    wordDictEl.SetNumLevels (numLevels);
    … …  
    245245  unsigned char mgWord[MAXSTEMLEN + 1];
    246246  UCArray stemTerm;
    247   unsigned long stemmerNum = 0;
     247  mg_u_long stemmerNum = 0;
    248248
    249249  /* [JFG - Mar 06: Accent folding patch] */
    … …  
    266266  // need to look up this term in the appropriate dictionary
    267267  stem_block_dict_el stemDictEl;
    268   unsigned long stemElNum;
     268  mg_u_long stemElNum;
    269269  bool result = false;
    270270 
    … …  
    287287void ReadTermFragData (IndexData &indexData,
    288288               bool needFragFreqs,
    289                unsigned long termNum,
     289               mg_u_long termNum,
    290290               FragData &fragData,
    291291               FragRangeArray *fragLimits,
    … …  
    294294
    295295  // look up the word in the dictionary
    296   unsigned long numLevels = indexData.bdh.num_levels;
     296  mg_u_long numLevels = indexData.bdh.num_levels;
    297297  word_block_dict_el wordDictEl;
    298298  wordDictEl.SetNumLevels (numLevels);
    … …  
    311311  stdio_bitio_buffer buffer (indexData.invfFile);
    312312   
    313   unsigned long B = BIO_Bblock_Init (indexData.bdh.num_frags,
     313  mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags,
    314314                     wordDictEl.frag_occur);
    315   unsigned long fragNum = 0;
    316   unsigned long termFreq = 0;
    317 
    318   unsigned long fragLimitI = 0;
    319   unsigned long i;
     315  mg_u_long fragNum = 0;
     316  mg_u_long termFreq = 0;
     317
     318  mg_u_long fragLimitI = 0;
     319  mg_u_long i;
    320320  for (i=0; i<wordDictEl.frag_occur; ++i) {
    321321    fragNum += buffer.bblock_decode (B, NULL);
    … …  
    359359
    360360  // do or
    361   unsigned long f1I = 0, f1Size = f1.fragNums.size();
    362   unsigned long f2I = 0, f2Size = f2.fragNums.size();
     361  mg_u_long f1I = 0, f1Size = f1.fragNums.size();
     362  mg_u_long f2I = 0, f2Size = f2.fragNums.size();
    363363  while (f1I < f1Size || f2I < f2Size) {
    364364    if (f2I < f2Size &&
    … …  
    395395             FragData &fragData,
    396396             const FragData &comFragData,
    397              signed long startRange,
    398              signed long endRange,
     397             mg_s_long startRange,
     398             mg_s_long endRange,
    399399             const FragRangeArray *fragLimits) {
    400400  // sanity check on range
    401401  if (startRange > endRange) {
    402     signed long temp = endRange;
     402    mg_s_long temp = endRange;
    403403    endRange = startRange;
    404404    startRange = temp;
    … …  
    409409    fragData.matchDocs = comFragData.matchDocs;
    410410 
    411   unsigned long fragDataI = 0;
    412   unsigned long fragDataSize = fragData.fragNums.size();
    413   unsigned long comFragDataI = 0;
    414   unsigned long comFragDataSize = comFragData.fragNums.size();
    415   unsigned long fragLimitI = 0;
    416   unsigned long fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size();
    417   unsigned long outI = 0;
     411  mg_u_long fragDataI = 0;
     412  mg_u_long fragDataSize = fragData.fragNums.size();
     413  mg_u_long comFragDataI = 0;
     414  mg_u_long comFragDataSize = comFragData.fragNums.size();
     415  mg_u_long fragLimitI = 0;
     416  mg_u_long fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size();
     417  mg_u_long outI = 0;
    418418
    419419  while (fragDataI < fragDataSize &&
    420420     comFragDataI < comFragDataSize) {
    421     signed long fragNum = (signed long)fragData.fragNums[fragDataI];
    422     signed long comFragNum = (signed long)comFragData.fragNums[comFragDataI];
     421    mg_s_long fragNum = (mg_s_long)fragData.fragNums[fragDataI];
     422    mg_s_long comFragNum = (mg_s_long)comFragData.fragNums[comFragDataI];
    423423   
    424424    // go to the right fragment limit (for the com frag)
    425425    if (fragLimits != NULL) {
    426426      while (fragLimitI+1 < fragLimitSize &&
    427          comFragNum > (signed long)(*fragLimits)[fragLimitI+1].rangeStart) {
     427         comFragNum > (mg_s_long)(*fragLimits)[fragLimitI+1].rangeStart) {
    428428    ++fragLimitI;
    429429      }
    … …  
    432432    if (fragNum <= comFragNum+startRange ||
    433433    (fragLimits!=NULL &&
    434      fragNum<=(signed long)(*fragLimits)[fragLimitI].rangeStart)) {
     434     fragNum<=(mg_s_long)(*fragLimits)[fragLimitI].rangeStart)) {
    435435      ++fragDataI;
    436436     
    437437    } else if (fragNum > comFragNum+endRange ||
    438438           (fragLimits!=NULL &&
    439         fragNum>(signed long)(*fragLimits)[fragLimitI].rangeEnd)) {
     439        fragNum>(mg_s_long)(*fragLimits)[fragLimitI].rangeEnd)) {
    440440      ++comFragDataI;
    441441     
    … …  
    471471             const UCArray &tag,
    472472             const UCArray &term,
    473              unsigned long stemMethod,
    474              unsigned long termWeight,
     473             mg_u_long stemMethod,
     474             mg_u_long termWeight,
    475475             UCArrayVector &equivTerms,
    476476             QueryResult &result) {
    … …  
    480480
    481481  // log (N / ft)
    482   unsigned long N = indexData.levels.levelInfo[indexData.curLevel].numEntries;
     482  mg_u_long N = indexData.levels.levelInfo[indexData.curLevel].numEntries;
    483483  float wordLog = log((double)N / (double)termData.matchDocs);
    484484
    … …  
    491491  float Wdt;
    492492 
    493   unsigned long termDataI = 0;
    494   unsigned long termDataSize = termData.fragNums.size();
    495   unsigned long levelDocNum = 0;
    496  
    497   unsigned long termDocFreq = 0;
    498   unsigned long lastLevelDocNum = 0;
    499   unsigned long overallwordfreq = 0;
     493  mg_u_long termDataI = 0;
     494  mg_u_long termDataSize = termData.fragNums.size();
     495  mg_u_long levelDocNum = 0;
     496 
     497  mg_u_long termDocFreq = 0;
     498  mg_u_long lastLevelDocNum = 0;
     499  mg_u_long overallwordfreq = 0;
    500500 
    501501  while (termDataI < termDataSize) {
    … …  
    552552                const UCArray &tag,
    553553                const UCArray &term,
    554                 unsigned long stemMethod,
    555                 unsigned long termWeight,
     554                mg_u_long stemMethod,
     555                mg_u_long termWeight,
    556556                UCArrayVector &equivTerms,
    557557                QueryResult &result) {
    … …  
    571571  float Wdt;
    572572 
    573   unsigned long termDataI = 0;
    574   unsigned long termDataSize = termData.fragNums.size();
    575   unsigned long levelDocNum = 0;
    576  
    577   unsigned long termDocFreq = 0;
    578   unsigned long lastLevelDocNum = 0;
    579   unsigned long overallwordfreq = 0;
    580   unsigned long resultI = 0;
    581   unsigned long resultSize = result.docs.size();
    582   unsigned long resultOutI = 0;
     573  mg_u_long termDataI = 0;
     574  mg_u_long termDataSize = termData.fragNums.size();
     575  mg_u_long levelDocNum = 0;
     576 
     577  mg_u_long termDocFreq = 0;
     578  mg_u_long lastLevelDocNum = 0;
     579  mg_u_long overallwordfreq = 0;
     580  mg_u_long resultI = 0;
     581  mg_u_long resultSize = result.docs.size();
     582  mg_u_long resultOutI = 0;
    583583 
    584584 
    … …  
    664664  bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo);
    665665
    666   unsigned long termDataI = 0;
    667   unsigned long termDataSize = termData.fragNums.size();
    668   unsigned long levelDocNum = 0;
    669  
    670   unsigned long lastLevelDocNum = 0;
    671 
    672   unsigned long resultI = 0;
    673   unsigned long resultSize = result.docs.size();
    674   unsigned long resultOutI = 0;
     666  mg_u_long termDataI = 0;
     667  mg_u_long termDataSize = termData.fragNums.size();
     668  mg_u_long levelDocNum = 0;
     669 
     670  mg_u_long lastLevelDocNum = 0;
     671
     672  mg_u_long resultI = 0;
     673  mg_u_long resultSize = result.docs.size();
     674  mg_u_long resultOutI = 0;
    675675 
    676676  while (termDataI < termDataSize) {
    … …  
    732732void FindNearestWordNumber (IndexData &indexData,
    733733                const UCArray &term,
    734                 unsigned long &number) {
     734                mg_u_long &number) {
    735735
    736736    // find the word number for this term
    737     unsigned long wordElNum = 0;
    738     unsigned long numLevels = indexData.bdh.num_levels;
     737    mg_u_long wordElNum = 0;
     738    mg_u_long numLevels = indexData.bdh.num_levels;
    739739    word_block_dict_el wordDictEl;
    740740    wordDictEl.SetNumLevels (numLevels);
    … …  
    748748
    749749void GetTermList(IndexData &indexData,
    750          unsigned long startTerm,
    751          unsigned long numTerms,
     750         mg_u_long startTerm,
     751         mg_u_long numTerms,
    752752         TermFreqArray &terms) {
    753753
    … …  
    777777
    778778void GetTermList(IndexData &indexData,
    779          unsigned long startTerm,
    780          unsigned long numTerms,
     779         mg_u_long startTerm,
     780         mg_u_long numTerms,
    781781         UCArrayVector &terms) {
    782782
Note: See TracChangeset for help on using the changeset viewer.