Changeset 203

Timestamp:

10/29/06 15:29:18 (2 years ago)

Author:

ug

Message:

Improved support for tagging

Files:

• 06/libkombilo/Makefile (modified) (1 diff)
• 06/libkombilo/cpptest.cc (modified) (1 diff)
• 06/libkombilo/search.cc (modified) (4 diffs)
• 06/libkombilo/search.h (modified) (4 diffs)

06/libkombilo/Makefile

@@ -17 +17 @@
-        g++ -Wall -g -O0 -o cpptest -lsqlite3 -lboost_filesystem cpptest.cc search.cc sgfparser.cc abstractboard.cc
-
+fast:
+        g++ -O3 -o cpptest -lsqlite3 -lboost_filesystem cpptest.cc search.cc sgfparser.cc abstractboard.cc
+
-clean:
-        rm search.o abstractboard.o sgfparser.o cpptest

06/libkombilo/cpptest.cc

@@ -106 +106 @@
-
-  // ------------------- resetFormat ------------------------------------------
+  printf("reset db\n");
-  gl.resetFormat("pb");
-  vector<string> res = gl.currentEntriesAsStrings(0, 40);

06/libkombilo/search.cc

@@ -3340 +3340 @@
-    throw DBError();
-  }
+  rc = sqlite3_busy_timeout(db, 200);
+  if (rc) throw DBError();
+  rc = sqlite3_exec(db, "pragma synchronous = off;", 0, 0, 0);
+  if (rc) throw DBError();
+  rc = sqlite3_exec(db, "pragma cache_size = 700000;", 0, 0, 0);
+  if (rc) throw DBError();
-
-  rc = sqlite3_exec(db, "create table if not exists db_info ( info text );", 0, 0, 0);
@@ -3480 +3486 @@
-  //   throw DBError();
-  // }
-  rc = sqlite3_busy_timeout(db, 200);
-  if (rc) throw DBError();
-  rc = sqlite3_exec(db, "pragma synchronous = off;", 0, 0, 0);
-  if (rc) throw DBError();
-  rc = sqlite3_exec(db, "pragma cache_size = 300000;", 0, 0, 0);
-  if (rc) throw DBError();
-  rc = sqlite3_exec(db, "begin transaction;", 0, 0, 0);
-  if (rc) throw DBError();
@@ -3674 +3674 @@
-}
-
+void GameList::tagsearch(int tag) throw(DBError) {
+  char sql[200];
+  
+  if (!tag) return;
+  if (tag > 0) {
+    sprintf(sql, "select games.id from games join game_tags on games.id = game_tags.game_id where game_tags.tag_id = %d order by games.id", tag);
+  } else {
+    sprintf(sql, "select games.id from games except select games.id from games join game_tags on games.id = game_tags.game_id where game_tags.tag_id = %d order by games.id;", -tag);
+  }
+  gisearch(sql, 1);
+}
+
+void GameList::setTag(int tag, int start, int end) throw(DBError) {
+  if (end==0) end = currentList->size();
+  if (start>end || end > (int)currentList->size()) return;
+  int rc = sqlite3_exec(db, "begin transaction", 0, 0, 0);
+  if (rc != SQLITE_OK) throw DBError();
+  for(int i = start; i < end; i++) {
+    if (getTags(i, tag).size()) continue;
+    char sql[200];
+    sprintf(sql, "insert into game_tags (game_id, tag_id) values (%d, %d)", (*all)[(*currentList)[i].second]->id, tag);
+    rc = sqlite3_exec(db, sql, 0, 0, 0);
+    if (rc != SQLITE_OK) throw DBError();
+  }
+  rc = sqlite3_exec(db, "commit", 0, 0, 0);
+  if (rc != SQLITE_OK) throw DBError();
+}
+
+void GameList::deleteTag(int tag, int i) throw(DBError) {
+  char sql[200];
+  if (i == -1) sprintf(sql, "delete from game_tags where tag_id=%d", tag);
+  else sprintf(sql, "delete from game_tags where game_id=%d and tag_id=%d", (*all)[(*currentList)[i].second]->id, tag);
+  int rc = sqlite3_exec(db, sql, 0, 0, 0);
+  if (rc != SQLITE_OK) throw DBError();
+}
+
+int gettags_callback(void *res, int argc, char **argv, char **azColName) {
+  if (!argc) return 1;
+  ((vector<int>*)res)->push_back(atoi(argv[0]));
+  return 0;
+}
+
+vector<int> GameList::getTags(int i, int tag) throw(DBError) {
+  vector<int> result;
+  char sql[200];
+  if (tag==0) sprintf(sql, "select tag_id from game_tags where game_id=%d", (*all)[(*currentList)[i].second]->id);
+  else sprintf(sql, "select tag_id from game_tags where game_id=%d and tag_id=%d", (*all)[(*currentList)[i].second]->id, tag);
+  int rc = sqlite3_exec(db, sql, gettags_callback, &result, 0);
+  if (rc != SQLITE_OK) throw DBError();
+  return result;
+}
+
-int gis_callback(void *gl, int argc, char **argv, char **azColName) {
-throw DBError()
+return 1
-  ((GameList*)gl)->makeIndexHit(atoi(argv[0]), 0);
-  return 0;
-}
-
-
+, int complete
-  bool dbWasOpen = false;
-  if (!db) {
@@ -3697 +3749 @@
-      if (rc) throw DBError();
-    }
-
+
+
-    query += sql;
-
+
+
-    int rc = sqlite3_exec(db, query.c_str(), gis_callback, this, 0);
-    if( rc!=SQLITE_OK ) throw DBError();

06/libkombilo/search.h

@@ -576 +576 @@
-    std::vector<GameListEntry* > * all;
-    std::vector<std::pair<int,int> > * currentList; // pair of game id and position within all
-
-
+
-    std::vector<std::pair<int,int> > * oldList;
-    int current;
@@ -586 +585 @@
-
-    // the following methods provide the user interface
+
+    // p_options will be copied by GameList, so the caller has to free the pointer
-    GameList(char* DBNAME, std::string ORDERBY="", std::string FORMAT="", ProcessOptions* p_options=0) throw(DBError);
-
-
+
+
+
+
+
+
-    void search(Pattern& pattern, SearchOptions* options = 0) throw(DBError);
-
-
+
+
+
+
+
+
+
+
+
+
-    void reset(); // reset currentList to all
-    void resetFormat(std::string ORDERBY="", std::string FORMAT="");
-    void gisearch(char* sql) throw(DBError);
-    int size();
+    int numHits();
-    std::string resultsStr(GameListEntry* gle);
-    std::string currentEntryAsString(int i);
@@ -601 +614 @@
-    std::string getSGF(int i) throw(DBError);
-    std::string getCurrentProperty(int i, std::string tag) throw (DBError);
-
-
-
-
-
-
+
-    // internal methods (called from the algorithm classes)
-    ~GameList();
@@ -619 +627 @@
-    void makeIndexCandidate(int index, std::vector<Candidate* > *candidates);
-    void makeIndexHit(int index, std::vector<Hit* > *hits);
-    char lookupLabel(char x, char y);
-    Continuation lookupContinuation(char x, char y);
-
-  private: