Fix scripts to work with '%'

Author: jmccrae

scripts/from_yaml.py

@@ -22,10 +22,20 @@ def map_sense_key(sk):
     """
     if "%" in sk:
         e = sk.split("%")
-        return ("oewn-" + e[0].replace("'","-ap-").replace("/","-sl-").replace("!","-ex-").replace(",","-cm-").replace(":","-cn-").replace("+","-pl-") +
-            "__" + e[1].replace("_","-sp-").replace(":","."))
+        if len(e) > 2:
+            lemma = "%".join(e[:-1])
+            info = e[-1]
+        else:
+            lemma = e[0]
+            info = e[1]
+        return ("oewn-" + lemma.replace("'","-ap-").replace("/","-sl-").
+                replace("!","-ex-").replace(",","-cm-")
+                .replace(":","-cn-").replace("+","-pl-") +
+            "__" + info.replace("_","-sp-").replace(":","."))
     else:
-        return "oewn-" + sk.replace("%", "__").replace("'","-ap-").replace("/","-sl-").replace("!","-ex-").replace(",","-cm-").replace(":","-cn-").replace("+","-pl-")
+        return ("oewn-" + sk.replace("%", "__").replace("'","-ap-").
+            replace("/","-sl-").replace("!","-ex-").
+            replace(",","-cm-").replace(":","-cn-").replace("+","-pl-"))
 
 def unmap_sense_key(sk):
     """
@@ -52,15 +62,6 @@ def make_pos(y, pos):
     else:
         return pos
 
-
-def make_sense_id(y, lemma, pos):
-    """
-    Create a sense ID from a YAML entry
-    """
-    return "oewn-%s-%s-%s" % (
-        escape_lemma(lemma), make_pos(y, pos), y["synset"][:-2])
-
-
 def sense_from_yaml(y, lemma, pos, n):
     """
     Create a Sense object from the YAML data

scripts/wordnet.py

@@ -820,6 +820,8 @@ def elc(c):
             return '-ex-'
         elif c == '+':
             return '-pl-'
+        elif c == '%':
+            return '-pc-'
         elif xml_id_char_re.match(c):
             return c
         raise ValueError(f'Illegal character {c}')