Changeset 247

Timestamp:

04/04/07 21:35:56 (1 year ago)

Author:

ug

Message:

Implemented rectangle notation for AB/AW/AE tags in process. Some small fixes for empty db's.

Files:

• 06/libkombilo/search.cpp (modified) (13 diffs)

06/libkombilo/search.cpp

@@ -1036 +1036 @@
-  int rc = sqlite3_exec(db, sql, 0, 0, 0);
-  if (rc != SQLITE_OK) {
-    printf("error %d\n", rc);
-    throw DBError();
-  }
@@ -2174 +2173 @@
-
-HashhitF::HashhitF() {
-  printf("oops\n");
-  cont = 0;
-  emn = 0;
@@ -3794 +3792 @@
-  rc = sqlite3_exec(db, sql.c_str(), insertEntry, this, 0);
-  if (rc != SQLITE_OK && rc != SQLITE_ERROR) {
-    printf("sql error %d\n", rc);
-    throw DBError(); 
-  }
@@ -3978 +3975 @@
-void GameList::tagsearch(int tag) throw(DBError) {
-  char sql[200];
-
+
-  if (!tag) return;
-  if (tag > 0) {
@@ -4060 +4057 @@
-
-int GameList::find_duplicates(int bs, bool strict) throw(DBError) {
+  if (!currentList->size()) return 0; // this also deals with the case of an empty db
-  int bs_index = 0;
-  if (duplicates) delete duplicates;
@@ -4315 +4313 @@
-    oldList = 0;
-    if (currentList) delete currentList;
-0
+new vector<pair<int,int> >
-    return;
-  }
@@ -4665 +4663 @@
-    int rc = sqlite3_prepare(db, sql_ins_rnp.c_str(), -1, &ppStmt, 0);
-    if (rc != SQLITE_OK || ppStmt==0) {
-      printf("db error %d\n", rc);
-      throw DBError(); // FIXME: catch busy error, (and/or throw DBError?)
-    }
@@ -4718 +4715 @@
-      // printf("nn\n");
-      bool caughtSGFError = false;
+      char* propValue = 0;
+
-      try {
-
-        // parse current node, watch out for B, W, AB, AW, AE properties
-
-        const char* s = currentN->SGFstring.c_str();
-        int lSGFstring = strlen(s);
@@ -4756 +4754 @@
-          ID[IDindex] = 0; // found next property ID
-          bool IDrelevant= (!strcmp(ID,"B") || !strcmp(ID,"W") || !strcmp(ID,"AB") || !strcmp(ID,"AW") || !strcmp(ID,"AE"));
-char* propValue = new char[lSGFstring+1
+propValue = new char[100000
-          int propValueIndex = 0;
-          int oldPropValueIndex = 0;
@@ -4769 +4767 @@
-              if (97 <= s[i] && s[i] <= 96+bs) { // valid board coordinate?
-                propValue[propValueIndex++] = s[i];
+                if (propValueIndex > 99990) throw SGFError();
-              } else if (s[i] == 't') { ; // allow passes, but do not record them (we handle them a little sloppily here)
+              } else if (s[i] == ':') {
+                if (propValueIndex - oldPropValueIndex != 2)
+                  throw SGFError();
+                char rect1 = 'a';
+                char rect2 = 'a';
+                i++;
+                while (i<lSGFstring && (s[i] == '\t' || s[i] == ' ' || s[i] == '\r' || s[i] == '\n')) i++;
+                if (i >= lSGFstring) throw SGFError();
+                if (97 <= s[i] && s[i] <= 96+bs) // valid board coordinate?
+                  rect1 = s[i];
+                else throw SGFError();
+                i++;
+                while (i<lSGFstring && (s[i] == '\t' || s[i] == ' ' || s[i] == '\r' || s[i] == '\n')) i++;
+                if (i >= lSGFstring) throw SGFError();
+                if (97 <= s[i] && s[i] <= 96+bs) // valid board coordinate?
+                  rect2 = s[i];
+                else throw SGFError();
+                i++;
+                while (i<lSGFstring && (s[i] == '\t' || s[i] == ' ' || s[i] == '\r' || s[i] == '\n')) i++;
+                if (i >= lSGFstring) throw SGFError();
+                if (s[i] == ']') {
+                  char st1 = propValue[propValueIndex-2];
+                  char st2 = propValue[propValueIndex-1];
+                  propValueIndex -= 2; // do not want to have the first entry twice!
+                  for(char x1 = st1; x1 <= rect1; x1++) {
+                    for(char x2 = st2; x2 <= rect2; x2++) {
+                      propValue[propValueIndex++] = x1;
+                      propValue[propValueIndex++] = x2;
+                      if (propValueIndex > 99990) throw SGFError();
+                    }
+                  }
+                  oldPropValueIndex = propValueIndex;
+                  break;
+                } else throw SGFError();
-              } else {
-                throw SGFError();
@@ -4776 +4809 @@
-            }
-            if (i >= lSGFstring) throw SGFError();
-
+
+
-              throw SGFError();
+            }
-            oldPropValueIndex = propValueIndex;
-
@@ -4794 +4829 @@
-            }
-            delete [] propValue;
+            propValue = 0;
-            continue;
-          }
@@ -4838 +4874 @@
-              }
-              delete [] propValue;
+              propValue = 0;
-        } 
-      } catch (SGFError) {
+        if (propValue) {
+          delete [] propValue;
+          propValue = 0;
+        }
-        return_val |= SGF_ERROR;
-        caughtSGFError = true;