Changeset 601

Timestamp:

10/17/08 12:56:13 (5 years ago)

Author:

cbalan

Message:

WikiTools?: - Added tags support & updated debug messages.

Location:

trunk/plugins/wikitoolsplugin

Files:

• setup.py (modified) (1 diff)
• tracwikitools/rename/__init__.py (modified) (1 diff)
• tracwikitools/rename/api.py (modified) (3 diffs)
• tracwikitools/rename/properties.py (added)
• tracwikitools/rename/tags.py (added)

trunk/plugins/wikitoolsplugin/setup.py

@@ -20 +20 @@
             'tracwikitools.relation.wiki = tracwikitools.relation.wiki',
             'tracwikitools.rename.api = tracwikitools.rename.api',
-            'tracwikitools.rename.wiki = tracwikitools.rename.wiki'
+            'tracwikitools.rename.wiki = tracwikitools.rename.wiki',
+            'tracwikitools.rename.properties = tracwikitools.rename.properties',
+            'tracwikitools.rename.tags = tracwikitools.rename.tags'
             ]}
 )

trunk/plugins/wikitoolsplugin/tracwikitools/rename/__init__.py

@@ -1 +1 @@
 from tracwikitools.rename.api import *
 from tracwikitools.rename.wiki import *
+from tracwikitools.rename.properties import *
+from tracwikitools.rename.tags import *

trunk/plugins/wikitoolsplugin/tracwikitools/rename/api.py

@@ -9 +9 @@
 import urllib
 import re
+import traceback
 
 from trac.core import *
@@ -65 +66 @@
         
             # Create a new page with the needed comment
-            self.log.debug('Inserting new page %r', new_wiki_page)
+            self.log.debug("Wiki rename %s -> %s: - inserting new page."%(old_name, new_name))
             cursor.execute('INSERT INTO wiki (name,version,time,author,ipnr,text,comment,readonly) VALUES (%s,%s,%s,%s,%s,%s,%s,%s)', new_wiki_page)
         
             # Move all the old versions of the page
-            self.log.debug("Moving all old versions of page")
+            self.log.debug("Wiki rename %s -> %s: - moving all old versions of page."%(old_name, new_name))
             cursor.execute('UPDATE wiki SET name=%s WHERE name=%s', (new_name,old_name))
         
             # Move any attachments that are on the page
-            self.log.debug("Moving all attachments in database")
+            self.log.debug("Wiki rename %s -> %s: - moving all attachments in database."%(old_name, new_name))
             cursor.execute('UPDATE attachment SET id=%s WHERE type=%s AND id=%s', (new_name,'wiki',old_name))
         
-            self.log.debug("Found %s attachments on that page", cursor.rowcount)
+            self.log.debug("Wiki rename %s -> %s: - found %s attachments on that page."%(old_name, new_name, cursor.rowcount))
             if cursor.rowcount > 0:
                 # Change the directory where the attachments are stored, if there were any
-                self.log.debug('Moving all attachments on file system')
+                self.log.debug("Wiki rename %s -> %s: - moving all attachments on file system."%(old_name, new_name))
                 from_path = os.path.join(self.env.path, 'attachments', 'wiki', urllib.quote(old_name))
                 to_path = os.path.join(self.env.path, 'attachments', 'wiki', urllib.quote(new_name))
-                self.log.debug('Moving from %r to %r', from_path, to_path)
+                self.log.debug("Wiki rename %s -> %s: - moving from %r to %r'."%(old_name, new_name, from_path, to_path))
                 os.renames(from_path, to_path)
         
             # Get a list of all wiki pages containing links to the old page
-            self.log.debug("Trying to fix links")
+            self.log.debug("Wiki rename %s -> %s: - trying to fix links."%(old_name, new_name))
+            
             sql = 'SELECT w1.version,w1.name,w1.text' + sqlbase + 'AND w1.text like %s'
-            self.log.debug('Running query %r', sql)
+            self.log.debug("Wiki rename %s -> %s: - running query '%r'."%(old_name, new_name, sql))
             cursor.execute(sql, ('%[wiki:'+old_name+'%',))
         
             # Rewrite all links to the old page, such as to point to the new page
             for row in list(cursor):
-                self.log.debug("Found a page with a backlink in it: %s (v%s)", row[1], row[0])
+                self.log.debug("Wiki rename %s -> %s: - found a page with a backlink in it: %s (v%s)."%(old_name, new_name, row[1], row[0]))
                 newtext = re.sub('\[wiki:%s'%old_name,'[wiki:%s'%new_name,row[2])
                 cursor.execute('UPDATE wiki SET text=%s WHERE name=%s AND version=%s', (newtext,row[1],row[0]))
@@ -107 +109 @@
                 db.rollback()
             raise
-
-class ResourcePropertiesWikiRenameListener(Component):
-    """Straightforward resource property mover.
-    
-    @todo: Revisit update queries.
-    """
-    
-    implements(IWikiRenameListener)
-    
-    def wiki_page_renamed(self, page, old_name, db):
-        cursor = db.cursor()
-        
-        # update properties
-        cursor.execute("UPDATE resource_custom"
-                       " SET resource_id=%s "
-                       " WHERE resource_id=%s AND resource_realm='wiki'", (page.name, old_name))
-        
-        # update related
-        cursor.execute("UPDATE resource_custom"
-                       " SET value=%s "
-                       " WHERE value=%s", (page.name, old_name))
-        
-        # update related by 
-        cursor.execute("UPDATE resource_custom"
-                       " SET value=%s "
-                       " WHERE value=%s", ('wiki:'+page.name, 'wiki:'+old_name))
-        cursor.close()