--- a/classes/basemodel.php	Mon Nov 23 16:24:57 2015 +0100
+++ b/classes/basemodel.php	Tue Feb 16 15:07:43 2016 +0100
@@ -86,14 +86,15 @@
     }
 
     protected function GetWordlist() {
-        $query = sprintf("SELECT * FROM `wordlist` WHERE `systemName`='%s' ORDER BY `name` ASC", $this->systemNAME);
+        $query = sprintf("SELECT * FROM `Wordlist` ORDER BY `name` ASC");
         $result = mysql_query($query);
         if (!$result){
-            return json_encode("Failed during selecting wordlist table.");;
+            return json_encode("Failed during selecting Wordlist table.");;
         }
         return $result;
     }
 
+    /*
     protected function GetSectionsById($section_id) {
         $query = sprintf("SELECT * FROM `sections_index` WHERE `id`=\"%s\"", $section_id);
         $result = mysql_query($query);
@@ -103,16 +104,19 @@
         }
         return $result;
     }
+    */
 
     protected function GetTaglist() {
-        $query = sprintf("SELECT * FROM `taglist` WHERE `systemName`='%s' ORDER BY `tag` ASC", $this->systemNAME);
+        //$query = sprintf("SELECT * FROM `Taglist` WHERE `systemName`='%s' ORDER BY `tag` ASC", $this->systemNAME);
+        $query = sprintf("SELECT * FROM `Taglist` ORDER BY `tag` ASC");
         $result = mysql_query($query);
         if (!$result) {
-            return json_encode("Failed during selecting taglist table.");
+            return json_encode("Failed during selecting Taglist table.");
         }
         return $result;
     }
 
+    /*
     protected function GetBooksById($bookId) {
         $query = sprintf("SELECT * FROM `books` WHERE id=\"%s\"", $bookId);
         $result = mysql_query($query);
@@ -121,21 +125,33 @@
         }
         return $result;
     }
+    */
+
+    protected function GetTagIdByTag($tag) {
+        $query = sprintf("SELECT * FROM `Taglist` WHERE `tag`='%s'", $tag);
+        $result = mysql_query($query);
+        if (!$result) {
+            return json_encode("Failed during selecting Taglist table.");
+        }
+        return $result["id"];
+    }
 
     protected function GetTopicList() {
-        $query = sprintf("SELECT * FROM `topics`");
+        //$query = sprintf("SELECT * FROM `topics`");
+        $query = sprintf("SELECT * FROM `Topic`");
         $result = mysql_query($query);
         if (!$result) {
-            return json_encode("Failed during selecting topics table.");
+            return json_encode("Failed during selecting Topic table.");
         }
         return $result;
     }
 
     protected function GetTopicById($topic_id) {
-        $query = sprintf("SELECT * FROM `topics` WHERE  id=\"%s\"", $topic_id);
+        //$query = sprintf("SELECT * FROM `topics` WHERE  id=\"%s\"", $topic_id);
+        $query = sprintf("SELECT * FROM `Topic` WHERE id=\"%s\"", $topic_id);
         $result = mysql_query($query);
         if (!$result) {
-            return json_encode("Failed during selecting topics table.");
+            return json_encode("Failed during selecting Topic table.");
         }
         return $result;
     }