Changeset 211

Timestamp:

01/13/07 14:36:34 (1 year ago)

Author:

ug

Message:

Added signature search (\!GameList::sigsearch())

Files:

• 06/libkombilo/search.cpp (modified) (5 diffs)
• 06/libkombilo/search.h (modified) (1 diff)
• 06/libkombilo/testsearch.py (modified) (1 diff)

06/libkombilo/search.cpp

@@ -514 +514 @@
-    // printf("%d, %d, %d, %d, %d, %d, %d\n", f, newSizeX, newSizeY, newLeft, newRight, newTop, newBottom);
-    char* newInitialPos = new char[pattern.sizeX*pattern.sizeY];
-unsigned
+int
-    for(i=0; i<pattern.sizeX; i++) {
-      for(int j=0; j<pattern.sizeY; j++) {
@@ -3563 +3563 @@
-  if (currentList) delete currentList;
-  if (oldList) delete oldList;
-
+unsigned 
-    if (algo_ps[i]) delete algo_ps[i];
-  if (db) sqlite3_close(db);
@@ -3757 +3757 @@
-}
-
+void GameList::sigsearch(char* sig) throw(DBError) {
+  if (start_sorted() == 0) { 
+    string query = "select id from algo_signature_19 where signature = ? order by id";
+    // int rc = sqlite3_exec(db, query.c_str(), sigs_callback, this, 0);
+    sqlite3_stmt *ppStmt=0;
+    int rc = sqlite3_prepare(db, query.c_str(), -1, &ppStmt, 0);
+    if (rc != SQLITE_OK || ppStmt==0) throw DBError();
+    rc = sqlite3_bind_blob(ppStmt, 1, sig, 12, SQLITE_TRANSIENT);
+    if (rc != SQLITE_OK || ppStmt==0) throw DBError();
+    do {
+      rc = sqlite3_step(ppStmt);
+      if (rc != SQLITE_DONE && rc != SQLITE_ROW) throw DBError();
+      if (rc == SQLITE_ROW) {
+        makeIndexHit(sqlite3_column_int(ppStmt, 0), 0);
+      }
+    } while (rc == SQLITE_ROW);
+    rc = sqlite3_finalize(ppStmt);
+    if (rc != SQLITE_OK) throw DBError();
+
+    end_sorted();
+  }
+}
+
-int gis_callback(void *gl, int argc, char **argv, char **azColName) {
-  if (!argc) return 1;
@@ -3853 +3876 @@
-}
-
-string GameList::getSGF(int i) throw(DBError) {
-  if (!p_op->sgfInDB) return "";
-  return getCurrentProperty(i, "sgf");
-}
-
-int getpropcallback(void *s, int argc, char **argv, char **azColName) {
-  char** prop = (char**)s;
@@ -3865 +3883 @@
-  }
-  return 0;
+}
+
+string GameList::getSignature(int i) throw(DBError) {
+  if (i < 0 || i >= (int)currentList->size()) {
+    // printf("index out of range\n");
+    return "";
+  }
+  int index = (*all)[(*currentList)[i].second]->id;
+  // int rc = sqlite3_open(dbname, &db); 
+  // if (rc) {
+  //   sqlite3_close(db);
+  //   db = 0;
+  //   throw DBError();
+  // }
+  char* prop = 0;
+  char sql[200];
+  sprintf(sql, "select signature from algo_signature_19 where id = %d;", index);
+  // printf("%s\n", sql);
+  int rc = sqlite3_exec(db, sql, getpropcallback, &prop, 0);
+  if (rc != SQLITE_OK) throw DBError();
+  // sqlite3_close(db);
+  // db = 0;
+
+  if (!prop) return "";
+  string prop_str(prop);
+  delete [] prop;
+  return prop_str;
+}
+
+string GameList::getSGF(int i) throw(DBError) {
+  if (!p_op->sgfInDB) return "";
+  return getCurrentProperty(i, "sgf");
-}
-

06/libkombilo/search.h

@@ -602 +602 @@
-    Continuation lookupContinuation(char x, char y);
-
+    // ------- signature search ---------------------------------------------------
+    void sigsearch(char* sig) throw(DBError);
+    std::string getSignature(int i) throw(DBError);
+
-    // ------- game info search ---------------------------------------------------
-    void gisearch(char* sql, int complete=0) throw(DBError);

06/libkombilo/testsearch.py

@@ -62 +62 @@
-    print 'Player %d: %s' % (i, gl.plEntry(i))
-
+gl.reset()
+gl.sigsearch('cfcgjbbeckjc')
+print gl.size(), 'games with signature cfcgjbbeckjc.'
+gl.sigsearch('aaaaaaaaaaaa')
+print gl.size(), 'games with signature aaaaaaaaaaaa.'
+gl.reset()
+gl.sigsearch('dfcnfmepgkjo')
+print gl.size(), 'games with signature dfcnfmepgkjo:'
+print gl.currentEntryAsString(0)
+print 'signature of game 0: ', gl.getSignature(0)
+
+