1 files changed, 41 insertions, 27 deletions
diff --git a/realtime/rt/util.py b/realtime/rt/util.py
index 885298e6..10e94909 100644
--- a/realtime/rt/util.py
+++ b/realtime/rt/util.py
@@ -13,12 +13,49 @@ SA_INI_FILES = set((
     'precompute_file',
     ))
 
+def cdec_ini_for_config(config):
+    cdec_ini_handle(config, os.path.basename, hpyplm_rm_ref)
+
+def cdec_ini_for_realtime(config, path, ref_fifo):
+    cdec_ini_handle(config, lambda x: os.path.join(path, x), lambda x: hpyplm_add_ref(x, ref_fifo))
+
+def cdec_ini_handle(config, path_fn, hpyplm_fn):
+    # This is a list of (k, v), not a ConfigObj or dict
+    for i in range(len(config)):
+        if config[i][0] == 'feature_function':
+            if config[i][1].startswith('KLanguageModel'):
+                f = config[i][1].split()
+                f[-1] = path_fn(f[-1])
+                config[i][1] = ' '.join(f)
+            elif config[i][1].startswith('External'):
+                f = config[i][1].split()
+                if f[1].endswith('libcdec_ff_hpyplm.so'):
+                    # Modify paths
+                    for j in range(1, len(f)):
+                        if not f[j].startswith('-'):
+                            f[j] = path_fn(f[j])
+                    # Modify hpyplm args
+                    hpyplm_fn(f)
+                config[i][1] = ' '.join(f)
+
 def consume_stream(stream):
     def consume(s):
         for _ in s:
             pass
     threading.Thread(target=consume, args=(stream,)).start()
 
+def hpyplm_add_ref(f, ref):
+    f.append('-r')
+    f.append(ref)
+    f.append('-t')
+
+def hpyplm_rm_ref(f):
+    for i in range(1, len(f)):
+        if f[i] == '-r':
+            f.pop(i)
+            f.pop(i)
+            return
+
 def popen_io(cmd):
     p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     consume_stream(p.stderr)
@@ -29,35 +66,12 @@ def popen_io_v(cmd):
     p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
     return p
 
-def sa_ini_addpath(config, path):
+def sa_ini_for_config(config):
     for key in config:
         if key in SA_INI_FILES:
-            config[key] = os.path.join(path, config[key])
+            config[key] = os.path.join('sa', os.path.basename(config[key]))
 
-def sa_ini_basename(config):
+def sa_ini_for_realtime(config, path):
     for key in config:
         if key in SA_INI_FILES:
-            config[key] = os.path.join('sa', os.path.basename(config[key]))
-
-def cdec_ini_addpath(config, path):
-    cdec_ini_fn(config, lambda x: os.path.join(path, x))
-
-def cdec_ini_basename(config):
-    cdec_ini_fn(config, os.path.basename)
-
-def cdec_ini_fn(config, fn):
-    # This is a list of (k, v), not a ConfigObj or dict
-    for i in range(len(config)):
-        if config[i][0] == 'feature_function':
-            if config[i][1].startswith('KLanguageModel'):
-                f = config[i][1].split()
-                f[-1] = fn(f[-1])
-                config[i][1] = ' '.join(f)
-            elif config[i][1].startswith('External'):
-                f = config[i][1].split()
-                if f[1].endswith('libcdec_ff_hpyplm.so'):
-                    for j in range(1, len(f)):
-                        if not f[j].startswith('-'):
-                            f[j] = fn(f[j])
-                config[i][1] = ' '.join(f)
-
+            config[key] = os.path.join(path, config[key])