Merge branch 'ldap_parser'

diff --combined parser.py
index bea60b0,a476a6e..83b65e8
--- 1/parser.py
--- 2/parser.py
+++ b/parser.py
@@@ -4,13 -4,18 +4,14 @@@
  
  
  
  
  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,27 -24,22 +20,26 @@@
      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)
          except KeyError:
              result[key]  = [value]
 -    return result
 +    #return result
  
  def main(argv):
      """ Main """
  
-     print "Main"
      result=read_file("test/test.ldiff")
 -    print result
  
  if __name__ == "__main__":
      sys.exit(main(sys.argv))

diff --combined test/test.ldiff
index 29875bb,3469af4..9b26f1b
--- 1/test/test.ldiff
--- 2/test/test.ldiff
+++ b/test/test.ldiff
@@@ -4,7 -4,7 +4,7 @@@ objectclass: perso
  objectclass: organizationalPerson
  objectclass: inetOrgPerson
  objectclass: mozillaAbPersonAlpha
 -givenName: Vasya
 +givenName: Vasya конечно вася
  sn: Pupkin
  cn: Vasya Pupkin
  mozillaNickname: I'm cool
@@@ -45,3 -45,17 +45,17 @@@ homeStreet: Hmm znaet hd
  mozillaHomeLocalityName: N-sk
  street: Away Away
  
+ dn:: Y2490JLQsNGB0Y8g0J/Rg9C/0LrQuNC9LG1haWw9dmFzeWFAY29tcGFueS5vcmc=
+ objectclass: top
+ objectclass: person
+ objectclass: organizationalPerson
+ objectclass: inetOrgPerson
+ objectclass: mozillaAbPersonAlpha
+ givenName:: 0JLQsNGB0Y8=
+ sn:: 0J/Rg9C/0LrQuNC9
+ cn:: 0JLQsNGB0Y8g0J/Rg9C/0LrQuNC9
+ mail: vasya@company.org
+ modifytimestamp: 0Z
+ title: student
+ company: University
+