[PyWebMail-Checkins] webmail/webmail/client/config HotMail.xml, 1.22, 1.23

[Michael D. <du...@us...>]

Update of /cvsroot/pywebmail/webmail/webmail/client/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32325

Modified Files:
	HotMail.xml 
Log Message:
incompatible changes on server

Index: HotMail.xml
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/client/config/HotMail.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** HotMail.xml	8 Dec 2007 07:55:10 -0000	1.22
--- HotMail.xml	2 Mar 2008 17:33:13 -0000	1.23
***************
*** 9,12 ****
--- 9,13 ----
        <field name="language">EN</field>
        <field name="country">EN</field>
+       <!--field name="datefmt">html,replace(Yesterday,<value expr="'%d.%d.%04d'%(lambda t:(t[2],t[1],t[0]))(gmtime())"/>),date(%d.%m.%Y,%m/%d/%Y,%H:%M,%H:%M %p)</field-->
      </fixed>
    </setup>
***************
*** 250,254 ****
        </choose>
        <test inverse="yes" error_group="1">error=(.*)</test>
!       <field name="inbox" group="1" parse="decode(unicode_escape)">^inbox=(.*)$</field>
      </parse>
    </login>
--- 251,255 ----
        </choose>
        <test inverse="yes" error_group="1">error=(.*)</test>
!       <field name="inbox" group="1" parse="encode(ascii),decode(unicode_escape)">^inbox=(.*)$</field>
      </parse>
    </login>
***************
*** 310,314 ****
      <check>
        <input ref="logout_page3"/>
!       <test>^Location: http://www\.(?:live|msn)\.com</test>
      </check>
    </logout>
--- 311,315 ----
      <check>
        <input ref="logout_page3"/>
!       <test>^Location: http://(?:www|<value name="language"/>)\.(?:live|msn)\.com</test>
      </check>
    </logout>
***************
*** 348,351 ****
--- 349,364 ----
        </url_get>
      </fetch>
+     <pre_require>
+       <parse>
+         <input ref="folder_page">
+           <fields><field name="page">1</field></fields>
+         </input>
+         <field ref="re_crude_yesterday" name="datefmt"
+                expr="'html,replace(Yesterday,'+
+                      match.group(3)+'.'+match.group(2)+'.'+('%02d'%(max(int(match.group(3))-1,1),))+
+                      '),date(%d.%m.%Y,%m/%d/%Y,%H:%M,%H:%M %p)'"/>
+         <test id="re_crude_yesterday">InboxPageAnchorTime=(\d\d\d\d)-(\d\d)-(\d\d)T</test>
+       </parse>
+     </pre_require>
      <list>
        <pages>
***************
*** 363,367 ****
          <field name="from_name" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?" nowrap&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+" class="TruncateFrom"&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;</field>
          <field name="subject" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?"&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+"&gt;([^&lt;]*)&amp;#x200f;&lt;/a&gt;&lt;/td&gt;</field>
!         <field name="date" group="1" parse="html,date(%d.%m.%Y,%H:%M)">&lt;td  class="NoWrap"&gt;([^&lt;]+)&lt;/td&gt;</field>
          <field name="size" group="1" parse="html,decode(utf-8),replace(KB$,k),replace(&#1050;&#1041;$,k),replace(MB$,m),replace(&#1052;&#1041;$,m),replace(GB$,g),replace(&#1043;&#1041;$,g)">&lt;td  class="TextAlignRight"&gt;([^lt;]*)&lt;/td&gt;</field>
        </item>
--- 376,380 ----
          <field name="from_name" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?" nowrap&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+" class="TruncateFrom"&gt;([^&lt;]*)&lt;/a&gt;&lt;/td&gt;</field>
          <field name="subject" group="1" parse="html">&lt;td  class="(?:InboxContentItemUnread)?"&gt;&lt;a href="ReadMessageLight\.aspx\?[^"]+"&gt;([^&lt;]*)&amp;#x200f;&lt;/a&gt;&lt;/td&gt;</field>
!         <field name="date" group="1" parse="$datefmt">&lt;td  class="NoWrap"&gt;([^&lt;]+)&lt;/td&gt;</field>
          <field name="size" group="1" parse="html,decode(utf-8),replace(KB$,k),replace(&#1050;&#1041;$,k),replace(MB$,m),replace(&#1052;&#1041;$,m),replace(GB$,g),replace(&#1043;&#1041;$,g)">&lt;td  class="TextAlignRight"&gt;([^lt;]*)&lt;/td&gt;</field>
        </item>