X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=convertdump.py;h=0f59e8282d6dc9e2e9fa481a1312201b6468c2bf;hb=HEAD;hp=9799cabf377208a01eb56600b261f118a703e818;hpb=5d84d72f008804ca468858362331efca87103e19;p=oss%2Fljdump.git

diff --git a/convertdump.py b/convertdump.py
index 9799cab..0f59e82 100755
--- a/convertdump.py
+++ b/convertdump.py
@@ -190,16 +190,8 @@ embedRE = re.compile('<lj-embed id="[0-9]+">', re.IGNORECASE)
 def replaceLJTags(entry):
     rv = entry
 
-    userRE = re.compile('<lj user="(.*?)" ?/?>', re.IGNORECASE)
-    commRE = re.compile('<lj comm="(.*?)" ?/?>', re.IGNORECASE)
-    namedCutRE = re.compile('<lj-cut +text="(.*?)" ?/?>', 
-                            re.IGNORECASE|re.DOTALL)
-    cutRE = re.compile('<lj-cut>', re.IGNORECASE)
-    cutRE = re.compile('</lj-cut>', re.IGNORECASE)
-    embedRE = re.compile('<lj-embed id="[0-9]+">', re.IGNORECASE)
-
     # replace lj user tags
-    rv = re.sub(userRE, '<a href="http://\\1.livejournal.com/" class="lj-user">\\1</a>', rv) 
+    rv = re.sub(userRE, '<a href="http://www.livejournal.com/users/\\1" class="lj-user">\\1</a>', rv) 
 
     # replace lj comm tags
     rv = re.sub(commRE, '<a href="http://community.livejournal.com/\\1/" class="lj-comm">\\1</a>', rv) 
@@ -210,7 +202,10 @@ def replaceLJTags(entry):
     rv = re.sub(cutRE, '', rv)
 
     # replace lj-embed tags
-    rv = re.sub(embedRE, '', rv)
+    # this doesn't actually work.  LJ doesn't include the embedded content
+    # when ljdump calls 'getevents', but instead includes an lj-embed tag
+    # with an id and nothing else.
+    #rv = re.sub(embedRE, '', rv)
 
     return rv