migration tools fix

1 files changed, 3 insertions, 17 deletions

diff --git a/tools/migrate_search.py b/tools/migrate_search.py
index 93c4070..37ebe10 100755
--- a/tools/migrate_search.py
+++ b/tools/migrate_search.py
@@ -87,39 +87,25 @@ class MigrateDB(DB):
 
 if __name__ == '__main__':
 
-    admin = User.objects.get(username='admin')
-
     db = MigrateDB()
     db.connect()
 
     # Migrate sj_search_log table
-    sj_user = list(db.get_sj_user_table())
-    map_user = {}
-    for row in sj_user:
-        try:
-            user = User.objects.get(username=row['username'])
-        except User.DoesNotExist:
-		print "ERROR in users"
-
-        map_user[row['id']] = user.pk
-
     sj_search_log = list(db.get_sj_search_log_table())
     for row in sj_search_log:
-        user = admin
-        pk = map_user.get(row['userid'], 0)
-        if pk:
-            user = User.objects.get(pk=pk)
+        user = User.objects.get(pk=row['userid'])
         try:
             sjsearch = SJSearch.objects.get(
                 user=user,
                 datetime=datetime.fromtimestamp(row['date'])
             )
-            print 'SJ Search Log Found'
+            print 'searchlog "%d" exist' % row['date']
         except SJSearch.DoesNotExist:
             sjsearch = SJSearch(
                 user=user,
                 datetime=datetime.fromtimestamp(row['date'])
             )
+            print 'searchlog "%d" created' % row['date']
         sjsearch.settings = dict(
             url=row['url'],
             count=row['count'],