Fixes bug in how max_num_generations was calculated, a=cpollett

Chris Pollett [2010-10-17 22:Oct:th]
Fixes bug in how max_num_generations was calculated, a=cpollett
Filename
models/phrase_model.php
diff --git a/models/phrase_model.php b/models/phrase_model.php
index 14dc67358..c822caba3 100755
--- a/models/phrase_model.php
+++ b/models/phrase_model.php
@@ -411,14 +411,14 @@ class PhraseModel extends Model
             $restrict_phrases = $word_struct["RESTRICT_PHRASES"];
             $disallow_phrases = $word_struct["DISALLOW_PHRASES"];
             $index_archive = $word_struct["INDEX_ARCHIVE"];
-            if($generation > $index_archive->generation_info['ACTIVE']) {
-                continue;
-            }
             if($index_archive->generation_info['ACTIVE'] >
                 $max_num_generations) {
                 $max_num_generations =
                     $index_archive->generation_info['ACTIVE'];
             }
+            if($generation > $index_archive->generation_info['ACTIVE']) {
+                continue;
+            }
             $index_archive->setCurrentShard($generation);
             $weight = $word_struct["WEIGHT"];
             $num_word_keys = count($word_keys);
@@ -471,7 +471,8 @@ class PhraseModel extends Model
         } else {
             $pages["GEN_NUM_ROWS"] = $group_iterator->num_docs;
         }
-        $pages["MAX_NUM_GENERATIONS"] = $max_num_generations;
+        $pages["MAX_NUM_GENERATIONS"] = $max_num_generations + 1;
+          //add one since num generation starts at zero
         return $pages;
     }
ViewGit