--- db/prgsrc/drupal/modules/chgk_db/classes/DbDatabase.class.php	2010/02/28 20:17:33	1.1
+++ db/prgsrc/drupal/modules/chgk_db/classes/DbDatabase.class.php	2010/03/08 16:19:22	1.2
@@ -5,20 +5,38 @@ class DbDatabase  {
   const TOURNAMENT_TABLE='Tournaments';
 
   public function getTournament($id) {
+      if (is_numeric($id)) {
+          return $this->getTournamentByDatabaseId($id);
+      } else {
+          return $this->getTournamentByTextId($id);
+      }
+  }
+
+  public function getTournamentByDatabaseId($id){
+    $sql = sprintf ("SELECT * FROM %s t
+      WHERE t.Id = '%d'", self::TOURNAMENT_TABLE, $id);
+    $res = db_query($sql);
+    return db_fetch_object($res);
+  }
+  public function getTournamentByTextId($id){
     if (!preg_match('/\./', $id)) {
       $id .= '.txt';
     }
 
-    $sql = sprintf ("SELECT * FROM {%s} t 
+    $sql = sprintf ("SELECT * FROM %s t
       WHERE t.FileName = '%s'", self::TOURNAMENT_TABLE, $id);
-    $res = db_query($sql);    
+    $res = db_query($sql);
     return db_fetch_object($res);
   }
-  
   public function getQuestionsRes($id) {
     $sql = sprintf("SELECT * FROM {%s} WHERE ParentId=%d", self::QUESTION_TABLE, $id);
     return db_query($sql);
   }
+
+  public function getToursRes($id) {
+    $sql = sprintf("SELECT * FROM {%s} WHERE ParentId=%d", self::TOURNAMENT_TABLE, $id);
+    return db_query($sql);
+  }
   
   public function fetch_row($res) {
     return db_fetch_object($res);