Advertisement
soikka

Untitled

Nov 8th, 2017
194
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
HTML 25.41 KB | None | 0 0
  1. <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  2. <html>
  3. <head>
  4.   <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
  5.   <title>File Compare</title>
  6.   <style type="text/css">
  7.   #page {
  8.     font-family: sans-serif;
  9.   }
  10.   table {
  11.     border-collapse: collapse;
  12.   }
  13.   td {
  14.     white-space: nowrap;
  15.     font-family: monospace;
  16.     font-size: x-small;
  17.     vertical-align: top;
  18.   }
  19.   td.fileName {
  20.     background: #E6E6E6;
  21.     font-family: sans-serif;
  22.     font-size: small;
  23.   }
  24.   td.lineNumber {
  25.     text-align: right;
  26.     background: #FFC800;
  27.   }
  28.   td.added {
  29.     background: #BEF0BE;
  30.   }
  31.   td.removed {
  32.     background: #C8C8FF;
  33.   }
  34.   td.changed {
  35.     background: #FFC8C8;
  36.   }
  37.   td.equal {
  38.     background: #FFFFFF;
  39.   }
  40.   td.empty {
  41.     background: #F2F2F2;
  42.   }
  43.   </style>
  44.   <link rel="stylesheet" href="style.css" type="text/css">
  45. </head>
  46. <body>
  47.   <table>
  48.       <tr>
  49. <td class="lineNumber">3663</td><td class="equal">bool&nbsp;CEventSystem::ScheduleEvent(std::string&nbsp;deviceName,&nbsp;const&nbsp;std::string&nbsp;&amp;Action,&nbsp;const&nbsp;std::string&nbsp;&amp;eventName)</td><td class="lineNumber">3674</td><td class="equal">bool&nbsp;CEventSystem::ScheduleEvent(std::string&nbsp;deviceName,&nbsp;const&nbsp;std::string&nbsp;&amp;Action,&nbsp;const&nbsp;std::string&nbsp;&amp;eventName)</td>
  50.       </tr>
  51.       <tr>
  52. <td class="lineNumber">3664</td><td class="equal">{</td><td class="lineNumber">3675</td><td class="equal">{</td>
  53.       </tr>
  54.       <tr>
  55. <td class="lineNumber">3665</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::vector&lt;std::string&gt;&nbsp;&gt;&nbsp;result;</td><td class="lineNumber">3676</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::vector&lt;std::string&gt;&nbsp;&gt;&nbsp;result;</td>
  56.       </tr>
  57.       <tr>
  58. <td class="lineNumber">3666</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;bool&nbsp;isScene&nbsp;=&nbsp;false;</td><td class="lineNumber">3677</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;bool&nbsp;isScene&nbsp;=&nbsp;false;</td>
  59.       </tr>
  60.       <tr>
  61. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3678</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;bool&nbsp;isVariable&nbsp;=&nbsp;false;</td>
  62.       </tr>
  63.       <tr>
  64. <td class="lineNumber">3667</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;sceneType&nbsp;=&nbsp;0;</td><td class="lineNumber">3679</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;sceneType&nbsp;=&nbsp;0;</td>
  65.       </tr>
  66.       <tr>
  67. <td class="lineNumber">3668</td><td class="equal"></td><td class="lineNumber">3680</td><td class="equal"></td>
  68.       </tr>
  69.       <tr>
  70. <td class="lineNumber">3669</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;((deviceName.find(&quot;Scene:&quot;)&nbsp;==&nbsp;0)&nbsp;||&nbsp;(deviceName.find(&quot;Group:&quot;)&nbsp;==&nbsp;0))</td><td class="lineNumber">3681</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;((deviceName.find(&quot;Scene:&quot;)&nbsp;==&nbsp;0)&nbsp;||&nbsp;(deviceName.find(&quot;Group:&quot;)&nbsp;==&nbsp;0))</td>
  71.       </tr>
  72.       <tr>
  73. <td class="lineNumber">3670</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;{</td><td class="lineNumber">3682</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;{</td>
  74.       </tr>
  75.       <tr>
  76. <td class="lineNumber">3671</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;isScene&nbsp;=&nbsp;true;</td><td class="lineNumber">3683</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;isScene&nbsp;=&nbsp;true;</td>
  77.       </tr>
  78.       <tr>
  79. <td class="lineNumber">3672</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sceneType&nbsp;=&nbsp;1;</td><td class="lineNumber">3684</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sceneType&nbsp;=&nbsp;1;</td>
  80.       </tr>
  81.       <tr>
  82. <td class="lineNumber">3673</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(deviceName.find(&quot;Group:&quot;)&nbsp;==&nbsp;0)&nbsp;{</td><td class="lineNumber">3685</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(deviceName.find(&quot;Group:&quot;)&nbsp;==&nbsp;0)&nbsp;{</td>
  83.       </tr>
  84.       <tr>
  85. <td class="lineNumber">3674</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sceneType&nbsp;=&nbsp;2;</td><td class="lineNumber">3686</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sceneType&nbsp;=&nbsp;2;</td>
  86.       </tr>
  87.       <tr>
  88. <td class="lineNumber">3675</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3687</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  89.       </tr>
  90.       <tr>
  91. <td class="lineNumber">3676</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName&nbsp;=&nbsp;deviceName.substr(6);</td><td class="lineNumber">3688</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName&nbsp;=&nbsp;deviceName.substr(6);</td>
  92.       </tr>
  93.       <tr>
  94. <td class="lineNumber">3677</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3689</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  95.       </tr>
  96.       <tr>
  97. <td class="lineNumber">3678</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;else&nbsp;if&nbsp;(deviceName.find(&quot;SendCamera:&quot;)&nbsp;==&nbsp;0)</td><td class="lineNumber">3690</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;else&nbsp;if&nbsp;(deviceName.find(&quot;SendCamera:&quot;)&nbsp;==&nbsp;0)</td>
  98.       </tr>
  99.       <tr>
  100. <td class="lineNumber">3679</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;{</td><td class="lineNumber">3691</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;{</td>
  101.       </tr>
  102.       <tr>
  103. <td class="lineNumber">3680</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName&nbsp;=&nbsp;deviceName.substr(11);</td><td class="lineNumber">3692</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName&nbsp;=&nbsp;deviceName.substr(11);</td>
  104.       </tr>
  105.       <tr>
  106. <td class="lineNumber">3681</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;Name&nbsp;FROM&nbsp;Cameras&nbsp;WHERE&nbsp;(ID&nbsp;==&nbsp;'%q')&quot;,&nbsp;deviceName.c_str());</td><td class="lineNumber">3693</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;Name&nbsp;FROM&nbsp;Cameras&nbsp;WHERE&nbsp;(ID&nbsp;==&nbsp;'%q')&quot;,&nbsp;deviceName.c_str());</td>
  107.       </tr>
  108.       <tr>
  109. <td class="lineNumber">3682</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(result.empty())</td><td class="lineNumber">3694</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(result.empty())</td>
  110.       </tr>
  111.       <tr>
  112. <td class="lineNumber">3683</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;false;</td><td class="lineNumber">3695</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;false;</td>
  113.       </tr>
  114.       <tr>
  115. <td class="lineNumber">3684</td><td class="equal"></td><td class="lineNumber">3696</td><td class="equal"></td>
  116.       </tr>
  117.       <tr>
  118. <td class="lineNumber">3685</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;cAction&nbsp;=&nbsp;Action;</td><td class="lineNumber">3697</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;cAction&nbsp;=&nbsp;Action;</td>
  119.       </tr>
  120.       <tr>
  121. <td class="lineNumber">3686</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;float&nbsp;delay&nbsp;=&nbsp;0;</td><td class="lineNumber">3698</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;float&nbsp;delay&nbsp;=&nbsp;0;</td>
  122.       </tr>
  123.       <tr>
  124. <td class="lineNumber">3687</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;size_t&nbsp;aFind&nbsp;=&nbsp;Action.find(&quot;&nbsp;AFTER&nbsp;&quot;);</td><td class="lineNumber">3699</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;size_t&nbsp;aFind&nbsp;=&nbsp;Action.find(&quot;&nbsp;AFTER&nbsp;&quot;);</td>
  125.       </tr>
  126.       <tr>
  127. <td class="lineNumber">3688</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;((aFind&nbsp;&gt;&nbsp;0)&nbsp;&amp;&amp;&nbsp;(aFind&nbsp;!=&nbsp;std::string::npos))&nbsp;{</td><td class="lineNumber">3700</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;((aFind&nbsp;&gt;&nbsp;0)&nbsp;&amp;&amp;&nbsp;(aFind&nbsp;!=&nbsp;std::string::npos))&nbsp;{</td>
  128.       </tr>
  129.       <tr>
  130. <td class="lineNumber">3689</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;delayString&nbsp;=&nbsp;Action.substr(aFind&nbsp;+&nbsp;7);</td><td class="lineNumber">3701</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;delayString&nbsp;=&nbsp;Action.substr(aFind&nbsp;+&nbsp;7);</td>
  131.       </tr>
  132.       <tr>
  133. <td class="lineNumber">3690</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;newAction&nbsp;=&nbsp;Action.substr(0,&nbsp;aFind);</td><td class="lineNumber">3702</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;newAction&nbsp;=&nbsp;Action.substr(0,&nbsp;aFind);</td>
  134.       </tr>
  135.       <tr>
  136. <td class="lineNumber">3691</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;delay&nbsp;=&nbsp;static_cast&lt;float&gt;(atof(delayString.c_str()));</td><td class="lineNumber">3703</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;delay&nbsp;=&nbsp;static_cast&lt;float&gt;(atof(delayString.c_str()));</td>
  137.       </tr>
  138.       <tr>
  139. <td class="lineNumber">3692</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;cAction&nbsp;=&nbsp;newAction;</td><td class="lineNumber">3704</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;cAction&nbsp;=&nbsp;newAction;</td>
  140.       </tr>
  141.       <tr>
  142. <td class="lineNumber">3693</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3705</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  143.       </tr>
  144.       <tr>
  145. <td class="lineNumber">3694</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;StripQuotes(cAction);</td><td class="lineNumber">3706</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;StripQuotes(cAction);</td>
  146.       </tr>
  147.       <tr>
  148. <td class="lineNumber">3695</td><td class="equal"></td><td class="lineNumber">3707</td><td class="equal"></td>
  149.       </tr>
  150.       <tr>
  151. <td class="lineNumber">3696</td><td class="equal"></td><td class="lineNumber">3708</td><td class="equal"></td>
  152.       </tr>
  153.       <tr>
  154. <td class="lineNumber">3697</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;subject&nbsp;=&nbsp;cAction;</td><td class="lineNumber">3709</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;subject&nbsp;=&nbsp;cAction;</td>
  155.       </tr>
  156.       <tr>
  157. <td class="lineNumber">3698</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(delay&nbsp;&lt;&nbsp;(1./timer_resolution_hz/2))</td><td class="lineNumber">3710</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(delay&nbsp;&lt;&nbsp;(1./timer_resolution_hz/2))</td>
  158.       </tr>
  159.       <tr>
  160. <td class="lineNumber">3699</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{</td><td class="lineNumber">3711</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{</td>
  161.       </tr>
  162.       <tr>
  163. <td class="lineNumber">3700</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;m_mainworker.m_cameras.EmailCameraSnapshot(deviceName,&nbsp;subject);</td><td class="lineNumber">3712</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;m_mainworker.m_cameras.EmailCameraSnapshot(deviceName,&nbsp;subject);</td>
  164.       </tr>
  165.       <tr>
  166. <td class="lineNumber">3701</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3713</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  167.       </tr>
  168.       <tr>
  169. <td class="lineNumber">3702</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;else</td><td class="lineNumber">3714</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;else</td>
  170.       </tr>
  171.       <tr>
  172. <td class="lineNumber">3703</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;m_sql.AddTaskItem(_tTaskItem::EmailCameraSnapshot(delay,&nbsp;deviceName,&nbsp;subject));</td><td class="lineNumber">3715</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;m_sql.AddTaskItem(_tTaskItem::EmailCameraSnapshot(delay,&nbsp;deviceName,&nbsp;subject));</td>
  173.       </tr>
  174.       <tr>
  175. <td class="lineNumber">3704</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;true;</td><td class="lineNumber">3716</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;true;</td>
  176.       </tr>
  177.       <tr>
  178. <td class="lineNumber">3705</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3717</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  179.       </tr>
  180.       <tr>
  181. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3718</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;else&nbsp;if&nbsp;((deviceName.find(&quot;Variable:&quot;)&nbsp;==&nbsp;0))</td>
  182.       </tr>
  183.       <tr>
  184. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3719</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;{</td>
  185.       </tr>
  186.       <tr>
  187. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3720</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;isVariable&nbsp;=&nbsp;true;</td>
  188.       </tr>
  189.       <tr>
  190. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3721</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName&nbsp;=&nbsp;deviceName.substr(9);</td>
  191.       </tr>
  192.       <tr>
  193. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3722</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  194.       </tr>
  195.       <tr>
  196. <td class="lineNumber">3706</td><td class="equal"></td><td class="lineNumber">3723</td><td class="equal"></td>
  197.       </tr>
  198.       <tr>
  199. <td class="lineNumber">3707</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(isScene)&nbsp;{</td><td class="lineNumber">3724</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(isScene)&nbsp;{</td>
  200.       </tr>
  201.       <tr>
  202. <td class="lineNumber">3708</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;ID&nbsp;FROM&nbsp;Scenes&nbsp;WHERE&nbsp;(Name&nbsp;==&nbsp;'%q')&quot;,</td><td class="lineNumber">3725</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;ID&nbsp;FROM&nbsp;Scenes&nbsp;WHERE&nbsp;(Name&nbsp;==&nbsp;'%q')&quot;,</td>
  203.       </tr>
  204.       <tr>
  205. <td class="lineNumber">3709</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName.c_str());</td><td class="lineNumber">3726</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName.c_str());</td>
  206.       </tr>
  207.       <tr>
  208. <td class="lineNumber">3710</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3727</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  209.       </tr>
  210.       <tr>
  211. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3728</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;else&nbsp;if&nbsp;(isVariable)&nbsp;{</td>
  212.       </tr>
  213.       <tr>
  214. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3729</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;ID&nbsp;FROM&nbsp;UserVariables&nbsp;WHERE&nbsp;(Name&nbsp;==&nbsp;'%q')&quot;,</td>
  215.       </tr>
  216.       <tr>
  217. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3730</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName.c_str());</td>
  218.       </tr>
  219.       <tr>
  220. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3731</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  221.       </tr>
  222.       <tr>
  223. <td class="lineNumber">3711</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;else&nbsp;{</td><td class="lineNumber">3732</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;else&nbsp;{</td>
  224.       </tr>
  225.       <tr>
  226. <td class="lineNumber">3712</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;ID&nbsp;FROM&nbsp;DeviceStatus&nbsp;WHERE&nbsp;(Name&nbsp;==&nbsp;'%q')&quot;,</td><td class="lineNumber">3733</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;ID&nbsp;FROM&nbsp;DeviceStatus&nbsp;WHERE&nbsp;(Name&nbsp;==&nbsp;'%q')&quot;,</td>
  227.       </tr>
  228.       <tr>
  229. <td class="lineNumber">3713</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName.c_str());</td><td class="lineNumber">3734</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;deviceName.c_str());</td>
  230.       </tr>
  231.       <tr>
  232. <td class="lineNumber">3714</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3735</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  233.       </tr>
  234.       <tr>
  235. <td class="lineNumber">3715</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(result.size()&gt;0)</td><td class="lineNumber">3736</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(result.size()&gt;0)</td>
  236.       </tr>
  237.       <tr>
  238. <td class="lineNumber">3716</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;{</td><td class="lineNumber">3737</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;{</td>
  239.       </tr>
  240.       <tr>
  241. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3738</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(isVariable)&nbsp;{</td>
  242.       </tr>
  243.       <tr>
  244. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3739</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::string&gt;&nbsp;variableID&nbsp;=&nbsp;result[0];</td>
  245.       </tr>
  246.       <tr>
  247. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3740</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::vector&lt;std::string&gt;&nbsp;&gt;&nbsp;result2;</td>
  248.       </tr>
  249.       <tr>
  250. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3741</td><td class="added"></td>
  251.       </tr>
  252.       <tr>
  253. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3742</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result2&nbsp;=&nbsp;m_sql.safe_query(&quot;SELECT&nbsp;Name,&nbsp;ValueType&nbsp;FROM&nbsp;UserVariables&nbsp;WHERE&nbsp;(ID&nbsp;==&nbsp;'%q')&quot;,&nbsp;variableID[0].c_str()<br>);</td>
  254.       </tr>
  255.       <tr>
  256. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3743</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(result2.size()&nbsp;&gt;&nbsp;0)&nbsp;{</td>
  257.       </tr>
  258.       <tr>
  259. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3744</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::string&gt;&nbsp;valueAndType&nbsp;=&nbsp;result2[0];</td>
  260.       </tr>
  261.       <tr>
  262. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3745</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::string&nbsp;updateResult&nbsp;=&nbsp;m_sql.UpdateUserVariable(variableID[0],&nbsp;valueAndType[0],&nbsp;valueAndType[1],&nbsp;Ac<br>tion,&nbsp;false);</td>
  263.       </tr>
  264.       <tr>
  265. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3746</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(updateResult&nbsp;!=&nbsp;&quot;OK&quot;)&nbsp;{</td>
  266.       </tr>
  267.       <tr>
  268. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3747</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_log.Log(LOG_ERROR,&nbsp;&quot;ScheduleEvent:&nbsp;Error&nbsp;variable&nbsp;%s:&nbsp;%s&quot;,&nbsp;valueAndType[0].c_str(),&nbsp;updateResult.c<br>_str());</td>
  269.       </tr>
  270.       <tr>
  271. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3748</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  272.       </tr>
  273.       <tr>
  274. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3749</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{</td>
  275.       </tr>
  276.       <tr>
  277. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3750</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_log.Log(LOG_ERROR,&nbsp;&quot;ScheduleEvent:&nbsp;Error&nbsp;searcing&nbsp;variable&nbsp;%s&nbsp;ID=%s&quot;,&nbsp;deviceName.c_str(),&nbsp;variableID[0].c_str<br>());</td>
  278.       </tr>
  279.       <tr>
  280. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3751</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  281.       </tr>
  282.       <tr>
  283. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3752</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;true;</td>
  284.       </tr>
  285.       <tr>
  286. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3753</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{</td>
  287.       </tr>
  288.       <tr>
  289. <td class="lineNumber">3717</td><td class="changed">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::string&gt;&nbsp;sd&nbsp;=&nbsp;result[0];</td><td class="lineNumber">3754</td><td class="changed">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;std::vector&lt;std::string&gt;&nbsp;variableID&nbsp;=&nbsp;result[0];</td>
  290.       </tr>
  291.       <tr>
  292. <td class="lineNumber">3718</td><td class="changed">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;idx&nbsp;=&nbsp;atoi(sd[0].c_str());</td><td class="lineNumber">3755</td><td class="changed">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;idx&nbsp;=&nbsp;atoi(variableID[0].c_str());</td>
  293.       </tr>
  294.       <tr>
  295. <td class="lineNumber">3719</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;(ScheduleEvent(idx,&nbsp;Action,&nbsp;isScene,&nbsp;eventName,&nbsp;sceneType));</td><td class="lineNumber">3756</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;(ScheduleEvent(idx,&nbsp;Action,&nbsp;isScene,&nbsp;eventName,&nbsp;sceneType));</td>
  296.       </tr>
  297.       <tr>
  298. <td class="lineNumber">3720</td><td class="changed">&nbsp;&nbsp;&nbsp;&nbsp;}</td><td class="lineNumber">3757</td><td class="changed">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  299.       </tr>
  300.       <tr>
  301. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3758</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;}</td>
  302.       </tr>
  303.       <tr>
  304. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3759</td><td class="added"></td>
  305.       </tr>
  306.       <tr>
  307. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3760</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;//&nbsp;For&nbsp;debugging&nbsp;Variable&nbsp;setting</td>
  308.       </tr>
  309.       <tr>
  310. <td class="lineNumber"></td><td class="empty"></td><td class="lineNumber">3761</td><td class="added">&nbsp;&nbsp;&nbsp;&nbsp;_log.Log(LOG_ERROR,&nbsp;&quot;ScheduleEvent:&nbsp;Error,&nbsp;%s&nbsp;not&nbsp;found&quot;,&nbsp;deviceName.c_str());</td>
  311.       </tr>
  312.       <tr>
  313. <td class="lineNumber">3721</td><td class="equal"></td><td class="lineNumber">3762</td><td class="equal"></td>
  314.       </tr>
  315.       <tr>
  316. <td class="lineNumber">3722</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;false;</td><td class="lineNumber">3763</td><td class="equal">&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;false;</td>
  317.       </tr>
  318.       <tr>
  319. <td class="lineNumber">3723</td><td class="equal">}</td><td class="lineNumber">3764</td><td class="equal">}</td>
  320.       </tr>
  321.       <tr>
  322. <td class="lineNumber">3724</td><td class="equal"></td><td class="lineNumber">3765</td><td class="equal"></td>
  323.       </tr>
  324.       <tr>
  325. <td class="lineNumber">3725</td><td class="equal"></td><td class="lineNumber">3766</td><td class="equal"></td>
  326.       </tr>
  327.  
  328.   </table>
  329. </body>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement