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

diff --git a/convertdump.py b/convertdump.py
index c99fff9..0f59e82 100755
--- a/convertdump.py
+++ b/convertdump.py
@@ -175,28 +175,38 @@ def addCommentsForId(outDoc, entry, username, id):
         if(parentId != ""): 
             appendTextNode(outDoc, outComment, "parent_itemid", parentId)
 
+
+# regular expressions used in replaceLJTags()
+#   (global for later reuse - suggestion by jparise)
+
+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)
+
 def replaceLJTags(entry):
     rv = entry
 
     # replace lj user tags
-    userRE = re.compile('<lj user="(.*?)" ?/?>', re.IGNORECASE)
-    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
-    commRE = re.compile('<lj comm="(.*?)" ?/?>', re.IGNORECASE)
     rv = re.sub(commRE, '<a href="http://community.livejournal.com/\\1/" class="lj-comm">\\1</a>', rv) 
 
     # replace lj-cut tags
-    namedCutRE = re.compile('<lj-cut +text="(.*?)" ?/?>', 
-                            re.IGNORECASE|re.DOTALL)
     rv = re.sub(namedCutRE, '<!--more \\1-->', rv)
-    
-    cutRE = re.compile('<lj-cut>', re.IGNORECASE)
     rv = re.sub(cutRE, '<!--more-->', rv)
-
-    cutRE = re.compile('</lj-cut>', re.IGNORECASE)
     rv = re.sub(cutRE, '', rv)
 
+    # replace lj-embed tags
+    # 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