Changeset 6141 for trunk/NTREE/NT_dbrepair.cxx

Timestamp:

14/08/09 16:29:27 (3 years ago)

Author:

westram

Message:

• spellchecked all (phew)

Files:

• trunk/NTREE/NT_dbrepair.cxx (modified) (9 diffs)

trunk/NTREE/NT_dbrepair.cxx

@@ -295 +295 @@
                     GBDATA *gb_pos_begin = GB_entry(gb_gene, "pos_begin"); // test for old format
                     if (!gb_pos_begin) {
-                        error = "Neighter 'pos_begin' nor 'pos_start' found - format of gene location is unknown";
+                        error = "Neither 'pos_begin' nor 'pos_start' found - format of gene location is unknown";
                     }
                 }
@@ -810 +810 @@
 
             DictMap   use;      // keyname -> dictionary (which dictionary to use)
-            StringSet multiDecompressable; // keys which can be decompressed with multiple dictionaries
+            StringSet multiDecompressible; // keys which can be decompressed with multiple dictionaries
 
             for (int pass = 1; pass <= 2; ++pass) {
@@ -831 +831 @@
                                         }
                                         else { // already have another dictionary working with keyname
-                                            multiDecompressable.insert(keyname);
+                                            multiDecompressible.insert(keyname);
                                         }
                                     }
@@ -842 +842 @@
             }
 
-            StringSet notDecompressable; // keys which can be decompressed with none of the dictionaries
+            StringSet notDecompressible; // keys which can be decompressed with none of the dictionaries
             for (Keys::iterator ki = keys.begin(); ki != keys.end(); ++ki) {
                 KeyInfoPtr    k       = ki->second;
@@ -848 +848 @@
 
                 if (k->isCompressed()) {
-                    if (!contains(use, keyname)) notDecompressable.insert(keyname);
-                    if (contains(multiDecompressable, keyname)) use.erase(keyname);
+                    if (!contains(use, keyname)) notDecompressible.insert(keyname);
+                    if (contains(multiDecompressible, keyname)) use.erase(keyname);
                 }
             }
@@ -856 +856 @@
             int  reassigned = 0;
 
-            if (!notDecompressable.empty()) {
-                // bad .. found undecompressable data
-                int nd_count = notDecompressable.size();
+            if (!notDecompressible.empty()) {
+                // bad .. found undecompressible data
+                int nd_count = notDecompressible.size();
                 aw_message(GBS_global_string("Detected corrupted dictionary compression\n"
                                              "Data of %i DB-keys is lost and will be deleted", nd_count));
@@ -870 +870 @@
                 long      notDeleted = 0;
                 
-                for (StringSet::iterator ki = notDecompressable.begin(); !error && ki != notDecompressable.end(); ++ki) {
+                for (StringSet::iterator ki = notDecompressible.begin(); !error && ki != notDecompressible.end(); ++ki) {
                     const string& keyname    = *ki;
 
@@ -890 +890 @@
             }
 
-            if (!error && !multiDecompressable.empty()) {
-                for (StringSet::iterator ki = multiDecompressable.begin(); !error && ki != multiDecompressable.end(); ++ki) {
+            if (!error && !multiDecompressible.empty()) {
+                for (StringSet::iterator ki = multiDecompressible.begin(); !error && ki != multiDecompressible.end(); ++ki) {
                     const string&   keyname  = *ki;
                     int             possible = 0;
@@ -946 +946 @@
             }
 
-            // now all redundencies should be eliminated and we can assign dictionaries to affected keys
+            // now all redundancies should be eliminated and we can assign dictionaries to affected keys
             if (!error) {
                 for (Keys::iterator ki = keys.begin(); !error && ki != keys.end(); ++ki) {