Changeset 714

Show
Ignore:
Timestamp:
12/20/06 07:24:59
Author:
fenix
Message:

fixed #58 ticket and added test

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qPloneResolveUID/trunk/tests/test_data.py

    r713 r714  
    1 orig_text = """<?xml version="1.0" encoding="utf-8" ?> 
    2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    4 <head> 
    5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    6 <title>Test page for save html rendering including ruid_to_url transformation</title> 
    7 <meta name="date" content="2006-08-11" /> 
    8 </head> 
    9 <body> 
    10 <h1>Test page</h1> 
    11 <table> 
    12 <tr> 
    13 <th>Test1</th> 
    14 <td>test2</td> 
    15 </tr> 
    16 </table> 
    17 <p>This is a text used as a blind text.</p> 
    18 <ul> 
    19 <li>A sample list item1</li> 
    20 <li>A sample list item2</li> 
    21 </ul> 
    22 <p>This is again a blind text with a<br>line break.</p> 
    23 <div> 
    24 Can we <q>quote</q> or write something we <del>didn't</del> mean to write? Or how is <ins>this</ins> instead? 
    25 </div> 
    26 <hr> 
    27 <div> 
    28 <a href="resolveuid/%s"><img src="resolveuid/%s"/><img src="resolveuid/%s"/></a> is just great. 
    29 </div> 
    30 </body> 
     1orig_text = """ 
     2<html> 
     3  <body> 
     4    <h1>Test page</h1> 
     5    <div> 
     6      <a href="resolveuid/%s"/> 
     7      <img src="resolveuid/%s"/> 
     8      <img src="resolveuid/%s"/> 
     9      <a href="resolveuid/thisisuidtodeletedobject"> 
     10    </div> 
     11  </body> 
    3112</html>""" 
    32 result = """<?xml version="1.0" encoding="utf-8" ?> 
    33 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    34 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    35 <head> 
    36 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    37 <title>Test page for save html rendering including ruid_to_url transformation</title> 
    38 <meta name="date" content="2006-08-11" /> 
    39 </head> 
    40 <body> 
    41 <h1>Test page</h1> 
    42 <table> 
    43 <tr> 
    44 <th>Test1</th> 
    45 <td>test2</td> 
    46 </tr> 
    47 </table> 
    48 <p>This is a text used as a blind text.</p> 
    49 <ul> 
    50 <li>A sample list item1</li> 
    51 <li>A sample list item2</li> 
    52 </ul> 
    53 <p>This is again a blind text with a<br>line break.</p> 
    54 <div> 
    55 Can we <q>quote</q> or write something we <del>didn't</del> mean to write? Or how is <ins>this</ins> instead? 
    56 </div> 
    57 <hr> 
    58 <div> 
    59 <a href="test1"><img src="test1/test2"/><img src="test1/test2/test3"/></a> is just great. 
    60 </div> 
    61 </body> 
     13result = """ 
     14<html> 
     15  <body> 
     16    <h1>Test page</h1> 
     17    <div> 
     18      <a href="test1"/> 
     19      <img src="test1/test2"/> 
     20      <img src="test1/test2/image_mini"/> 
     21      <a href="resolveuid/thisisuidtodeletedobject"> 
     22    </div> 
     23  </body> 
    6224</html>""" 

  • qPloneResolveUID/trunk/tests/test_transforms.py

    r713 r714  
    6262                test2_uid = test2.UID() 
    6363        self.assertEqual(self.pt.convert('ruid_to_url', 
    64                                          orig_text %(test1_uid, test2_uid, test2_uid+'/test3'), 
     64                                         orig_text %(test1_uid, test2_uid, test2_uid+'/image_mini'), 
    6565                                         context = self.portal 
    6666                                        ).getData(), 

  • qPloneResolveUID/trunk/transforms/ruid_to_url.py

    r713 r714  
    4343        pu = getToolByName(portal, 'portal_url') 
    4444        for uid in unique_ruid: 
    45             try: 
    46                 obj = rc.lookupObject(uid) 
     45            obj = rc.lookupObject(uid) 
     46            if obj: 
    4747                ruid_url[uid] = pu.getRelativeUrl(obj) 
    48             except: 
    49                 ruid_url[uid] = uid 
    5048        return ruid_url            
    5149     
    …… 
    5755            for tag_ruid in tags_ruid: 
    5856                t, uid = tag_ruid.items()[0] 
    59                 text = text.replace(t, t.replace('resolveuid/'+uid, ruid_url[uid])) 
     57                if ruid_url.has_key(uid): 
     58                    text = text.replace(t, t.replace('resolveuid/'+uid, ruid_url[uid])) 
    6059         
    6160        data.setData(text)