taskjuggler 0.0.6 → 0.0.7

data/doc/TaskJuggler/ReportServer.html

@@ -188,6 +188,10 @@
 				
 					<li><a href="../TaskJuggler/DurationAttribute.html">TaskJuggler::DurationAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/FileList.html">TaskJuggler::FileList</a></li>
+				
+					<li><a href="../TaskJuggler/FileRecord.html">TaskJuggler::FileRecord</a></li>
+				
 					<li><a href="../TaskJuggler/FixnumAttribute.html">TaskJuggler::FixnumAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/FlagListAttribute.html">TaskJuggler::FlagListAttribute</a></li>
@@ -260,8 +264,6 @@
 				
 					<li><a href="../TaskJuggler/Macro.html">TaskJuggler::Macro</a></li>
 				
-					<li><a href="../TaskJuggler/MacroParser.html">TaskJuggler::MacroParser</a></li>
-				
 					<li><a href="../TaskJuggler/MacroTable.html">TaskJuggler::MacroTable</a></li>
 				
 					<li><a href="../TaskJuggler/ManagerResponsibilities.html">TaskJuggler::ManagerResponsibilities</a></li>
@@ -326,6 +328,8 @@
 				
 					<li><a href="../TaskJuggler/RTFReportLink.html">TaskJuggler::RTFReportLink</a></li>
 				
+					<li><a href="../TaskJuggler/RTFWithQuerySupport.html">TaskJuggler::RTFWithQuerySupport</a></li>
+				
 					<li><a href="../TaskJuggler/RealFormat.html">TaskJuggler::RealFormat</a></li>
 				
 					<li><a href="../TaskJuggler/RealFormatAttribute.html">TaskJuggler::RealFormatAttribute</a></li>
@@ -372,8 +376,6 @@
 				
 					<li><a href="../TaskJuggler/RichTextElement.html">TaskJuggler::RichTextElement</a></li>
 				
-					<li><a href="../TaskJuggler/RichTextException.html">TaskJuggler::RichTextException</a></li>
-				
 					<li><a href="../TaskJuggler/RichTextFunctionExample.html">TaskJuggler::RichTextFunctionExample</a></li>
 				
 					<li><a href="../TaskJuggler/RichTextFunctionHandler.html">TaskJuggler::RichTextFunctionHandler</a></li>
@@ -414,6 +416,8 @@
 				
 					<li><a href="../TaskJuggler/ShiftScenario.html">TaskJuggler::ShiftScenario</a></li>
 				
+					<li><a href="../TaskJuggler/SimpleQueryExpander.html">TaskJuggler::SimpleQueryExpander</a></li>
+				
 					<li><a href="../TaskJuggler/SortListAttribute.html">TaskJuggler::SortListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/SourceFileInfo.html">TaskJuggler::SourceFileInfo</a></li>
@@ -524,6 +528,8 @@
 				
 					<li><a href="../TaskJuggler/UserManual.html">TaskJuggler::UserManual</a></li>
 				
+					<li><a href="../TaskJuggler/VimSyntax.html">TaskJuggler::VimSyntax</a></li>
+				
 					<li><a href="../TaskJuggler/WebServer.html">TaskJuggler::WebServer</a></li>
 				
 					<li><a href="../TaskJuggler/WorkingHours.html">TaskJuggler::WorkingHours</a></li>
@@ -623,7 +629,7 @@
 				<div class="method-heading">
 				
 					<span class="method-name">new</span><span
-						class="method-args">(tj)</span>
+						class="method-args">(tj, logConsole = false)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -637,64 +643,76 @@
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 26</span>
-26:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">tj</span>)
-27:       <span class="ruby-identifier">initIntercom</span>
-28: 
-29:       <span class="ruby-ivar">@pid</span> = <span class="ruby-keyword kw">nil</span>
-30:       <span class="ruby-ivar">@uri</span> = <span class="ruby-keyword kw">nil</span>
-31: 
-32:       <span class="ruby-comment cmt"># A reference to the TaskJuggler object that holds the project data.</span>
-33:       <span class="ruby-ivar">@tj</span> = <span class="ruby-identifier">tj</span>
-34: 
-35:       <span class="ruby-ivar">@lastPing</span> = <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">now</span>
-36: 
-37:       <span class="ruby-comment cmt"># We've started a DRb server before. This will continue to live somewhat</span>
-38:       <span class="ruby-comment cmt"># in the child. All attempts to create a DRb connection from the child</span>
-39:       <span class="ruby-comment cmt"># to the parent will end up in the child again. So we use a Pipe to</span>
-40:       <span class="ruby-comment cmt"># communicate the URI of the child DRb server to the parent. The</span>
-41:       <span class="ruby-comment cmt"># communication from the parent to the child is not affected by the</span>
-42:       <span class="ruby-comment cmt"># zombie DRb server in the child process.</span>
-43:       <span class="ruby-identifier">rd</span>, <span class="ruby-identifier">wr</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">pipe</span>
-44: 
-45:       <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">fork</span>) <span class="ruby-operator">==</span> <span class="ruby-value">1</span>
-46:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-value str">'ReportServer fork failed'</span>)
-47:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@pid</span>.<span class="ruby-identifier">nil?</span>
-48:         <span class="ruby-comment cmt"># This is the child</span>
-49:         <span class="ruby-identifier">$SAFE</span> = <span class="ruby-value">1</span>
-50:         <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">install_acl</span>(<span class="ruby-constant">ACL</span>.<span class="ruby-identifier">new</span>(<span class="ruby-node">] deny all
-51:                                     allow 127.0.0.1 ]</span>))
-52:         <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">start_service</span>
-53:         <span class="ruby-identifier">iFace</span> = <span class="ruby-constant">ReportServerIface</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>)
-54:         <span class="ruby-keyword kw">begin</span>
-55:           <span class="ruby-identifier">uri</span> = <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">start_service</span>(<span class="ruby-value str">'druby://127.0.0.1:0'</span>, <span class="ruby-identifier">iFace</span>).<span class="ruby-identifier">uri</span>
-56:           <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Report server is listening on #{uri}&quot;</span>)
-57:         <span class="ruby-keyword kw">rescue</span>
-58:           <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-node">&quot;ReportServer can't start DRb: #{$!}&quot;</span>)
-59:         <span class="ruby-keyword kw">end</span>
-60: 
-61:         <span class="ruby-comment cmt"># Send the URI of the newly started DRb server to the parent process.</span>
-62:         <span class="ruby-identifier">rd</span>.<span class="ruby-identifier">close</span>
-63:         <span class="ruby-identifier">wr</span>.<span class="ruby-identifier">write</span> <span class="ruby-identifier">uri</span>
-64:         <span class="ruby-identifier">wr</span>.<span class="ruby-identifier">close</span>
-65: 
-66:         <span class="ruby-comment cmt"># Start a Thread that waits for the @terminate flag to be set and does</span>
-67:         <span class="ruby-comment cmt"># other background tasks.</span>
-68:         <span class="ruby-identifier">startTerminator</span>
-69:         <span class="ruby-identifier">startWatchDog</span>
-70: 
-71:         <span class="ruby-comment cmt"># Cleanup the DRb threads</span>
-72:         <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">thread</span>.<span class="ruby-identifier">join</span>
-73:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-value str">'Report server terminated'</span>)
-74:         <span class="ruby-identifier">exit</span> <span class="ruby-value">0</span>
-75:       <span class="ruby-keyword kw">else</span>
-76:         <span class="ruby-constant">Process</span>.<span class="ruby-identifier">detach</span>(<span class="ruby-ivar">@pid</span>)
-77:         <span class="ruby-comment cmt"># This is the parent</span>
-78:         <span class="ruby-identifier">wr</span>.<span class="ruby-identifier">close</span>
-79:         <span class="ruby-ivar">@uri</span> = <span class="ruby-identifier">rd</span>.<span class="ruby-identifier">read</span>
-80:         <span class="ruby-identifier">rd</span>.<span class="ruby-identifier">close</span>
-81:       <span class="ruby-keyword kw">end</span>
-82:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 25</span>
+25:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">tj</span>, <span class="ruby-identifier">logConsole</span> = <span class="ruby-keyword kw">false</span>)
+26:       <span class="ruby-identifier">initIntercom</span>
+27: 
+28:       <span class="ruby-ivar">@pid</span> = <span class="ruby-keyword kw">nil</span>
+29:       <span class="ruby-ivar">@uri</span> = <span class="ruby-keyword kw">nil</span>
+30: 
+31:       <span class="ruby-comment cmt"># A reference to the TaskJuggler object that holds the project data.</span>
+32:       <span class="ruby-ivar">@tj</span> = <span class="ruby-identifier">tj</span>
+33: 
+34:       <span class="ruby-ivar">@lastPing</span> = <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">now</span>
+35: 
+36:       <span class="ruby-comment cmt"># We've started a DRb server before. This will continue to live somewhat</span>
+37:       <span class="ruby-comment cmt"># in the child. All attempts to create a DRb connection from the child</span>
+38:       <span class="ruby-comment cmt"># to the parent will end up in the child again. So we use a Pipe to</span>
+39:       <span class="ruby-comment cmt"># communicate the URI of the child DRb server to the parent. The</span>
+40:       <span class="ruby-comment cmt"># communication from the parent to the child is not affected by the</span>
+41:       <span class="ruby-comment cmt"># zombie DRb server in the child process.</span>
+42:       <span class="ruby-identifier">rd</span>, <span class="ruby-identifier">wr</span> = <span class="ruby-constant">IO</span>.<span class="ruby-identifier">pipe</span>
+43: 
+44:       <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">fork</span>) <span class="ruby-operator">==</span> <span class="ruby-value">1</span>
+45:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-value str">'ReportServer fork failed'</span>)
+46:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@pid</span>.<span class="ruby-identifier">nil?</span>
+47:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">logConsole</span>
+48:           <span class="ruby-comment cmt"># If the Broker wasn't daemonized, log stdout and stderr to PID</span>
+49:           <span class="ruby-comment cmt"># specific files.</span>
+50:           <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">reopen</span>(<span class="ruby-node">&quot;tj3d.rs.#{$$}.stderr&quot;</span>, <span class="ruby-value str">'w'</span>)
+51:           <span class="ruby-identifier">$stdout</span>.<span class="ruby-identifier">reopen</span>(<span class="ruby-node">&quot;tj3d.rs.#{$$}.stdout&quot;</span>, <span class="ruby-value str">'w'</span>)
+52:         <span class="ruby-keyword kw">end</span>
+53:         <span class="ruby-keyword kw">begin</span>
+54:           <span class="ruby-comment cmt"># This is the child</span>
+55:           <span class="ruby-identifier">$SAFE</span> = <span class="ruby-value">1</span>
+56:           <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">install_acl</span>(<span class="ruby-constant">ACL</span>.<span class="ruby-identifier">new</span>(<span class="ruby-node">] deny all
+57:                                       allow 127.0.0.1 ]</span>))
+58:           <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">start_service</span>
+59:           <span class="ruby-identifier">iFace</span> = <span class="ruby-constant">ReportServerIface</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>)
+60:           <span class="ruby-keyword kw">begin</span>
+61:             <span class="ruby-identifier">uri</span> = <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">start_service</span>(<span class="ruby-value str">'druby://127.0.0.1:0'</span>, <span class="ruby-identifier">iFace</span>).<span class="ruby-identifier">uri</span>
+62:             <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Report server is listening on #{uri}&quot;</span>)
+63:           <span class="ruby-keyword kw">rescue</span>
+64:             <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-node">&quot;ReportServer can't start DRb: #{$!}&quot;</span>)
+65:           <span class="ruby-keyword kw">end</span>
+66: 
+67:           <span class="ruby-comment cmt"># Send the URI of the newly started DRb server to the parent process.</span>
+68:           <span class="ruby-identifier">rd</span>.<span class="ruby-identifier">close</span>
+69:           <span class="ruby-identifier">wr</span>.<span class="ruby-identifier">write</span> <span class="ruby-identifier">uri</span>
+70:           <span class="ruby-identifier">wr</span>.<span class="ruby-identifier">close</span>
+71: 
+72:           <span class="ruby-comment cmt"># Start a Thread that waits for the @terminate flag to be set and does</span>
+73:           <span class="ruby-comment cmt"># other background tasks.</span>
+74:           <span class="ruby-identifier">startTerminator</span>
+75:           <span class="ruby-identifier">startWatchDog</span>
+76: 
+77:           <span class="ruby-comment cmt"># Cleanup the DRb threads</span>
+78:           <span class="ruby-constant">DRb</span>.<span class="ruby-identifier">thread</span>.<span class="ruby-identifier">join</span>
+79:           <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-value str">'Report server terminated'</span>)
+80:           <span class="ruby-identifier">exit</span> <span class="ruby-value">0</span>
+81:         <span class="ruby-keyword kw">rescue</span>
+82:           <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">print</span> <span class="ruby-identifier">$!</span>.<span class="ruby-identifier">to_s</span>
+83:           <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">print</span> <span class="ruby-identifier">$!</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n&quot;</span>)
+84:           <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-node">&quot;ReportServer caught unexpected exception: #{$!}&quot;</span>)
+85:         <span class="ruby-keyword kw">end</span>
+86:       <span class="ruby-keyword kw">else</span>
+87:         <span class="ruby-constant">Process</span>.<span class="ruby-identifier">detach</span>(<span class="ruby-ivar">@pid</span>)
+88:         <span class="ruby-comment cmt"># This is the parent</span>
+89:         <span class="ruby-identifier">wr</span>.<span class="ruby-identifier">close</span>
+90:         <span class="ruby-ivar">@uri</span> = <span class="ruby-identifier">rd</span>.<span class="ruby-identifier">read</span>
+91:         <span class="ruby-identifier">rd</span>.<span class="ruby-identifier">close</span>
+92:       <span class="ruby-keyword kw">end</span>
+93:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -731,16 +749,16 @@
 					<div class="method-source-code"
 						id="add-ile-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 88</span>
-88:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addFile</span>(<span class="ruby-identifier">file</span>)
-89:       <span class="ruby-keyword kw">begin</span>
-90:         <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">parseFile</span>(<span class="ruby-identifier">file</span>, <span class="ruby-value str">'properties'</span>)
-91:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">TjException</span>
-92:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
-93:       <span class="ruby-keyword kw">end</span>
-94:       <span class="ruby-identifier">restartTimer</span>
-95:       <span class="ruby-keyword kw">true</span>
-96:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 99</span>
+ 99:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addFile</span>(<span class="ruby-identifier">file</span>)
+100:       <span class="ruby-keyword kw">begin</span>
+101:         <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">parseFile</span>(<span class="ruby-identifier">file</span>, <span class="ruby-value str">'properties'</span>)
+102:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">TjException</span>
+103:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+104:       <span class="ruby-keyword kw">end</span>
+105:       <span class="ruby-identifier">restartTimer</span>
+106:       <span class="ruby-keyword kw">true</span>
+107:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -771,14 +789,14 @@
 					<div class="method-source-code"
 						id="check-tatus-heet-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 128</span>
-128:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">sheet</span>)
-129:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Checking status sheet #{sheet}&quot;</span>)
-130:       <span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">sheet</span>)
-131:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Status sheet #{sheet} is #{ok ? '' : 'not '}ok&quot;</span>)
-132:       <span class="ruby-identifier">restartTimer</span>
-133:       <span class="ruby-identifier">ok</span>
-134:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 139</span>
+139:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">sheet</span>)
+140:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Checking status sheet #{sheet}&quot;</span>)
+141:       <span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">sheet</span>)
+142:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Status sheet #{sheet} is #{ok ? '' : 'not '}ok&quot;</span>)
+143:       <span class="ruby-identifier">restartTimer</span>
+144:       <span class="ruby-identifier">ok</span>
+145:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -809,14 +827,14 @@
 					<div class="method-source-code"
 						id="check-ime-heet-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 120</span>
-120:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">sheet</span>)
-121:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Checking time sheet #{sheet}&quot;</span>)
-122:       <span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">sheet</span>)
-123:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Time sheet #{sheet} is #{ok ? '' : 'not '}ok&quot;</span>)
-124:       <span class="ruby-identifier">restartTimer</span>
-125:       <span class="ruby-identifier">ok</span>
-126:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 131</span>
+131:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">sheet</span>)
+132:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Checking time sheet #{sheet}&quot;</span>)
+133:       <span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">sheet</span>)
+134:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Time sheet #{sheet} is #{ok ? '' : 'not '}ok&quot;</span>)
+135:       <span class="ruby-identifier">restartTimer</span>
+136:       <span class="ruby-identifier">ok</span>
+137:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -847,17 +865,17 @@
 					<div class="method-source-code"
 						id="generate-eport-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 98</span>
- 98:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>)
- 99:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Generating report #{id}&quot;</span>)
-100:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>))
-101:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Report #{id} generated&quot;</span>)
-102:       <span class="ruby-keyword kw">else</span>
-103:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Report generation of #{id} failed&quot;</span>)
-104:       <span class="ruby-keyword kw">end</span>
-105:       <span class="ruby-identifier">restartTimer</span>
-106:       <span class="ruby-identifier">ok</span>
-107:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 109</span>
+109:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>)
+110:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Generating report #{id}&quot;</span>)
+111:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>))
+112:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Report #{id} generated&quot;</span>)
+113:       <span class="ruby-keyword kw">else</span>
+114:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Report generation of #{id} failed&quot;</span>)
+115:       <span class="ruby-keyword kw">end</span>
+116:       <span class="ruby-identifier">restartTimer</span>
+117:       <span class="ruby-identifier">ok</span>
+118:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -888,17 +906,17 @@
 					<div class="method-source-code"
 						id="list-eports-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 109</span>
-109:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>)
-110:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Listing report #{id}&quot;</span>)
-111:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>))
-112:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Report list for #{id} generated&quot;</span>)
-113:       <span class="ruby-keyword kw">else</span>
-114:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Report list compilation of #{id} failed&quot;</span>)
-115:       <span class="ruby-keyword kw">end</span>
-116:       <span class="ruby-identifier">restartTimer</span>
-117:       <span class="ruby-identifier">ok</span>
-118:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 120</span>
+120:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>)
+121:       <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Listing report #{id}&quot;</span>)
+122:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">ok</span> = <span class="ruby-ivar">@tj</span>.<span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">regExpMode</span>))
+123:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Report list for #{id} generated&quot;</span>)
+124:       <span class="ruby-keyword kw">else</span>
+125:         <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Report list compilation of #{id} failed&quot;</span>)
+126:       <span class="ruby-keyword kw">end</span>
+127:       <span class="ruby-identifier">restartTimer</span>
+128:       <span class="ruby-identifier">ok</span>
+129:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -929,10 +947,10 @@
 					<div class="method-source-code"
 						id="ping-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 84</span>
-84:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">ping</span>
-85:       <span class="ruby-ivar">@lastPing</span> = <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">now</span>
-86:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 95</span>
+95:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">ping</span>
+96:       <span class="ruby-ivar">@lastPing</span> = <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">now</span>
+97:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -969,17 +987,17 @@
 					<div class="method-source-code"
 						id="start-atch-og-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 138</span>
-138:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">startWatchDog</span>
-139:       <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> <span class="ruby-keyword kw">do</span>
-140:         <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-141:           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">now</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@lastPing</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">120</span>
-142:             <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-value str">'Heartbeat from ProjectServer lost. Terminating.'</span>)
-143:           <span class="ruby-keyword kw">end</span>
-144:           <span class="ruby-identifier">sleep</span> <span class="ruby-value">30</span>
-145:         <span class="ruby-keyword kw">end</span>
-146:       <span class="ruby-keyword kw">end</span>
-147:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 149</span>
+149:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">startWatchDog</span>
+150:       <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> <span class="ruby-keyword kw">do</span>
+151:         <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
+152:           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">now</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@lastPing</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">120</span>
+153:             <span class="ruby-ivar">@log</span>.<span class="ruby-identifier">fatal</span>(<span class="ruby-value str">'Heartbeat from ProjectServer lost. Terminating.'</span>)
+154:           <span class="ruby-keyword kw">end</span>
+155:           <span class="ruby-identifier">sleep</span> <span class="ruby-value">30</span>
+156:         <span class="ruby-keyword kw">end</span>
+157:       <span class="ruby-keyword kw">end</span>
+158:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/ReportServerIface.html

@@ -186,6 +186,10 @@
 				
 					<li><a href="../TaskJuggler/DurationAttribute.html">TaskJuggler::DurationAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/FileList.html">TaskJuggler::FileList</a></li>
+				
+					<li><a href="../TaskJuggler/FileRecord.html">TaskJuggler::FileRecord</a></li>
+				
 					<li><a href="../TaskJuggler/FixnumAttribute.html">TaskJuggler::FixnumAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/FlagListAttribute.html">TaskJuggler::FlagListAttribute</a></li>
@@ -258,8 +262,6 @@
 				
 					<li><a href="../TaskJuggler/Macro.html">TaskJuggler::Macro</a></li>
 				
-					<li><a href="../TaskJuggler/MacroParser.html">TaskJuggler::MacroParser</a></li>
-				
 					<li><a href="../TaskJuggler/MacroTable.html">TaskJuggler::MacroTable</a></li>
 				
 					<li><a href="../TaskJuggler/ManagerResponsibilities.html">TaskJuggler::ManagerResponsibilities</a></li>
@@ -324,6 +326,8 @@
 				
 					<li><a href="../TaskJuggler/RTFReportLink.html">TaskJuggler::RTFReportLink</a></li>
 				
+					<li><a href="../TaskJuggler/RTFWithQuerySupport.html">TaskJuggler::RTFWithQuerySupport</a></li>
+				
 					<li><a href="../TaskJuggler/RealFormat.html">TaskJuggler::RealFormat</a></li>
 				
 					<li><a href="../TaskJuggler/RealFormatAttribute.html">TaskJuggler::RealFormatAttribute</a></li>
@@ -370,8 +374,6 @@
 				
 					<li><a href="../TaskJuggler/RichTextElement.html">TaskJuggler::RichTextElement</a></li>
 				
-					<li><a href="../TaskJuggler/RichTextException.html">TaskJuggler::RichTextException</a></li>
-				
 					<li><a href="../TaskJuggler/RichTextFunctionExample.html">TaskJuggler::RichTextFunctionExample</a></li>
 				
 					<li><a href="../TaskJuggler/RichTextFunctionHandler.html">TaskJuggler::RichTextFunctionHandler</a></li>
@@ -412,6 +414,8 @@
 				
 					<li><a href="../TaskJuggler/ShiftScenario.html">TaskJuggler::ShiftScenario</a></li>
 				
+					<li><a href="../TaskJuggler/SimpleQueryExpander.html">TaskJuggler::SimpleQueryExpander</a></li>
+				
 					<li><a href="../TaskJuggler/SortListAttribute.html">TaskJuggler::SortListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/SourceFileInfo.html">TaskJuggler::SourceFileInfo</a></li>
@@ -522,6 +526,8 @@
 				
 					<li><a href="../TaskJuggler/UserManual.html">TaskJuggler::UserManual</a></li>
 				
+					<li><a href="../TaskJuggler/VimSyntax.html">TaskJuggler::VimSyntax</a></li>
+				
 					<li><a href="../TaskJuggler/WebServer.html">TaskJuggler::WebServer</a></li>
 				
 					<li><a href="../TaskJuggler/WorkingHours.html">TaskJuggler::WorkingHours</a></li>
@@ -599,10 +605,10 @@
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 155</span>
-155:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">server</span>)
-156:       <span class="ruby-ivar">@server</span> = <span class="ruby-identifier">server</span>
-157:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 166</span>
+166:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">server</span>)
+167:       <span class="ruby-ivar">@server</span> = <span class="ruby-identifier">server</span>
+168:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -639,12 +645,12 @@
 					<div class="method-source-code"
 						id="add-ile-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 165</span>
-165:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addFile</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">file</span>)
-166:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'addFile'</span>)
-167: 
-168:       <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">addFile</span>(<span class="ruby-identifier">file</span>)
-169:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 176</span>
+176:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addFile</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">file</span>)
+177:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'addFile'</span>)
+178: 
+179:       <span class="ruby-identifier">trap</span> { <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">addFile</span>(<span class="ruby-identifier">file</span>) }
+180:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -675,12 +681,12 @@
 					<div class="method-source-code"
 						id="check-tatus-heet-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 190</span>
-190:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">sheet</span>)
-191:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'checkStatusSheet'</span>)
-192: 
-193:       <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">sheet</span>)
-194:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 201</span>
+201:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">sheet</span>)
+202:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'checkStatusSheet'</span>)
+203: 
+204:       <span class="ruby-identifier">trap</span> { <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkStatusSheet</span>(<span class="ruby-identifier">sheet</span>) }
+205:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -711,12 +717,12 @@
 					<div class="method-source-code"
 						id="check-ime-heet-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 184</span>
-184:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">sheet</span>)
-185:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'checkTimeSheet'</span>)
-186: 
-187:       <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">sheet</span>)
-188:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 195</span>
+195:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">sheet</span>)
+196:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'checkTimeSheet'</span>)
+197: 
+198:       <span class="ruby-identifier">trap</span> { <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkTimeSheet</span>(<span class="ruby-identifier">sheet</span>) }
+199:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -747,12 +753,12 @@
 					<div class="method-source-code"
 						id="generate-eport-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 171</span>
-171:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>)
-172:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'generateReport'</span>)
-173: 
-174:       <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>)
-175:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 182</span>
+182:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>)
+183:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'generateReport'</span>)
+184: 
+185:       <span class="ruby-identifier">trap</span> { <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">generateReport</span>(<span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>, <span class="ruby-identifier">dynamicAttributes</span>) }
+186:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -783,12 +789,12 @@
 					<div class="method-source-code"
 						id="list-eports-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 178</span>
-178:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>)
-179:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'generateReport'</span>)
-180: 
-181:       <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>)
-182:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 189</span>
+189:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>)
+190:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'generateReport'</span>)
+191: 
+192:       <span class="ruby-identifier">trap</span> { <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">listReports</span>(<span class="ruby-identifier">reportId</span>, <span class="ruby-identifier">regExpMode</span>) }
+193:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -819,12 +825,12 @@
 					<div class="method-source-code"
 						id="ping-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 159</span>
-159:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">ping</span>(<span class="ruby-identifier">authKey</span>)
-160:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'addFile'</span>)
-161: 
-162:       <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">ping</span>
-163:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/daemon/ReportServer.rb, line 170</span>
+170:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">ping</span>(<span class="ruby-identifier">authKey</span>)
+171:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">checkKey</span>(<span class="ruby-identifier">authKey</span>, <span class="ruby-value str">'addFile'</span>)
+172: 
+173:       <span class="ruby-identifier">trap</span> { <span class="ruby-ivar">@server</span>.<span class="ruby-identifier">ping</span> }
+174:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>