Merge branch 'ldap_parser'

diff --cc parser.py
index 83b65e8,606a889..642f404
--- 1/parser.py
--- 2/parser.py
+++ b/parser.py
@@@ -8,10 -11,12 +8,11 @@@
  import sys
  import os
  import re
+ import base64 
  
 -# add mnemosyne directory to Python path in debug mode
 -if os.path.basename(sys.argv[0]).endswith("debug"):
 -    sys.path.insert(0, "../../")
 -    sys.path.insert(0, "../")
 +
 +
 +from database import db  
  
  
  def read_file(file_name):
@@@ -20,15 -25,13 +21,18 @@@
      except IOError:
          return None
      result = {}
 +    dbo = db.DbSqlite()
 +    dbo.clear_data()
      for line in file:
          if line == "\n":
 +            dbo.ins_record(result)
 +            # unset result
 +            result = {}
              continue
-         [(key, value)] = re.findall(r'(.+):(.+)', line) 
+         key, value = line.split(':', 1)
+         #Look up uuecode string
+         if (re.search("^: ", value)):
+             value = base64.b64decode(value)
          key, value = key.strip(), value.strip()
          try:
              result[key].append(value)