[786] in BarnOwl Developers
[D-O-H] r790 - in trunk/conf.alexmv: modules sql
daemon@ATHENA.MIT.EDU (chmrr@MIT.EDU)
Thu Oct 29 18:09:42 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: chmrr@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Date: Sun, 30 Dec 2007 22:54:40 -0500
Author: chmrr
Date: 2007-12-30 22:54:39 -0500 (Sun, 30 Dec 2007)
New Revision: 790
Modified:
trunk/conf.alexmv/modules/owlconf-dbi
trunk/conf.alexmv/sql/zephyr_log.sql
Log:
* Canonicalize class and sender, add base_class
Modified: trunk/conf.alexmv/modules/owlconf-dbi
===================================================================
--- trunk/conf.alexmv/modules/owlconf-dbi 2007-12-31 01:53:07 UTC (rev 789)
+++ trunk/conf.alexmv/modules/owlconf-dbi 2007-12-31 03:54:39 UTC (rev 790)
@@ -10,7 +10,7 @@
return if $owl::dbh and $owl::dbh->ping;
$owl::dbh = DBI->connect("DBI:mysql:database=zephyr_log",
"owl", "", {RaiseError => 1});
- $owl::sth = $owl::dbh->prepare("INSERT INTO messages(sender, class, instance, opcode, sent, received, host, zsig, body) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+ $owl::sth = $owl::dbh->prepare(q{INSERT INTO messages(sender, class, base_class, instance, opcode, sent, received, host, zsig, body) VALUES (trim(trailing '@ATHENA.MIT.EDU' from ?), ?, trim(leading 'un' from trim(trailing '.d' from ?)), ?, ?, ?, ?, ?, ?, ?)});
}
sub owl::receive_msg {
@@ -19,7 +19,8 @@
my $sent = $owl::strp->parse_datetime($msg->time);
owl::db_connect();
$owl::sth->execute($msg->sender,
- $msg->class,
+ lc $msg->class,
+ lc $msg->class,
$msg->instance,
$msg->opcode ? $msg->opcode : undef,
$sent->datetime,
Modified: trunk/conf.alexmv/sql/zephyr_log.sql
===================================================================
--- trunk/conf.alexmv/sql/zephyr_log.sql 2007-12-31 01:53:07 UTC (rev 789)
+++ trunk/conf.alexmv/sql/zephyr_log.sql 2007-12-31 03:54:39 UTC (rev 790)
@@ -31,6 +31,7 @@
`host` varchar(200) NOT NULL default '',
`zsig` text NOT NULL,
`body` text,
+ `base_class` varchar(100) NOT NULL default '',
PRIMARY KEY (`id`),
KEY `index_class` (`class`),
KEY `index_instance` (`instance`),
@@ -40,8 +41,11 @@
KEY `index_sender` (`sender`),
KEY `index_host` (`host`),
KEY `index_sent` (`sent`),
- FULLTEXT KEY `index_body` (`body`)
-) ENGINE=MyISAM AUTO_INCREMENT=1517065 DEFAULT CHARSET=utf8;
+ KEY `index_base_class` (`base_class`),
+ FULLTEXT KEY `index_body` (`body`),
+ FULLTEXT KEY `index_zsig` (`zsig`),
+ FULLTEXT KEY `index_body_zsig` (`body`,`zsig`)
+) ENGINE=MyISAM AUTO_INCREMENT=2181045 DEFAULT CHARSET=utf8;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
