Finished beta

src/init/init.py

@@ -1,42 +1,30 @@
 #DODAC COMMITE'Y
-from argparse import ArgumentParser
-from zipfile import ZipFile
 import xml.etree.ElementTree as xmlET
-import os
 import mysql.connector
-from getpass import getpass
-import sys
 import pexpect
+
+from argparse import ArgumentParser
+from zipfile import ZipFile
 from time import sleep
 from subprocess import run
-
+from getpass import getpass
+from os import walk
 
 from setup_database import setup_database
-sys.path.append('../procedures')
-from setup_procedures import setup_procedures
 
-#TO FIX
-id=1
+#RECURSIVE READ OF MIND MAPS
 
 def recursive_read(root, cursor, database):
-    global id
+    global MAP_ID
     if root.text is not None:
-        cursor.callproc('add_node', (id, root.text))
-        print('Adding branch: ' + str(id), end='\r')
-        id += 1
+        cursor.callproc('add_node', (MAP_ID, root.text))[0]
+        print('Added branch: ' + str(MAP_ID) , end='\r')
+        MAP_ID += 1
     for elem in root.getchildren():
         recursive_read(elem, cursor, database)
 
-#id = 1
-#def recursive_read(root, cursor, database):
-#    global id
-#    if root.text is not None:
-#        cursor.callproc('add_node', (id, root.text))
-#        database.commit()
-#        print('[GATHERING DATA] Working on branch: ' + str(id), end='\r')
-#        id += 1
-#    for elem in root.getchildren():
-#        recursive_read(elem, cursor, database)
+
+#ARGUMENT PARSING AND MAIN PROGRAM LOGIC
 
 parser = ArgumentParser(
     description='''
@@ -76,6 +64,13 @@ def recursive_read(root, cursor, database):
     help='''Engine used for database creation [DEFAULT: InnoDB]''',
     default='InnoDB')
 
+parser.add_argument('--no_store_password', '-n', required=False, action='store_true',
+    help='''Do not store password in secured file in the database\n
+    WARNING! if this argument is specified, xms searcher will ask you\n
+    to provide MySQL password each time!
+    ''',
+    default=True)
+
 parser.add_argument('--experimental', required=False, action='store_true',
     help='''Turns on experimental functions [Mind Maps XSD validation]\n
     IMPORTANT: Slows down the program significantly\n''',
@@ -110,27 +105,34 @@ def recursive_read(root, cursor, database):
         process.sendline('source ../procedures/setup_procedures.sql')
         #BUDUJEMY NAPIECIE
         sleep(1)
+        #process.interact()
         #ZBUDOWANO NAPIECIE
         process.close()
     print("Procedures loaded correctly\n")
 
     #SET UP ROOT
     cursor.execute('''INSERT INTO tree (content, lft, rgt) VALUES ('root', 1, 2) ''')
 
-    for subdir, dirs, files in os.walk(args.path):
+    for subdir, dirs, files in walk(args.path):
         for i, file in enumerate(files):
             if file.endswith('.xmind'):
                 archive = ZipFile(subdir + r'/' + file, 'r')
+
+                #EXPERIMENTAL
                 if args.experimental:
                     print('Validating file ' + file)
                     run(['xmllint', '--noout', '--schema', '../validations/mind_map.xsd', archive.extract('content.xml')])
+                    run(['rm', 'content.xml'])
+
+                #SCANNING MIND MAPS
                 with archive.open('content.xml', 'r') as content:
-                    id = 1
+                    MAP_ID = 1
                     print('Adding branches from file ' + file + ' to database')
                     tree = xmlET.parse(content)
                     recursive_read(tree.getroot(), cursor, database)
                     print('Branches from file ' + file + ' added successfully\n')
-except Error as e:
+
+except Exception as e:
     print(e)
 finally:
     cursor.close()

src/init/setup_database.py

@@ -20,7 +20,7 @@ def setup_database(database, args):
                         content TEXT NOT NULL,
                         lft BIGINT NOT NULL,
                         rgt BIGINT NOT NULL,
-                        FULLTEXT (content)
+                        FULLTEXT(content)
                     )ENGINE=''' + args.engine
                   )
     return cursor;

src/procedures/setup_procedures.sql

@@ -20,8 +20,8 @@ proc: BEGIN
 
 	START TRANSACTION;
 
-			UPDATE tree SET lft = CASE WHEN lft >  parent_rgt THEN lft + 2 ELSE lft END
-											,rgt = CASE WHEN rgt >= parent_rgt THEN rgt + 2 ELSE rgt END
+			UPDATE tree SET lft = CASE WHEN lft >  parent_rgt THEN lft + 2 ELSE lft END,
+											rgt = CASE WHEN rgt >= parent_rgt THEN rgt + 2 ELSE rgt END
 			WHERE rgt >= parent_rgt;
 
 			INSERT INTO tree (content, lft, rgt)
@@ -39,15 +39,18 @@ DROP PROCEDURE IF EXISTS find_node;
 //
 
 CREATE DEFINER = CURRENT_USER PROCEDURE find_node (
-		IN searched TEXT
+		IN searched TEXT,
+		IN off BIGINT
 )
 
 proc: BEGIN
 
 	SELECT parent.content
 	FROM tree AS node,
 			 tree AS parent
-	WHERE node.lft BETWEEN parent.lft AND parent.rgt AND MATCH(node.content) AGAINST(searched IN BOOLEAN MODE)
+	WHERE node.lft BETWEEN parent.lft AND parent.rgt
+				AND node.content =
+				(SELECT content FROM tree WHERE match(content) AGAINST(searched IN BOOLEAN MODE) LIMIT 1 OFFSET off)
 	ORDER BY parent.lft;
 
 END //

src/xms.py

@@ -22,7 +22,7 @@
         )
 
 parser.add_argument('--database', '-d', required=False,
-        help='''Name of the database [DEFAULT: mind_maps]''',
+        help='''Name of the database [DEFAULT: xmindmaps]''',
         default='xmindmaps')
 
 
@@ -39,13 +39,16 @@
 )
 
 cursor = database.cursor()
-cursor.callproc('find_node', (args.keyword,))
-
-for result in cursor.stored_results():
-    limit = 0
-    for branch in result.fetchall():
-        if limit % 5 == 0:
-            print('%s' % branch)
-        else:
-            print('%s' % branch, end='->')
-        limit += 1
+
+id = 0
+while True:
+    print()
+    cursor.callproc('find_node', [args.keyword, id])
+
+    for result in cursor.stored_results():
+        for indent, branch in enumerate(result.fetchall()[1:]):
+            print(' '*indent + '%s' %branch)
+    decision = input('\nShow next result?\n [Y] yes [OTHER] no ')
+    if decision.lower() != 'y':
+        break
+    id += 1