Merge branch 'ldap_parser'

diff --cc parser.py
index bea60b0,a476a6e..83b65e8
--- 1/parser.py
--- 2/parser.py
+++ b/parser.py
@@@ -7,10 -7,15 +7,11 @@@
  
  import sys
  import os
+ import re
  
 -# 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):
@@@ -19,15 -24,10 +20,15 @@@
      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 = line.split(':')
+         [(key, value)] = re.findall(r'(.+):(.+)', line) 
          key, value = key.strip(), value.strip()
          try:
              result[key].append(value)
@@@ -38,8 -38,8 +39,7 @@@
  def main(argv):
      """ Main """
  
-     print "Main"
      result=read_file("test/test.ldiff")
 -    print result
  
  if __name__ == "__main__":
      sys.exit(main(sys.argv))

diff --cc test/test.ldiff
Simple merge