Changeset 380:e9921b6fc914

Timestamp:

05/18/2009 11:36:45 PM (3 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Introduce some kind of MUC statistic. Currently collector only, however this is subject to change in future.
Currently PostgreSQL only.

Files:

• sql/pgsql.sql (modified) (2 diffs)
• sql/update/dbupdate.sh (modified) (1 diff)
• sql/update/pgsql/00380.sql (moved) (moved from sql/update/pgsql/00374.sql) (2 diffs)
• src/base/dbversion.h (modified) (1 diff)
• src/plugins/muc/jidstat.cpp (modified) (2 diffs)
• src/plugins/muc/jidstat.h (modified) (1 diff)
• src/plugins/muc/mucplugin.cpp (modified) (2 diffs)

sql/pgsql.sql

@@ -75 +75 @@
 );
 
+DROP TABLE IF EXISTS conference_jidstat CASCADE;
+CREATE TABLE conference_jidstat (
+  id SERIAL,
+  jid_id int NOT NULL,
+
+  time_online int NOT NULL default 0, 
+
+  lastaction int NOT NULL default '0',
+  lastreason varchar(200) NULL,
+
+  msg_count int NOT NULL default 0,
+  msg_chars int NOT NULL default 0,
+  msg_words int NOT NULL default 0,
+  msg_sentences int NOT NULL default 0,
+  msg_me int NOT NULL default 0,
+  msg_reply int NOT NULL default 0,
+  msg_subject int NOT NULL default 0,
+
+  cnt_join int NOT NULL default 0,
+  cnt_leave int NOT NULL default 0,
+  cnt_presence int NOT NULL default 0,
+  cnt_nickchange int NOT NULL default 0,
+  cnt_visitor int NOT NULL default 0,
+  cnt_participant int NOT NULL default 0,
+  cnt_moderator int NOT NULL default 0,
+  cnt_noaffiliation int NOT NULL default 0,
+  cnt_member int NOT NULL default 0,
+  cnt_administrator int NOT NULL default 0,
+  cnt_owner int NOT NULL default 0,
+  cnt_kick int NOT NULL default 0,
+  cnt_ban int NOT NULL default 0,
+ 
+  ver_name varchar(50) NULL,
+  ver_version varchar(50) NULL,
+  ver_os varchar(200) NULL,
+
+  PRIMARY KEY(id),
+  FOREIGN KEY(jid_id) REFERENCES conference_jids(id) ON DELETE CASCADE,
+  UNIQUE(jid_id)
+);
+
 DROP TABLE IF EXISTS webstatus CASCADE;
 CREATE TABLE webstatus (
@@ -137 +178 @@
 );
 
-INSERT INTO version (name, value) VALUES ('dbversion', 352);
+INSERT INTO version (name, value) VALUES ('dbversion', 380);

sql/update/dbupdate.sh

@@ -8 +8 @@
 QUERYCMD=""
 INLINE_SUFFIX=""
+
+if [ "$DBTYPE" = "mysql" ]; then
+        echo "MySQL support is currently out of date"
+        exit 1
+fi
 
 if [ -f "dbupdate.cfg" ]; then

sql/update/pgsql/00380.sql

@@ -15 +15 @@
   msg_me int NOT NULL default 0,
   msg_reply int NOT NULL default 0,
+  msg_subject int NOT NULL default 0,
 
   cnt_join int NOT NULL default 0,
@@ -30 +31 @@
   cnt_ban int NOT NULL default 0,
   
-  version varchar(200) NULL,
+  ver_name varchar(50) NULL,
+  ver_version varchar(50) NULL,
+  ver_os varchar(200) NULL,
 
   PRIMARY KEY(id),

src/base/dbversion.h

@@ -21 +21 @@
 #define DBVERSION_H
 
-#define GLUXI_DB_VERSION 352
+#define GLUXI_DB_VERSION 380
 
 #endif

src/plugins/muc/jidstat.cpp

@@ -161 +161 @@
 }
 
-void JidStat::setVersion(const QString& v)
-{
-        if (id_ <= 0)
-                return;
-
-        QSqlQuery q = DataStorage::instance()->prepareQuery(
-                        "UPDATE conference_jidstat SET version=? WHERE id=?"
-        );
-        q.addBindValue(v);
+void JidStat::setVersion(const QString& name, const QString& version, const QString& os)
+{
+        if (id_ <= 0)
+                return;
+
+        QSqlQuery q = DataStorage::instance()->prepareQuery(
+                        "UPDATE conference_jidstat SET ver_name=?, ver_version=?,ver_os=? WHERE id=?"
+        );
+        q.addBindValue(name);
+        q.addBindValue(version);
+        q.addBindValue(os);
         q.addBindValue(id_);
         if (!q.exec())
@@ -268 +270 @@
 }
 
+void JidStat::statSubject(const QString& subject)
+{
+        Q_UNUSED(subject);
+        if (id_ <= 0)
+                return;
+
+        QSqlQuery q = DataStorage::instance()->prepareQuery(
+                "UPDATE conference_jidstat SET msg_subject = msg_subject + 1 WHERE id=?");
+        q.addBindValue(id_);
+        if (!q.exec())
+        {
+                qDebug() << "ERROR: Unable to stat subject: " << q.lastError().text();
+        }
+}

src/plugins/muc/jidstat.h

@@ -53 +53 @@
         void commit();
         void setLastAction(ActionType type, const QString& reason);
-        void setVersion(const QString& version);
+        void setVersion(const QString& name, const QString& version, const QString& os);
         void updateOnlineTime();
         void statMessage(const QString& msg);
         void statReply();
+        void statSubject(const QString& subject);
 private:
         int id_;

src/plugins/muc/mucplugin.cpp

@@ -536 +536 @@
         JidStat *stat = nick->jidStat();
         if (stat)
-                stat->statMessage(msgBody);
+        {
+                if (!msgBody.isEmpty())
+                        stat->statMessage(msgBody);
+                QString subject = QString::fromStdString(s->subject());
+                if (!subject.isEmpty())
+                        stat->statSubject(subject);
+        }
 
         if (msgBody.contains(':'))
@@ -1237 +1243 @@
         if (stat)
         {
-                stat->setVersion(QString("%1 %2 // %3").arg(nick->versionName(),
-                                nick->versionClient(), nick->versionOs()));
+                stat->setVersion(nick->versionName(), nick->versionClient(),
+                                nick->versionOs());
         }