Changeset 1357

Timestamp:

10/09/06 04:53:17 (2 years ago)

Author:

dfaerch

Message:

RegexIncludeMacro:

Added regex match functionallity + match_seperator

Files:

• regexincludemacro/RegexInclude.py (modified) (6 diffs)

regexincludemacro/RegexInclude.py

@@ -1 +1 @@
-"""
-$Id$
-
-I've added my own comments here. The original text is attached below my comments.
+Also, please forgive any stupid errors i might have made. My i started on python 1 week ago.
-
-use_vars: 
@@ -74 +74 @@
-        regex = None
-        argstring = ''
+        match_seperator = ' '
+        dotall = ''
-        db = env.get_db_cnx()
-        cursor = db.cursor()
@@ -95 +97 @@
-        if regex != '': 
-                regex = regex.split('\',\'')
+
-
-        #Get URL
@@ -118 +121 @@
-           argstring.index(',no_dotall,')
-        except:
-
+
+
+
-        
-        #Should we only include pages for authenticated users?
@@ -127 +132 @@
-        except:
-          1 #Sorry.. Dont know python at all, and this was the only way i could solve that except: requires at least 1 line
+        #Should we only include pages for authenticated users?
-
+        if re.search(',match_seperator(?:=[^,]+)?,',argstring):
+              match_seperator = re.search(',match_seperator(?:=([^,]+))?,',argstring).group(1)
+
+        #Or allow the match seperator to be in quotes
+        if re.search(',match_seperator="[^"]+?"?,',argstring):
+              match_seperator = re.search(',match_seperator="([^"]+?)"?,',argstring).group(1)
+              
+              
+              
-        #Should we replace $USER with logged-in username, in URL?
-        if re.search(',use_vars(?:=\w+)?,',argstring):
@@ -163 +178 @@
-        #Do the regex replacements
-        for ex in regex:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-        if formatter == 'wiki':