Skip to content

Commit 22ba51a

Browse files
committed
moved insertStatement and createStatement and init up to PDOListener
1 parent d1930d9 commit 22ba51a

File tree

7 files changed

+47
-108
lines changed

7 files changed

+47
-108
lines changed

conf/support/event-handlers/dial-pdo-mysql-statements.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ UPDATE `${mysql.table.call}` SET `cause`=:cause,`cause_txt`=:causeTxt WHERE `uni
3434
</value></constructor-arg>
3535
</bean>
3636

37-
<bean id="startCallStatement" class="PDOStatement" scope="prototype"
37+
<bean id="insertStatement" class="PDOStatement" scope="prototype"
3838
factory-bean="pdoMysql" factory-method="prepare">
3939
<constructor-arg><value>
4040
INSERT INTO `${mysql.table.call}` (

conf/support/event-handlers/dial.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<property name="hangupStatement"><ref bean="hangupCallStatement"/></property>
88
<property name="dialedTimeStatement"><ref bean="dialedTimeStatement"/></property>
99
<property name="answeredTimeStatement"><ref bean="answeredTimeStatement"/></property>
10-
<property name="startCallStatement"><ref bean="startCallStatement"/></property>
10+
<property name="insertStatement"><ref bean="insertStatement"/></property>
1111
<property name="endCallStatement"><ref bean="endCallStatement"/></property>
1212
</bean>
1313
</beans>

src/mg/AsterTrace/EventHandlers/DialListener.php

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131

3232
class DialListener extends PDOListener
3333
{
34-
/**
35-
* @var \PDOStatement
36-
*/
37-
private $_startCallStatement;
38-
3934
/**
4035
* @var \PDOStatement
4136
*/
@@ -56,16 +51,6 @@ class DialListener extends PDOListener
5651
*/
5752
private $_answeredTimeStatement;
5853

59-
/**
60-
* @var \PDOStatement
61-
*/
62-
private $_createStatement;
63-
64-
public function setCreateStatement($statement)
65-
{
66-
$this->_createStatement = $statement;
67-
}
68-
6954
public function setHangupStatement($statement)
7055
{
7156
$this->_hangupStatement = $statement;
@@ -81,11 +66,6 @@ public function setAnsweredTimeStatement($statement)
8166
$this->_answeredTimeStatement = $statement;
8267
}
8368

84-
public function setStartCallStatement($statement)
85-
{
86-
$this->_startCallStatement = $statement;
87-
}
88-
8969
public function setEndCallStatement($statement)
9070
{
9171
$this->_endCallStatement = $statement;
@@ -130,7 +110,7 @@ public function onDialEnd($event)
130110

131111
public function onDialBegin($event)
132112
{
133-
$this->executeStatement($this->_startCallStatement, array(
113+
$this->executeStatement($this->insertStatement, array(
134114
'uniqueidSrc' => $event->getUniqueId(),
135115
'uniqueidDst' => $event->getDestUniqueID(),
136116
'eventStart' => serialize($event),
@@ -141,11 +121,6 @@ public function onDialBegin($event)
141121
'clidNum' => $event->getCallerIDNum()
142122
));
143123
}
144-
145-
public function init()
146-
{
147-
$this->executeStatement($this->_createStatement, array());
148-
}
149124
}
150125

151126

src/mg/AsterTrace/EventHandlers/DtmfListener.php

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,16 @@
3131

3232
class DtmfListener extends PDOListener
3333
{
34-
/**
35-
* @var \PDOStatement
36-
*/
37-
private $_insertStatement;
38-
39-
/**
40-
* @var \PDOStatement
41-
*/
42-
private $_createStatement;
43-
44-
public function setCreateStatement($statement)
45-
{
46-
$this->_createStatement = $statement;
47-
}
48-
49-
public function setInsertStatement($statement)
50-
{
51-
$this->_insertStatement = $statement;
52-
}
53-
5434
public function onDTMF($event)
5535
{
5636
if ($event->getEnd() == 'Yes') {
57-
$this->executeStatement($this->_insertStatement, array(
37+
$this->executeStatement($this->insertStatement, array(
5838
'uniqueid' => $event->getUniqueId(),
5939
'dtmf' => $event->getDigit(),
6040
'channel' => $event->getChannel()
6141
));
6242
}
6343
}
64-
65-
public function init()
66-
{
67-
$this->executeStatement($this->_createStatement, array());
68-
}
6944
}
7045

7146

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Listenes for all events. Will log all events to the
3+
* Listens for all events. Will log all events to the
44
* database by serializing the PAMI\Event\EventMessage class.
55
*
66
* PHP Version 5
@@ -31,29 +31,9 @@
3131

3232
class EventListener extends PDOListener
3333
{
34-
/**
35-
* @var \PDOStatement
36-
*/
37-
private $_insertStatement;
38-
39-
/**
40-
* @var \PDOStatement
41-
*/
42-
private $_createStatement;
43-
44-
public function setCreateStatement($statement)
45-
{
46-
$this->_createStatement = $statement;
47-
}
48-
49-
public function setInsertStatement($statement)
50-
{
51-
$this->_insertStatement = $statement;
52-
}
53-
5434
public function onAnyEvent($event)
5535
{
56-
$this->executeStatement($this->_insertStatement, array(
36+
$this->executeStatement($this->insertStatement, array(
5737
'name' => $event->getName(),
5838
'channel' => method_exists($event, 'getChannel') ? $event->getChannel() : '',
5939
'uniqueId' => method_exists($event, 'getUniqueId') ? $event->getUniqueId() : '',
@@ -63,10 +43,6 @@ public function onAnyEvent($event)
6343
));
6444
}
6545

66-
public function init()
67-
{
68-
$this->executeStatement($this->_createStatement, array());
69-
}
7046
}
7147

7248

src/mg/AsterTrace/EventHandlers/PDOListener.php

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@
3030

3131
abstract class PDOListener implements \Ding\Logger\ILoggerAware
3232
{
33+
/**
34+
* @var \PDOStatement
35+
*/
36+
protected $insertStatement;
37+
38+
/**
39+
* @var \PDOStatement
40+
*/
41+
protected $createStatement;
42+
3343
/**
3444
* @var \Logger
3545
*/
@@ -58,6 +68,36 @@ protected function executeStatement(\PDOStatement $statement, array $args)
5868
);
5969
}
6070
}
71+
/**
72+
* This will be called by the container. Will execute the create
73+
* stable statement.
74+
*
75+
* @return void
76+
*/
77+
public function init()
78+
{
79+
$this->executeStatement($this->createStatement, array());
80+
}
81+
82+
/**
83+
* Called by the container.
84+
*
85+
* @return void
86+
*/
87+
public function setCreateStatement($statement)
88+
{
89+
$this->createStatement = $statement;
90+
}
91+
92+
/**
93+
* Called by the container.
94+
*
95+
* @return void
96+
*/
97+
public function setInsertStatement($statement)
98+
{
99+
$this->insertStatement = $statement;
100+
}
61101
}
62102

63103

src/mg/AsterTrace/EventHandlers/VarSetListener.php

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -31,40 +31,13 @@
3131

3232
class VarSetListener extends PDOListener
3333
{
34-
/**
35-
* @var \PDOStatement
36-
*/
37-
private $_insertStatement;
38-
39-
/**
40-
* @var \PDOStatement
41-
*/
42-
private $_createStatement;
43-
44-
public function setCreateStatement($statement)
45-
{
46-
$this->_createStatement = $statement;
47-
}
48-
49-
public function setInsertStatement($statement)
50-
{
51-
$this->_insertStatement = $statement;
52-
}
53-
5434
public function onVarSet($event)
5535
{
56-
$this->executeStatement($this->_insertStatement, array(
36+
$this->executeStatement($this->insertStatement, array(
5737
'value' => $event->getValue(),
5838
'uniqueid' => $event->getUniqueId(),
5939
'channel' => $event->getChannel(),
6040
'name' => $event->getVariableName()
6141
));
6242
}
63-
64-
public function init()
65-
{
66-
$this->executeStatement($this->_createStatement, array());
67-
}
6843
}
69-
70-

0 commit comments

Comments
 (0)