diff --git a/rep_cli.py b/rep_cli.py index 9c9064d..57a1fc6 100644 --- a/rep_cli.py +++ b/rep_cli.py @@ -87,7 +87,7 @@ class Werk_unter_id: WHERE id = {werk_id} """ werk_list_val = self.reader.execute(sql_wui).fetchone() - werk_list_att = ('id', 'comp_id', 'year', 'opus', 'collection', 'main_key', 'title', 'mov_title', 'alias', 'Werkverzeichnis', 'Werkverzeichnisnummer') + werk_list_att = ('id', 'comp_id', 'year', 'opus', 'collection', 'main_key', 'title', 'mov_title', 'alias', 'work_directory', 'Werkverzeichnisnummer') for tup in zip(werk_list_att, werk_list_val): self.values[tup[0]] = tup[1] diff --git a/repertoire.sql b/repertoire.sql index 366271f..2755309 100644 --- a/repertoire.sql +++ b/repertoire.sql @@ -16,7 +16,7 @@ CREATE TABLE work ( title VARCHAR(127), mov_title VARCHAR(127), alias VARCHAR(127), - Werkverzeichnis VARCHAR(31), + work_directory VARCHAR(31), Werkverzeichnisnummer VARCHAR(15), FOREIGN KEY(comp_id) REFERENCES composer(id) ); diff --git a/work.sql b/work.sql index 64f71d7..3848a67 100644 --- a/work.sql +++ b/work.sql @@ -1,4 +1,4 @@ -INSERT INTO work (id,comp_id,year,collection,main_key,title,Werkverzeichnis,Werkverzeichnisnummer) +INSERT INTO work (id,comp_id,year,collection,main_key,title,work_directory,Werkverzeichnisnummer) VALUES (1,1,1722,'Das wohltemperierte Klavier Teil 1','C-Dur','Präludium und Fuge','BWV','846'), (2,1,1722,'Das wohltemperierte Klavier Teil 1','c-Moll','Präludium und Fuge','BWV','847'), @@ -50,7 +50,7 @@ VALUES (48,1,1742,'Das wohltemperierte Klavier Teil 2','h-Moll','Präludium und Fuge','BWV','893') ; -INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, alias, Werkverzeichnis, Werkverzeichnisnummer) VALUES +INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, alias, work_directory, Werkverzeichnisnummer) VALUES (49, 2, 1795, '2', 'Sonaten', 'f-Moll', 'Sonate', NULL, NULL, NULL), (50, 2, 1795, '2', 'Sonaten', 'A-Dur', 'Sonate', NULL, NULL, NULL), (51, 2, 1795, '2', 'Sonaten', 'C-Dur', 'Sonate', NULL, NULL, NULL), @@ -85,15 +85,15 @@ INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, alias, W (80, 2, 1822, '111', 'Sonaten', 'c-Moll', 'Sonate', NULL, NULL, NULL) ; -INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, Werkverzeichnis, Werkverzeichnisnummer) VALUES +INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, work_directory, Werkverzeichnisnummer) VALUES (81, 5, 1832, '2', NULL, NULL, 'Papillons', NULL, NULL); -INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_title, Werkverzeichnis, Werkverzeichnisnummer) VALUES +INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_title, work_directory, Werkverzeichnisnummer) VALUES (82, 4, 1827, '90', 'Impromptus', NULL, 'Vier Impromptus', 'Impromptu', 'D', '899'), (83, 4, 1827, 'post. 142', 'Impromptus', NULL, 'Vier Impromptus', 'Impromptu', 'D', '935') ; -INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_title, Werkverzeichnis, Werkverzeichnisnummer) VALUES +INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_title, work_directory, Werkverzeichnisnummer) VALUES (84, 4, 1828, '94', 'Moments musicaux', NULL, 'Six moments musicaux', 'Moment musical', 'D', '780'), (85, 3, 1834, '18', 'Walzer', 'Es-Dur', 'Grande Valse Brillante', NULL, NULL, NULL), (86, 3, 1838, '34', 'Walzer', NULL, NULL, 'Walzer', NULL, NULL), @@ -109,7 +109,7 @@ INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_titl (96, 3, 1830, NULL, 'Walzer', 'Es-Dur', 'Walzer', NULL, 'KK', 'IVa Nr. 14') ; -INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_title, Werkverzeichnis, Werkverzeichnisnummer) VALUES +INSERT INTO work (id, comp_id, year, opus, collection, main_key, title, mov_title, work_directory, Werkverzeichnisnummer) VALUES (97, 6, 1830, '19b', 'Lieder ohne Worte', NULL, 'Sechs Lieder ohne Worte', 'Lied ohne Worte', 'MWV', 'SD 5'), (98, 6, 1834, '30', 'Lieder ohne Worte', NULL, 'Sechs Lieder ohne Worte', 'Lied ohne Worte', 'MWV', 'SD 9'), (99, 6, 1837, '38', 'Lieder ohne Worte', NULL, 'Sechs Lieder ohne Worte', 'Lied ohne Worte', 'MWV', 'SD 16'),