Rename data -> glst (fixes)

diff --git a/scripts/ml-import.py b/scripts/ml-import.py
index 5275d0b2bb34b54a37fb4435b275f6ff6b85c020..67854645c07cedf8f1a862844d45f2691dbe9831 100755 (executable)
--- a/scripts/ml-import.py
+++ b/scripts/ml-import.py
@@ -2,14 +2,14 @@
 
 import sys
 from m_librarian.db import init_db, update_counters
-from m_librarian.glst import import_data
+from m_librarian.glst import import_glst
 from m_librarian.inp import import_inpx
 
 if __name__ == '__main__':
     if len(sys.argv) != 2:
         sys.exit("Usage: %s file.inpx" % sys.argv[0])
     init_db()
-    import_data()
+    import_glst()
     for inpx in sys.argv[1:]:
         import_inpx(inpx)
     update_counters()

diff --git a/scripts/ml-initdb.py b/scripts/ml-initdb.py
index ca696bd7bc2ab847ef15eb4045383b6f2ada438d..0211187cb145a3acbce1af250bed6e4191aa73d1 100755 (executable)
--- a/scripts/ml-initdb.py
+++ b/scripts/ml-initdb.py
@@ -1,11 +1,11 @@
 #! /usr/bin/env python
 
 from m_librarian.db import init_db
-from m_librarian.glst import import_data
+from m_librarian.glst import import_glst
 
 if __name__ == '__main__':
     init_db()
-    old, new = import_data()
+    old, new = import_glst()
     if old:
         print "Imported %d genres (ignored %d existing)" % (new, old)
     else: