Changeset 2136

Timestamp:

01/13/08 05:47:23 (3 years ago)

Author:

Maverick

Message:

Table names fix for trivia
Set gamebot's trivia module sql host to 'website'
Added a small note to BotAction.SQLQuery() in javadoc comments

Location:

trunk/twcore/src/twcore

Files:

• bots/gamebot/trivia/trivia.java (modified) (8 diffs)
• bots/multibot/trivia/trivia.java (modified) (7 diffs)
• core/BotAction.java (modified) (1 diff)

trunk/twcore/src/twcore/bots/gamebot/trivia/trivia.java

@@ -31 +31 @@
 
     Random          m_rnd;
-    String          mySQLHost = "server";
+    String          mySQLHost = "website";
     TimerTask       startGame, timerQuestion, timerHint, timerAnswer, timerNext;
     TimerTask       timedMessages, timedMessages2;
@@ -511 +511 @@
             ResultSet qryQuestionData;
             do {
-                qryQuestionData = m_botAction.SQLQuery( mySQLHost, "SELECT fnQuestionID, fcQuestion, fcAnswer, fcQuestionTypeName FROM tblquestion, tblquestiontype WHERE tblquestion.fnQuestionTypeID = tblquestiontype.fnQuestionTypeid AND fnTimesUsed="+m_mintimesused+" ORDER BY RAND("+m_rnd.nextInt()+") LIMIT 1");
+                qryQuestionData = m_botAction.SQLQuery( mySQLHost, "SELECT fnQuestionID, fcQuestion, fcAnswer, fcQuestionTypeName FROM tblQuestion, tblQuestionType WHERE tblQuestion.fnQuestionTypeID = tblQuestionType.fnQuestionTypeid AND fnTimesUsed="+m_mintimesused+" ORDER BY RAND("+m_rnd.nextInt()+") LIMIT 1");
                 if (!qryQuestionData.isBeforeFirst()) getMinTimesUsed();
             } while (!qryQuestionData.isBeforeFirst());
@@ -520 +520 @@
                 t_answer   = qryQuestionData.getString("fcAnswer").replaceAll("\\\\", "");
                 int ID = qryQuestionData.getInt("fnQuestionID");
-                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblquestion SET fnTimesUsed = fnTimesUsed + 1 WHERE fnQuestionID = "+ ID);
+                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblQuestion SET fnTimesUsed = fnTimesUsed + 1 WHERE fnQuestionID = "+ ID);
             }
             m_botAction.SQLClose( qryQuestionData );
@@ -536 +536 @@
     public void getMinTimesUsed() {
         try {
-            ResultSet qryMinTimesUsed = m_botAction.SQLQuery( mySQLHost, "SELECT MIN(fnTimesUsed) AS fnMinTimesUsed FROM tblquestion");
+            ResultSet qryMinTimesUsed = m_botAction.SQLQuery( mySQLHost, "SELECT MIN(fnTimesUsed) AS fnMinTimesUsed FROM tblQuestion");
             qryMinTimesUsed.next();
             int minUsed = qryMinTimesUsed.getInt("fnMinTimesUsed");
@@ -553 +553 @@
         topTen = new Vector<String>();
         try {
-            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPoints, fnPlayed, fnWon, fnPossible, fnRating FROM tblusertriviastats WHERE fnPossible >= 100 ORDER BY fnRating DESC LIMIT 10");
+            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPoints, fnPlayed, fnWon, fnPossible, fnRating FROM tblUserTriviaStats WHERE fnPossible >= 100 ORDER BY fnRating DESC LIMIT 10");
             while(result != null && result.next())
                 topTen.add(doTrimString(result.getString("fcUsername"), 17 ) + "Games Won ("+ doTrimString(""+result.getInt("fnWon") +":" + result.getInt("fnPlayed") +")",9) + "Pts Scored (" +doTrimString(""+ result.getInt("fnPoints") + ":" + result.getInt("fnPossible") + ")", 10) + "Rating: " + result.getInt("fnRating"));
@@ -570 +570 @@
             if (won) wonAdd = 1;
 
-            ResultSet qryHasTriviaRecord = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPlayed, fnWon, fnPoints, fnPossible FROM tblusertriviastats WHERE fcUserName = \"" + username+"\"");
+            ResultSet qryHasTriviaRecord = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPlayed, fnWon, fnPoints, fnPossible FROM tblUserTriviaStats WHERE fcUserName = \"" + username+"\"");
             if (!qryHasTriviaRecord.next()) {
                 double rating = ( (points+.0) / toWin * 750.0 ) * ( 1.0 + (wonAdd / 3.0) );
-                m_botAction.SQLQueryAndClose( mySQLHost, "INSERT INTO tblusertriviastats(fcUserName, fnPlayed, fnWon, fnPoints, fnPossible, fnRating) VALUES (\""+username+"\",1,"+wonAdd+","+points+","+toWin+","+rating+")");
+                m_botAction.SQLQueryAndClose( mySQLHost, "INSERT INTO tblUserTriviaStats(fcUserName, fnPlayed, fnWon, fnPoints, fnPossible, fnRating) VALUES (\""+username+"\",1,"+wonAdd+","+points+","+toWin+","+rating+")");
             } else {
                 double played = qryHasTriviaRecord.getInt("fnPlayed") + 1.0;
@@ -580 +580 @@
                 double pos    = qryHasTriviaRecord.getInt("fnPossible") + toWin;
                 double rating = ( pts / pos * 750.0) * ( 1.0 + (wins / played / 3.0) );
-                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblusertriviastats SET fnPlayed = fnPlayed+1, fnWon = fnWon + "+wonAdd+", fnPoints = fnPoints + "+ points+", fnPossible = fnPossible + "+ toWin +", fnRating = "+rating+" WHERE fcUserName = \"" + username+"\"");
+                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblUserTriviaStats SET fnPlayed = fnPlayed+1, fnWon = fnWon + "+wonAdd+", fnPoints = fnPoints + "+ points+", fnPossible = fnPossible + "+ toWin +", fnRating = "+rating+" WHERE fcUserName = \"" + username+"\"");
             }
             m_botAction.SQLClose( qryHasTriviaRecord );
@@ -594 +594 @@
         try{
 
-            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fnPoints, fnWon, fnPlayed, fnPossible, fnRating FROM tblusertriviastats WHERE fcUserName = \"" + username+"\"");
+            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fnPoints, fnWon, fnPlayed, fnPossible, fnRating FROM tblUserTriviaStats WHERE fcUserName = \"" + username+"\"");
             String info = "There is no record of player " + username;
             if(result.next())

trunk/twcore/src/twcore/bots/multibot/trivia/trivia.java

@@ -496 +496 @@
             ResultSet qryQuestionData;
             do {
-                qryQuestionData = m_botAction.SQLQuery( mySQLHost, "SELECT fnQuestionID, fcQuestion, fcAnswer, fcQuestionTypeName FROM tblquestion, tblquestiontype WHERE tblquestion.fnQuestionTypeID = tblquestiontype.fnQuestionTypeid AND fnTimesUsed="+m_mintimesused+" ORDER BY RAND("+m_rnd.nextInt()+") LIMIT 1");
+                qryQuestionData = m_botAction.SQLQuery( mySQLHost, "SELECT fnQuestionID, fcQuestion, fcAnswer, fcQuestionTypeName FROM tblQuestion, tblQuestionType WHERE tblQuestion.fnQuestionTypeID = tblQuestionType.fnQuestionTypeid AND fnTimesUsed="+m_mintimesused+" ORDER BY RAND("+m_rnd.nextInt()+") LIMIT 1");
                 if (!qryQuestionData.isBeforeFirst()) getMinTimesUsed();
             } while (!qryQuestionData.isBeforeFirst());
@@ -505 +505 @@
                 t_answer   = qryQuestionData.getString("fcAnswer").replaceAll("\\\\", "");
                 int ID = qryQuestionData.getInt("fnQuestionID");
-                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblquestion SET fnTimesUsed = fnTimesUsed + 1 WHERE fnQuestionID = "+ ID);
+                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblQuestion SET fnTimesUsed = fnTimesUsed + 1 WHERE fnQuestionID = "+ ID);
             }
             m_botAction.SQLClose( qryQuestionData );
@@ -521 +521 @@
     public void getMinTimesUsed() {
         try {
-            ResultSet qryMinTimesUsed = m_botAction.SQLQuery( mySQLHost, "SELECT MIN(fnTimesUsed) AS fnMinTimesUsed FROM tblquestion");
+            ResultSet qryMinTimesUsed = m_botAction.SQLQuery( mySQLHost, "SELECT MIN(fnTimesUsed) AS fnMinTimesUsed FROM tblQuestion");
             qryMinTimesUsed.next();
             int minUsed = qryMinTimesUsed.getInt("fnMinTimesUsed");
@@ -538 +538 @@
         topTen = new Vector<String>();
         try {
-            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPoints, fnPlayed, fnWon, fnPossible, fnRating FROM tblusertriviastats WHERE fnPossible >= 100 ORDER BY fnRating DESC LIMIT 10");
+            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPoints, fnPlayed, fnWon, fnPossible, fnRating FROM tblUserTriviaStats WHERE fnPossible >= 100 ORDER BY fnRating DESC LIMIT 10");
             while(result != null && result.next())
                 topTen.add(doTrimString(result.getString("fcUsername"), 17 ) + "Games Won ("+ doTrimString(""+result.getInt("fnWon") +":" + result.getInt("fnPlayed") +")",9) + "Pts Scored (" +doTrimString(""+ result.getInt("fnPoints") + ":" + result.getInt("fnPossible") + ")", 10) + "Rating: " + result.getInt("fnRating"));
@@ -555 +555 @@
             if (won) wonAdd = 1;
 
-            ResultSet qryHasTriviaRecord = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPlayed, fnWon, fnPoints, fnPossible FROM tblusertriviastats WHERE fcUserName = \"" + username+"\"");
+            ResultSet qryHasTriviaRecord = m_botAction.SQLQuery( mySQLHost, "SELECT fcUserName, fnPlayed, fnWon, fnPoints, fnPossible FROM tblUserTriviaStats WHERE fcUserName = \"" + username+"\"");
             if (!qryHasTriviaRecord.next()) {
                 double rating = ( (points+.0) / toWin * 750.0 ) * ( 1.0 + (wonAdd / 3.0) );
-                m_botAction.SQLQueryAndClose( mySQLHost, "INSERT INTO tblusertriviastats(fcUserName, fnPlayed, fnWon, fnPoints, fnPossible, fnRating) VALUES (\""+username+"\",1,"+wonAdd+","+points+","+toWin+","+rating+")");
+                m_botAction.SQLQueryAndClose( mySQLHost, "INSERT INTO tblUserTriviaStats(fcUserName, fnPlayed, fnWon, fnPoints, fnPossible, fnRating) VALUES (\""+username+"\",1,"+wonAdd+","+points+","+toWin+","+rating+")");
             } else {
                 double played = qryHasTriviaRecord.getInt("fnPlayed") + 1.0;
@@ -565 +565 @@
                 double pos    = qryHasTriviaRecord.getInt("fnPossible") + toWin;
                 double rating = ( pts / pos * 750.0) * ( 1.0 + (wins / played / 3.0) );
-                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblusertriviastats SET fnPlayed = fnPlayed+1, fnWon = fnWon + "+wonAdd+", fnPoints = fnPoints + "+ points+", fnPossible = fnPossible + "+ toWin +", fnRating = "+rating+" WHERE fcUserName = \"" + username+"\"");
+                m_botAction.SQLQueryAndClose( mySQLHost, "UPDATE tblUserTriviaStats SET fnPlayed = fnPlayed+1, fnWon = fnWon + "+wonAdd+", fnPoints = fnPoints + "+ points+", fnPossible = fnPossible + "+ toWin +", fnRating = "+rating+" WHERE fcUserName = \"" + username+"\"");
             }
             m_botAction.SQLClose( qryHasTriviaRecord );
@@ -579 +579 @@
         try{
 
-            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fnPoints, fnWon, fnPlayed, fnPossible, fnRating FROM tblusertriviastats WHERE fcUserName = \"" + username+"\"");
+            ResultSet result = m_botAction.SQLQuery( mySQLHost, "SELECT fnPoints, fnWon, fnPlayed, fnPossible, fnRating FROM tblUserTriviaStats WHERE fcUserName = \"" + username+"\"");
             String info = "There is no record of player " + username;
             if(result.next())

trunk/twcore/src/twcore/core/BotAction.java

@@ -2591 +2591 @@
      * @param query The SQL query to be executed
      * @throws SQLException SQLException
-     * @return ResultSet from the SQL Query.  You must close w/ {@link #SQLClose(ResultSet)} after use.
+     * @return ResultSet from the SQL Query. (MAY be null)  You must close w/ {@link #SQLClose(ResultSet)} after use.
      * @see #SQLQueryAndClose(String, String)
      */