Changeset 548 for confluence/genderiser

Timestamp:

05/01/09 18:41:31 (15 months ago)

Author:

confluence

Message:

comma escaping

Location:

confluence/genderiser

Files:

• genderiser-pmwiki/genderiser.php (modified) (3 diffs)
• genderiser-python/LOCAL_EXAMPLE_gender.cfg (modified) (1 diff)
• genderiser-python/example_text.txt (modified) (1 diff)
• genderiser-python/genderiser.py (modified) (2 diffs)

confluence/genderiser/genderiser-pmwiki/genderiser.php

@@ -40 +40 @@
 
 // GET CONFIG
-// TODO: ESCAPING COMMAS?
 
     foreach (array("Site/Genderiser","$Group/Genderiser") as $configpage) {
@@ -57 +56 @@
         $var_words = PageTextVar($configpage,"words");
         if (isset($var_words)) {
+            $var_words = str_replace("\,", "|", $var_words);
             foreach (split(", *", $var_words) as $word) {
                 $wordpair = PageTextVar($configpage, $word);
@@ -92 +92 @@
                     $so_gender = $gender;
                 }
-                $keywords[$person."_so_".$word] = $words[$word][$so_gender];
+                $keywords[$person."_so_".$word] = str_replace("|", ",", $words[$word][$so_gender]);
             }
         }

confluence/genderiser/genderiser-python/LOCAL_EXAMPLE_gender.cfg

@@ -6 +6 @@
 name: Joseph, Jane
 s_name: Joe, Jane
+hobby: embroidery, hunting\, fishing and beer
 
 [bob]

confluence/genderiser/genderiser-python/example_text.txt

@@ -1 @@
-{$joe_name} is {$bob_name}'s {$joe_grandparent}. {$bob_they,c} likes {$joe_them}.
+{$joe_name} is {$bob_name}'s {$joe_grandparent}. {$bob_they,c} likes {$joe_them}. {$joe_they,c} likes {$joe_hobby}.

confluence/genderiser/genderiser-python/genderiser.py

@@ -64 +64 @@
 
 def splitlist(string):
-    return [x.strip() for x in string.split(",")]
+    string = string.replace("\,", "|")
+    chunks = [x.strip() for x in string.split(",")]
+    return [x.replace("|",",") for x in chunks]
 
 GENDERS = {
@@ -110 +112 @@
 
 # GET CONFIG
-# TODO: how to escape commas?  CSV-esque format?
 
 conf = ConfigParser.ConfigParser()