Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
- <html>
- <head>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
- <title>File Compare</title>
- <style type="text/css">
- #page {
- font-family: sans-serif;
- }
- table {
- border-collapse: collapse;
- }
- td {
- white-space: nowrap;
- font-family: monospace;
- font-size: x-small;
- vertical-align: top;
- }
- td.fileName {
- background: #E6E6E6;
- font-family: sans-serif;
- font-size: small;
- }
- td.lineNumber {
- text-align: right;
- background: #FFC800;
- }
- td.added {
- background: #BEF0BE;
- }
- td.removed {
- background: #C8C8FF;
- }
- td.changed {
- background: #FFC8C8;
- }
- td.equal {
- background: #FFFFFF;
- }
- td.empty {
- background: #F2F2F2;
- }
- </style>
- <link rel="stylesheet" href="style.css" type="text/css">
- </head>
- <body>
- <table>
- <tr>
- <td class="lineNumber">3663</td><td class="equal">bool CEventSystem::ScheduleEvent(std::string deviceName, const std::string &Action, const std::string &eventName)</td><td class="lineNumber">3674</td><td class="equal">bool CEventSystem::ScheduleEvent(std::string deviceName, const std::string &Action, const std::string &eventName)</td>
- </tr>
- <tr>
- <td class="lineNumber">3664</td><td class="equal">{</td><td class="lineNumber">3675</td><td class="equal">{</td>
- </tr>
- <tr>
- <td class="lineNumber">3665</td><td class="equal"> std::vector<std::vector<std::string> > result;</td><td class="lineNumber">3676</td><td class="equal"> std::vector<std::vector<std::string> > result;</td>
- </tr>
- <tr>
- <td class="lineNumber">3666</td><td class="equal"> bool isScene = false;</td><td class="lineNumber">3677</td><td class="equal"> bool isScene = false;</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3678</td><td class="added"> bool isVariable = false;</td>
- </tr>
- <tr>
- <td class="lineNumber">3667</td><td class="equal"> int sceneType = 0;</td><td class="lineNumber">3679</td><td class="equal"> int sceneType = 0;</td>
- </tr>
- <tr>
- <td class="lineNumber">3668</td><td class="equal"></td><td class="lineNumber">3680</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3669</td><td class="equal"> if ((deviceName.find("Scene:") == 0) || (deviceName.find("Group:") == 0))</td><td class="lineNumber">3681</td><td class="equal"> if ((deviceName.find("Scene:") == 0) || (deviceName.find("Group:") == 0))</td>
- </tr>
- <tr>
- <td class="lineNumber">3670</td><td class="equal"> {</td><td class="lineNumber">3682</td><td class="equal"> {</td>
- </tr>
- <tr>
- <td class="lineNumber">3671</td><td class="equal"> isScene = true;</td><td class="lineNumber">3683</td><td class="equal"> isScene = true;</td>
- </tr>
- <tr>
- <td class="lineNumber">3672</td><td class="equal"> sceneType = 1;</td><td class="lineNumber">3684</td><td class="equal"> sceneType = 1;</td>
- </tr>
- <tr>
- <td class="lineNumber">3673</td><td class="equal"> if (deviceName.find("Group:") == 0) {</td><td class="lineNumber">3685</td><td class="equal"> if (deviceName.find("Group:") == 0) {</td>
- </tr>
- <tr>
- <td class="lineNumber">3674</td><td class="equal"> sceneType = 2;</td><td class="lineNumber">3686</td><td class="equal"> sceneType = 2;</td>
- </tr>
- <tr>
- <td class="lineNumber">3675</td><td class="equal"> }</td><td class="lineNumber">3687</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3676</td><td class="equal"> deviceName = deviceName.substr(6);</td><td class="lineNumber">3688</td><td class="equal"> deviceName = deviceName.substr(6);</td>
- </tr>
- <tr>
- <td class="lineNumber">3677</td><td class="equal"> }</td><td class="lineNumber">3689</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3678</td><td class="equal"> else if (deviceName.find("SendCamera:") == 0)</td><td class="lineNumber">3690</td><td class="equal"> else if (deviceName.find("SendCamera:") == 0)</td>
- </tr>
- <tr>
- <td class="lineNumber">3679</td><td class="equal"> {</td><td class="lineNumber">3691</td><td class="equal"> {</td>
- </tr>
- <tr>
- <td class="lineNumber">3680</td><td class="equal"> deviceName = deviceName.substr(11);</td><td class="lineNumber">3692</td><td class="equal"> deviceName = deviceName.substr(11);</td>
- </tr>
- <tr>
- <td class="lineNumber">3681</td><td class="equal"> result = m_sql.safe_query("SELECT Name FROM Cameras WHERE (ID == '%q')", deviceName.c_str());</td><td class="lineNumber">3693</td><td class="equal"> result = m_sql.safe_query("SELECT Name FROM Cameras WHERE (ID == '%q')", deviceName.c_str());</td>
- </tr>
- <tr>
- <td class="lineNumber">3682</td><td class="equal"> if (result.empty())</td><td class="lineNumber">3694</td><td class="equal"> if (result.empty())</td>
- </tr>
- <tr>
- <td class="lineNumber">3683</td><td class="equal"> return false;</td><td class="lineNumber">3695</td><td class="equal"> return false;</td>
- </tr>
- <tr>
- <td class="lineNumber">3684</td><td class="equal"></td><td class="lineNumber">3696</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3685</td><td class="equal"> std::string cAction = Action;</td><td class="lineNumber">3697</td><td class="equal"> std::string cAction = Action;</td>
- </tr>
- <tr>
- <td class="lineNumber">3686</td><td class="equal"> float delay = 0;</td><td class="lineNumber">3698</td><td class="equal"> float delay = 0;</td>
- </tr>
- <tr>
- <td class="lineNumber">3687</td><td class="equal"> size_t aFind = Action.find(" AFTER ");</td><td class="lineNumber">3699</td><td class="equal"> size_t aFind = Action.find(" AFTER ");</td>
- </tr>
- <tr>
- <td class="lineNumber">3688</td><td class="equal"> if ((aFind > 0) && (aFind != std::string::npos)) {</td><td class="lineNumber">3700</td><td class="equal"> if ((aFind > 0) && (aFind != std::string::npos)) {</td>
- </tr>
- <tr>
- <td class="lineNumber">3689</td><td class="equal"> std::string delayString = Action.substr(aFind + 7);</td><td class="lineNumber">3701</td><td class="equal"> std::string delayString = Action.substr(aFind + 7);</td>
- </tr>
- <tr>
- <td class="lineNumber">3690</td><td class="equal"> std::string newAction = Action.substr(0, aFind);</td><td class="lineNumber">3702</td><td class="equal"> std::string newAction = Action.substr(0, aFind);</td>
- </tr>
- <tr>
- <td class="lineNumber">3691</td><td class="equal"> delay = static_cast<float>(atof(delayString.c_str()));</td><td class="lineNumber">3703</td><td class="equal"> delay = static_cast<float>(atof(delayString.c_str()));</td>
- </tr>
- <tr>
- <td class="lineNumber">3692</td><td class="equal"> cAction = newAction;</td><td class="lineNumber">3704</td><td class="equal"> cAction = newAction;</td>
- </tr>
- <tr>
- <td class="lineNumber">3693</td><td class="equal"> }</td><td class="lineNumber">3705</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3694</td><td class="equal"> StripQuotes(cAction);</td><td class="lineNumber">3706</td><td class="equal"> StripQuotes(cAction);</td>
- </tr>
- <tr>
- <td class="lineNumber">3695</td><td class="equal"></td><td class="lineNumber">3707</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3696</td><td class="equal"></td><td class="lineNumber">3708</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3697</td><td class="equal"> std::string subject = cAction;</td><td class="lineNumber">3709</td><td class="equal"> std::string subject = cAction;</td>
- </tr>
- <tr>
- <td class="lineNumber">3698</td><td class="equal"> if (delay < (1./timer_resolution_hz/2))</td><td class="lineNumber">3710</td><td class="equal"> if (delay < (1./timer_resolution_hz/2))</td>
- </tr>
- <tr>
- <td class="lineNumber">3699</td><td class="equal"> {</td><td class="lineNumber">3711</td><td class="equal"> {</td>
- </tr>
- <tr>
- <td class="lineNumber">3700</td><td class="equal"> m_mainworker.m_cameras.EmailCameraSnapshot(deviceName, subject);</td><td class="lineNumber">3712</td><td class="equal"> m_mainworker.m_cameras.EmailCameraSnapshot(deviceName, subject);</td>
- </tr>
- <tr>
- <td class="lineNumber">3701</td><td class="equal"> }</td><td class="lineNumber">3713</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3702</td><td class="equal"> else</td><td class="lineNumber">3714</td><td class="equal"> else</td>
- </tr>
- <tr>
- <td class="lineNumber">3703</td><td class="equal"> m_sql.AddTaskItem(_tTaskItem::EmailCameraSnapshot(delay, deviceName, subject));</td><td class="lineNumber">3715</td><td class="equal"> m_sql.AddTaskItem(_tTaskItem::EmailCameraSnapshot(delay, deviceName, subject));</td>
- </tr>
- <tr>
- <td class="lineNumber">3704</td><td class="equal"> return true;</td><td class="lineNumber">3716</td><td class="equal"> return true;</td>
- </tr>
- <tr>
- <td class="lineNumber">3705</td><td class="equal"> }</td><td class="lineNumber">3717</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3718</td><td class="added"> else if ((deviceName.find("Variable:") == 0))</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3719</td><td class="added"> {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3720</td><td class="added"> isVariable = true;</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3721</td><td class="added"> deviceName = deviceName.substr(9);</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3722</td><td class="added"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3706</td><td class="equal"></td><td class="lineNumber">3723</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3707</td><td class="equal"> if (isScene) {</td><td class="lineNumber">3724</td><td class="equal"> if (isScene) {</td>
- </tr>
- <tr>
- <td class="lineNumber">3708</td><td class="equal"> result = m_sql.safe_query("SELECT ID FROM Scenes WHERE (Name == '%q')",</td><td class="lineNumber">3725</td><td class="equal"> result = m_sql.safe_query("SELECT ID FROM Scenes WHERE (Name == '%q')",</td>
- </tr>
- <tr>
- <td class="lineNumber">3709</td><td class="equal"> deviceName.c_str());</td><td class="lineNumber">3726</td><td class="equal"> deviceName.c_str());</td>
- </tr>
- <tr>
- <td class="lineNumber">3710</td><td class="equal"> }</td><td class="lineNumber">3727</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3728</td><td class="added"> else if (isVariable) {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3729</td><td class="added"> result = m_sql.safe_query("SELECT ID FROM UserVariables WHERE (Name == '%q')",</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3730</td><td class="added"> deviceName.c_str());</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3731</td><td class="added"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3711</td><td class="equal"> else {</td><td class="lineNumber">3732</td><td class="equal"> else {</td>
- </tr>
- <tr>
- <td class="lineNumber">3712</td><td class="equal"> result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (Name == '%q')",</td><td class="lineNumber">3733</td><td class="equal"> result = m_sql.safe_query("SELECT ID FROM DeviceStatus WHERE (Name == '%q')",</td>
- </tr>
- <tr>
- <td class="lineNumber">3713</td><td class="equal"> deviceName.c_str());</td><td class="lineNumber">3734</td><td class="equal"> deviceName.c_str());</td>
- </tr>
- <tr>
- <td class="lineNumber">3714</td><td class="equal"> }</td><td class="lineNumber">3735</td><td class="equal"> }</td>
- </tr>
- <tr>
- <td class="lineNumber">3715</td><td class="equal"> if (result.size()>0)</td><td class="lineNumber">3736</td><td class="equal"> if (result.size()>0)</td>
- </tr>
- <tr>
- <td class="lineNumber">3716</td><td class="equal"> {</td><td class="lineNumber">3737</td><td class="equal"> {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3738</td><td class="added"> if (isVariable) {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3739</td><td class="added"> std::vector<std::string> variableID = result[0];</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3740</td><td class="added"> std::vector<std::vector<std::string> > result2;</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3741</td><td class="added"></td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3742</td><td class="added"> result2 = m_sql.safe_query("SELECT Name, ValueType FROM UserVariables WHERE (ID == '%q')", variableID[0].c_str()<br>);</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3743</td><td class="added"> if (result2.size() > 0) {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3744</td><td class="added"> std::vector<std::string> valueAndType = result2[0];</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3745</td><td class="added"> std::string updateResult = m_sql.UpdateUserVariable(variableID[0], valueAndType[0], valueAndType[1], Ac<br>tion, false);</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3746</td><td class="added"> if (updateResult != "OK") {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3747</td><td class="added"> _log.Log(LOG_ERROR, "ScheduleEvent: Error variable %s: %s", valueAndType[0].c_str(), updateResult.c<br>_str());</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3748</td><td class="added"> }</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3749</td><td class="added"> } else {</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3750</td><td class="added"> _log.Log(LOG_ERROR, "ScheduleEvent: Error searcing variable %s ID=%s", deviceName.c_str(), variableID[0].c_str<br>());</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3751</td><td class="added"> }</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3752</td><td class="added"> return true;</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3753</td><td class="added"> } else {</td>
- </tr>
- <tr>
- <td class="lineNumber">3717</td><td class="changed"> std::vector<std::string> sd = result[0];</td><td class="lineNumber">3754</td><td class="changed"> std::vector<std::string> variableID = result[0];</td>
- </tr>
- <tr>
- <td class="lineNumber">3718</td><td class="changed"> int idx = atoi(sd[0].c_str());</td><td class="lineNumber">3755</td><td class="changed"> int idx = atoi(variableID[0].c_str());</td>
- </tr>
- <tr>
- <td class="lineNumber">3719</td><td class="equal"> return (ScheduleEvent(idx, Action, isScene, eventName, sceneType));</td><td class="lineNumber">3756</td><td class="equal"> return (ScheduleEvent(idx, Action, isScene, eventName, sceneType));</td>
- </tr>
- <tr>
- <td class="lineNumber">3720</td><td class="changed"> }</td><td class="lineNumber">3757</td><td class="changed"> }</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3758</td><td class="added"> }</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3759</td><td class="added"></td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3760</td><td class="added"> // For debugging Variable setting</td>
- </tr>
- <tr>
- <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3761</td><td class="added"> _log.Log(LOG_ERROR, "ScheduleEvent: Error, %s not found", deviceName.c_str());</td>
- </tr>
- <tr>
- <td class="lineNumber">3721</td><td class="equal"></td><td class="lineNumber">3762</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3722</td><td class="equal"> return false;</td><td class="lineNumber">3763</td><td class="equal"> return false;</td>
- </tr>
- <tr>
- <td class="lineNumber">3723</td><td class="equal">}</td><td class="lineNumber">3764</td><td class="equal">}</td>
- </tr>
- <tr>
- <td class="lineNumber">3724</td><td class="equal"></td><td class="lineNumber">3765</td><td class="equal"></td>
- </tr>
- <tr>
- <td class="lineNumber">3725</td><td class="equal"></td><td class="lineNumber">3766</td><td class="equal"></td>
- </tr>
- </table>
- </body>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement