From 7e707ca43b85cd097cf3d1f795599e825573461b Mon Sep 17 00:00:00 2001 From: Monai Thangsuphanich Date: Sun, 2 Oct 2016 20:26:06 +1100 Subject: [PATCH 1/5] Add condition to make publication type match with data structure --- src/com/sixppl/importData/ExtractXMLGraph.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/com/sixppl/importData/ExtractXMLGraph.java b/src/com/sixppl/importData/ExtractXMLGraph.java index 1643d6e..1039e28 100644 --- a/src/com/sixppl/importData/ExtractXMLGraph.java +++ b/src/com/sixppl/importData/ExtractXMLGraph.java @@ -106,7 +106,21 @@ public static void main(String[] args) throws SQLException { if (pubSell.editors.isEmpty()) { pubSell.editors.add(""); } - pubSell.type = p.getType(); + if (p.getType().equals("article")) { + pubSell.type = "Article"; + } + else if (p.getType().equals("book")){ + pubSell.type = "Book"; + } + else if (p.getType().equals("mastersthesis")){ + pubSell.type = "Master Thesis"; + } + else if (p.getType().equals("phdthesis")){ + pubSell.type = "Ph.D.Thesis"; + } + else { + pubSell.type = "Conference"; + } if (p.getYear() == null) { pubSell.year = 2016; } From d0adfbf1ab408149e2c4cc00b7ea1bffc72e0260 Mon Sep 17 00:00:00 2001 From: Monai Thangsuphanich Date: Sun, 2 Oct 2016 20:28:15 +1100 Subject: [PATCH 2/5] revert sql --- res/bookstore.sql | 338 ---------------------------------------------- 1 file changed, 338 deletions(-) diff --git a/res/bookstore.sql b/res/bookstore.sql index b5a32c0..363094f 100644 --- a/res/bookstore.sql +++ b/res/bookstore.sql @@ -22,344 +22,6 @@ SET time_zone = "+00:00"; CREATE Database `bookstore`; USE `bookstore`; -CREATE TABLE IF NOT EXISTS `pma__tracking` ( - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `version` int(10) unsigned NOT NULL, - `date_created` datetime NOT NULL, - `date_updated` datetime NOT NULL, - `schema_snapshot` text NOT NULL, - `schema_sql` text, - `data_sql` longtext, - `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, - `tracking_active` int(1) unsigned NOT NULL default '1', - PRIMARY KEY (`db_name`,`table_name`,`version`) -) - COMMENT='Database changes tracking for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- --- Table structure for table `pma__bookmark` --- - -CREATE TABLE IF NOT EXISTS `pma__bookmark` ( - `id` int(11) NOT NULL auto_increment, - `dbase` varchar(255) NOT NULL default '', - `user` varchar(255) NOT NULL default '', - `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `query` text NOT NULL, - PRIMARY KEY (`id`) -) - COMMENT='Bookmarks' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__column_info` --- - -CREATE TABLE IF NOT EXISTS `pma__column_info` ( - `id` int(5) unsigned NOT NULL auto_increment, - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `column_name` varchar(64) NOT NULL default '', - `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `transformation` varchar(255) NOT NULL default '', - `transformation_options` varchar(255) NOT NULL default '', - `input_transformation` varchar(255) NOT NULL default '', - `input_transformation_options` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) -) - COMMENT='Column information for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__history` --- - -CREATE TABLE IF NOT EXISTS `pma__history` ( - `id` bigint(20) unsigned NOT NULL auto_increment, - `username` varchar(64) NOT NULL default '', - `db` varchar(64) NOT NULL default '', - `table` varchar(64) NOT NULL default '', - `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, - `sqlquery` text NOT NULL, - PRIMARY KEY (`id`), - KEY `username` (`username`,`db`,`table`,`timevalue`) -) - COMMENT='SQL history for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__pdf_pages` --- - -CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( - `db_name` varchar(64) NOT NULL default '', - `page_nr` int(10) unsigned NOT NULL auto_increment, - `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '', - PRIMARY KEY (`page_nr`), - KEY `db_name` (`db_name`) -) - COMMENT='PDF relation pages for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__recent` --- - -CREATE TABLE IF NOT EXISTS `pma__recent` ( - `username` varchar(64) NOT NULL, - `tables` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='Recently accessed tables' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__favorite` --- - -CREATE TABLE IF NOT EXISTS `pma__favorite` ( - `username` varchar(64) NOT NULL, - `tables` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='Favorite tables' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__table_uiprefs` --- - -CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( - `username` varchar(64) NOT NULL, - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `prefs` text NOT NULL, - `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`username`,`db_name`,`table_name`) -) - COMMENT='Tables'' UI preferences' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__relation` --- - -CREATE TABLE IF NOT EXISTS `pma__relation` ( - `master_db` varchar(64) NOT NULL default '', - `master_table` varchar(64) NOT NULL default '', - `master_field` varchar(64) NOT NULL default '', - `foreign_db` varchar(64) NOT NULL default '', - `foreign_table` varchar(64) NOT NULL default '', - `foreign_field` varchar(64) NOT NULL default '', - PRIMARY KEY (`master_db`,`master_table`,`master_field`), - KEY `foreign_field` (`foreign_db`,`foreign_table`) -) - COMMENT='Relation table' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__table_coords` --- - -CREATE TABLE IF NOT EXISTS `pma__table_coords` ( - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `pdf_page_number` int(11) NOT NULL default '0', - `x` float unsigned NOT NULL default '0', - `y` float unsigned NOT NULL default '0', - PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) -) - COMMENT='Table coordinates for phpMyAdmin PDF output' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__table_info` --- - -CREATE TABLE IF NOT EXISTS `pma__table_info` ( - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `display_field` varchar(64) NOT NULL default '', - PRIMARY KEY (`db_name`,`table_name`) -) - COMMENT='Table information for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__tracking` --- - -CREATE TABLE IF NOT EXISTS `pma__tracking` ( - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `version` int(10) unsigned NOT NULL, - `date_created` datetime NOT NULL, - `date_updated` datetime NOT NULL, - `schema_snapshot` text NOT NULL, - `schema_sql` text, - `data_sql` longtext, - `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, - `tracking_active` int(1) unsigned NOT NULL default '1', - PRIMARY KEY (`db_name`,`table_name`,`version`) -) - COMMENT='Database changes tracking for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__userconfig` --- - -CREATE TABLE IF NOT EXISTS `pma__userconfig` ( - `username` varchar(64) NOT NULL, - `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `config_data` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='User preferences storage for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__users` --- - -CREATE TABLE IF NOT EXISTS `pma__users` ( - `username` varchar(64) NOT NULL, - `usergroup` varchar(64) NOT NULL, - PRIMARY KEY (`username`,`usergroup`) -) - COMMENT='Users and their assignments to user groups' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__usergroups` --- - -CREATE TABLE IF NOT EXISTS `pma__usergroups` ( - `usergroup` varchar(64) NOT NULL, - `tab` varchar(64) NOT NULL, - `allowed` enum('Y','N') NOT NULL DEFAULT 'N', - PRIMARY KEY (`usergroup`,`tab`,`allowed`) -) - COMMENT='User groups with configured menu items' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__navigationhiding` --- - -CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( - `username` varchar(64) NOT NULL, - `item_name` varchar(64) NOT NULL, - `item_type` varchar(64) NOT NULL, - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) -) - COMMENT='Hidden items of navigation tree' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__savedsearches` --- - -CREATE TABLE IF NOT EXISTS `pma__savedsearches` ( - `id` int(5) unsigned NOT NULL auto_increment, - `username` varchar(64) NOT NULL default '', - `db_name` varchar(64) NOT NULL default '', - `search_name` varchar(64) NOT NULL default '', - `search_data` text NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) -) - COMMENT='Saved searches' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__central_columns` --- - -CREATE TABLE IF NOT EXISTS `pma__central_columns` ( - `db_name` varchar(64) NOT NULL, - `col_name` varchar(64) NOT NULL, - `col_type` varchar(64) NOT NULL, - `col_length` text, - `col_collation` varchar(64) NOT NULL, - `col_isNull` boolean NOT NULL, - `col_extra` varchar(255) default '', - `col_default` text, - PRIMARY KEY (`db_name`,`col_name`) -) - COMMENT='Central list of columns' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__designer_settings` --- - -CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( - `username` varchar(64) NOT NULL, - `settings_data` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='Settings related to Designer' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__export_templates` --- - -CREATE TABLE IF NOT EXISTS `pma__export_templates` ( - `id` int(5) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(64) NOT NULL, - `export_type` varchar(10) NOT NULL, - `template_name` varchar(64) NOT NULL, - `template_data` text NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) -) - COMMENT='Saved export templates' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - DELIMITER $$ -- -- Procedures From dcd8faf4628fa1a019db50cd5dae713cd89dfa5e Mon Sep 17 00:00:00 2001 From: Monai Thangsuphanich Date: Sun, 2 Oct 2016 20:28:27 +1100 Subject: [PATCH 3/5] Revert "revert sql" This reverts commit d0adfbf1ab408149e2c4cc00b7ea1bffc72e0260. --- res/bookstore.sql | 338 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 338 insertions(+) diff --git a/res/bookstore.sql b/res/bookstore.sql index 363094f..b5a32c0 100644 --- a/res/bookstore.sql +++ b/res/bookstore.sql @@ -22,6 +22,344 @@ SET time_zone = "+00:00"; CREATE Database `bookstore`; USE `bookstore`; +CREATE TABLE IF NOT EXISTS `pma__tracking` ( + `db_name` varchar(64) NOT NULL, + `table_name` varchar(64) NOT NULL, + `version` int(10) unsigned NOT NULL, + `date_created` datetime NOT NULL, + `date_updated` datetime NOT NULL, + `schema_snapshot` text NOT NULL, + `schema_sql` text, + `data_sql` longtext, + `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, + `tracking_active` int(1) unsigned NOT NULL default '1', + PRIMARY KEY (`db_name`,`table_name`,`version`) +) + COMMENT='Database changes tracking for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- +-- Table structure for table `pma__bookmark` +-- + +CREATE TABLE IF NOT EXISTS `pma__bookmark` ( + `id` int(11) NOT NULL auto_increment, + `dbase` varchar(255) NOT NULL default '', + `user` varchar(255) NOT NULL default '', + `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '', + `query` text NOT NULL, + PRIMARY KEY (`id`) +) + COMMENT='Bookmarks' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__column_info` +-- + +CREATE TABLE IF NOT EXISTS `pma__column_info` ( + `id` int(5) unsigned NOT NULL auto_increment, + `db_name` varchar(64) NOT NULL default '', + `table_name` varchar(64) NOT NULL default '', + `column_name` varchar(64) NOT NULL default '', + `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '', + `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '', + `transformation` varchar(255) NOT NULL default '', + `transformation_options` varchar(255) NOT NULL default '', + `input_transformation` varchar(255) NOT NULL default '', + `input_transformation_options` varchar(255) NOT NULL default '', + PRIMARY KEY (`id`), + UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) +) + COMMENT='Column information for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__history` +-- + +CREATE TABLE IF NOT EXISTS `pma__history` ( + `id` bigint(20) unsigned NOT NULL auto_increment, + `username` varchar(64) NOT NULL default '', + `db` varchar(64) NOT NULL default '', + `table` varchar(64) NOT NULL default '', + `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, + `sqlquery` text NOT NULL, + PRIMARY KEY (`id`), + KEY `username` (`username`,`db`,`table`,`timevalue`) +) + COMMENT='SQL history for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__pdf_pages` +-- + +CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( + `db_name` varchar(64) NOT NULL default '', + `page_nr` int(10) unsigned NOT NULL auto_increment, + `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '', + PRIMARY KEY (`page_nr`), + KEY `db_name` (`db_name`) +) + COMMENT='PDF relation pages for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__recent` +-- + +CREATE TABLE IF NOT EXISTS `pma__recent` ( + `username` varchar(64) NOT NULL, + `tables` text NOT NULL, + PRIMARY KEY (`username`) +) + COMMENT='Recently accessed tables' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__favorite` +-- + +CREATE TABLE IF NOT EXISTS `pma__favorite` ( + `username` varchar(64) NOT NULL, + `tables` text NOT NULL, + PRIMARY KEY (`username`) +) + COMMENT='Favorite tables' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__table_uiprefs` +-- + +CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( + `username` varchar(64) NOT NULL, + `db_name` varchar(64) NOT NULL, + `table_name` varchar(64) NOT NULL, + `prefs` text NOT NULL, + `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`username`,`db_name`,`table_name`) +) + COMMENT='Tables'' UI preferences' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__relation` +-- + +CREATE TABLE IF NOT EXISTS `pma__relation` ( + `master_db` varchar(64) NOT NULL default '', + `master_table` varchar(64) NOT NULL default '', + `master_field` varchar(64) NOT NULL default '', + `foreign_db` varchar(64) NOT NULL default '', + `foreign_table` varchar(64) NOT NULL default '', + `foreign_field` varchar(64) NOT NULL default '', + PRIMARY KEY (`master_db`,`master_table`,`master_field`), + KEY `foreign_field` (`foreign_db`,`foreign_table`) +) + COMMENT='Relation table' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__table_coords` +-- + +CREATE TABLE IF NOT EXISTS `pma__table_coords` ( + `db_name` varchar(64) NOT NULL default '', + `table_name` varchar(64) NOT NULL default '', + `pdf_page_number` int(11) NOT NULL default '0', + `x` float unsigned NOT NULL default '0', + `y` float unsigned NOT NULL default '0', + PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) +) + COMMENT='Table coordinates for phpMyAdmin PDF output' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__table_info` +-- + +CREATE TABLE IF NOT EXISTS `pma__table_info` ( + `db_name` varchar(64) NOT NULL default '', + `table_name` varchar(64) NOT NULL default '', + `display_field` varchar(64) NOT NULL default '', + PRIMARY KEY (`db_name`,`table_name`) +) + COMMENT='Table information for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__tracking` +-- + +CREATE TABLE IF NOT EXISTS `pma__tracking` ( + `db_name` varchar(64) NOT NULL, + `table_name` varchar(64) NOT NULL, + `version` int(10) unsigned NOT NULL, + `date_created` datetime NOT NULL, + `date_updated` datetime NOT NULL, + `schema_snapshot` text NOT NULL, + `schema_sql` text, + `data_sql` longtext, + `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, + `tracking_active` int(1) unsigned NOT NULL default '1', + PRIMARY KEY (`db_name`,`table_name`,`version`) +) + COMMENT='Database changes tracking for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__userconfig` +-- + +CREATE TABLE IF NOT EXISTS `pma__userconfig` ( + `username` varchar(64) NOT NULL, + `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `config_data` text NOT NULL, + PRIMARY KEY (`username`) +) + COMMENT='User preferences storage for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__users` +-- + +CREATE TABLE IF NOT EXISTS `pma__users` ( + `username` varchar(64) NOT NULL, + `usergroup` varchar(64) NOT NULL, + PRIMARY KEY (`username`,`usergroup`) +) + COMMENT='Users and their assignments to user groups' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__usergroups` +-- + +CREATE TABLE IF NOT EXISTS `pma__usergroups` ( + `usergroup` varchar(64) NOT NULL, + `tab` varchar(64) NOT NULL, + `allowed` enum('Y','N') NOT NULL DEFAULT 'N', + PRIMARY KEY (`usergroup`,`tab`,`allowed`) +) + COMMENT='User groups with configured menu items' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__navigationhiding` +-- + +CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( + `username` varchar(64) NOT NULL, + `item_name` varchar(64) NOT NULL, + `item_type` varchar(64) NOT NULL, + `db_name` varchar(64) NOT NULL, + `table_name` varchar(64) NOT NULL, + PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) +) + COMMENT='Hidden items of navigation tree' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__savedsearches` +-- + +CREATE TABLE IF NOT EXISTS `pma__savedsearches` ( + `id` int(5) unsigned NOT NULL auto_increment, + `username` varchar(64) NOT NULL default '', + `db_name` varchar(64) NOT NULL default '', + `search_name` varchar(64) NOT NULL default '', + `search_data` text NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) +) + COMMENT='Saved searches' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__central_columns` +-- + +CREATE TABLE IF NOT EXISTS `pma__central_columns` ( + `db_name` varchar(64) NOT NULL, + `col_name` varchar(64) NOT NULL, + `col_type` varchar(64) NOT NULL, + `col_length` text, + `col_collation` varchar(64) NOT NULL, + `col_isNull` boolean NOT NULL, + `col_extra` varchar(255) default '', + `col_default` text, + PRIMARY KEY (`db_name`,`col_name`) +) + COMMENT='Central list of columns' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__designer_settings` +-- + +CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( + `username` varchar(64) NOT NULL, + `settings_data` text NOT NULL, + PRIMARY KEY (`username`) +) + COMMENT='Settings related to Designer' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma__export_templates` +-- + +CREATE TABLE IF NOT EXISTS `pma__export_templates` ( + `id` int(5) unsigned NOT NULL AUTO_INCREMENT, + `username` varchar(64) NOT NULL, + `export_type` varchar(10) NOT NULL, + `template_name` varchar(64) NOT NULL, + `template_data` text NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) +) + COMMENT='Saved export templates' + DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + DELIMITER $$ -- -- Procedures From 6c58a8adcd6abb205f5d1c5f7cc7b51a663e08b0 Mon Sep 17 00:00:00 2001 From: Monai Thangsuphanich Date: Sun, 2 Oct 2016 20:28:52 +1100 Subject: [PATCH 4/5] Revert "Revert "revert sql"" This reverts commit dcd8faf4628fa1a019db50cd5dae713cd89dfa5e. --- res/bookstore.sql | 338 ---------------------------------------------- 1 file changed, 338 deletions(-) diff --git a/res/bookstore.sql b/res/bookstore.sql index b5a32c0..363094f 100644 --- a/res/bookstore.sql +++ b/res/bookstore.sql @@ -22,344 +22,6 @@ SET time_zone = "+00:00"; CREATE Database `bookstore`; USE `bookstore`; -CREATE TABLE IF NOT EXISTS `pma__tracking` ( - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `version` int(10) unsigned NOT NULL, - `date_created` datetime NOT NULL, - `date_updated` datetime NOT NULL, - `schema_snapshot` text NOT NULL, - `schema_sql` text, - `data_sql` longtext, - `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, - `tracking_active` int(1) unsigned NOT NULL default '1', - PRIMARY KEY (`db_name`,`table_name`,`version`) -) - COMMENT='Database changes tracking for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- --- Table structure for table `pma__bookmark` --- - -CREATE TABLE IF NOT EXISTS `pma__bookmark` ( - `id` int(11) NOT NULL auto_increment, - `dbase` varchar(255) NOT NULL default '', - `user` varchar(255) NOT NULL default '', - `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `query` text NOT NULL, - PRIMARY KEY (`id`) -) - COMMENT='Bookmarks' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__column_info` --- - -CREATE TABLE IF NOT EXISTS `pma__column_info` ( - `id` int(5) unsigned NOT NULL auto_increment, - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `column_name` varchar(64) NOT NULL default '', - `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `transformation` varchar(255) NOT NULL default '', - `transformation_options` varchar(255) NOT NULL default '', - `input_transformation` varchar(255) NOT NULL default '', - `input_transformation_options` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) -) - COMMENT='Column information for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__history` --- - -CREATE TABLE IF NOT EXISTS `pma__history` ( - `id` bigint(20) unsigned NOT NULL auto_increment, - `username` varchar(64) NOT NULL default '', - `db` varchar(64) NOT NULL default '', - `table` varchar(64) NOT NULL default '', - `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, - `sqlquery` text NOT NULL, - PRIMARY KEY (`id`), - KEY `username` (`username`,`db`,`table`,`timevalue`) -) - COMMENT='SQL history for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__pdf_pages` --- - -CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( - `db_name` varchar(64) NOT NULL default '', - `page_nr` int(10) unsigned NOT NULL auto_increment, - `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '', - PRIMARY KEY (`page_nr`), - KEY `db_name` (`db_name`) -) - COMMENT='PDF relation pages for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__recent` --- - -CREATE TABLE IF NOT EXISTS `pma__recent` ( - `username` varchar(64) NOT NULL, - `tables` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='Recently accessed tables' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__favorite` --- - -CREATE TABLE IF NOT EXISTS `pma__favorite` ( - `username` varchar(64) NOT NULL, - `tables` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='Favorite tables' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__table_uiprefs` --- - -CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( - `username` varchar(64) NOT NULL, - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `prefs` text NOT NULL, - `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`username`,`db_name`,`table_name`) -) - COMMENT='Tables'' UI preferences' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__relation` --- - -CREATE TABLE IF NOT EXISTS `pma__relation` ( - `master_db` varchar(64) NOT NULL default '', - `master_table` varchar(64) NOT NULL default '', - `master_field` varchar(64) NOT NULL default '', - `foreign_db` varchar(64) NOT NULL default '', - `foreign_table` varchar(64) NOT NULL default '', - `foreign_field` varchar(64) NOT NULL default '', - PRIMARY KEY (`master_db`,`master_table`,`master_field`), - KEY `foreign_field` (`foreign_db`,`foreign_table`) -) - COMMENT='Relation table' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__table_coords` --- - -CREATE TABLE IF NOT EXISTS `pma__table_coords` ( - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `pdf_page_number` int(11) NOT NULL default '0', - `x` float unsigned NOT NULL default '0', - `y` float unsigned NOT NULL default '0', - PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) -) - COMMENT='Table coordinates for phpMyAdmin PDF output' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__table_info` --- - -CREATE TABLE IF NOT EXISTS `pma__table_info` ( - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `display_field` varchar(64) NOT NULL default '', - PRIMARY KEY (`db_name`,`table_name`) -) - COMMENT='Table information for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__tracking` --- - -CREATE TABLE IF NOT EXISTS `pma__tracking` ( - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `version` int(10) unsigned NOT NULL, - `date_created` datetime NOT NULL, - `date_updated` datetime NOT NULL, - `schema_snapshot` text NOT NULL, - `schema_sql` text, - `data_sql` longtext, - `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, - `tracking_active` int(1) unsigned NOT NULL default '1', - PRIMARY KEY (`db_name`,`table_name`,`version`) -) - COMMENT='Database changes tracking for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__userconfig` --- - -CREATE TABLE IF NOT EXISTS `pma__userconfig` ( - `username` varchar(64) NOT NULL, - `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `config_data` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='User preferences storage for phpMyAdmin' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__users` --- - -CREATE TABLE IF NOT EXISTS `pma__users` ( - `username` varchar(64) NOT NULL, - `usergroup` varchar(64) NOT NULL, - PRIMARY KEY (`username`,`usergroup`) -) - COMMENT='Users and their assignments to user groups' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__usergroups` --- - -CREATE TABLE IF NOT EXISTS `pma__usergroups` ( - `usergroup` varchar(64) NOT NULL, - `tab` varchar(64) NOT NULL, - `allowed` enum('Y','N') NOT NULL DEFAULT 'N', - PRIMARY KEY (`usergroup`,`tab`,`allowed`) -) - COMMENT='User groups with configured menu items' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__navigationhiding` --- - -CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( - `username` varchar(64) NOT NULL, - `item_name` varchar(64) NOT NULL, - `item_type` varchar(64) NOT NULL, - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) -) - COMMENT='Hidden items of navigation tree' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__savedsearches` --- - -CREATE TABLE IF NOT EXISTS `pma__savedsearches` ( - `id` int(5) unsigned NOT NULL auto_increment, - `username` varchar(64) NOT NULL default '', - `db_name` varchar(64) NOT NULL default '', - `search_name` varchar(64) NOT NULL default '', - `search_data` text NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) -) - COMMENT='Saved searches' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__central_columns` --- - -CREATE TABLE IF NOT EXISTS `pma__central_columns` ( - `db_name` varchar(64) NOT NULL, - `col_name` varchar(64) NOT NULL, - `col_type` varchar(64) NOT NULL, - `col_length` text, - `col_collation` varchar(64) NOT NULL, - `col_isNull` boolean NOT NULL, - `col_extra` varchar(255) default '', - `col_default` text, - PRIMARY KEY (`db_name`,`col_name`) -) - COMMENT='Central list of columns' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__designer_settings` --- - -CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( - `username` varchar(64) NOT NULL, - `settings_data` text NOT NULL, - PRIMARY KEY (`username`) -) - COMMENT='Settings related to Designer' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- - --- --- Table structure for table `pma__export_templates` --- - -CREATE TABLE IF NOT EXISTS `pma__export_templates` ( - `id` int(5) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(64) NOT NULL, - `export_type` varchar(10) NOT NULL, - `template_name` varchar(64) NOT NULL, - `template_data` text NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) -) - COMMENT='Saved export templates' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - DELIMITER $$ -- -- Procedures From b799e8b4ccdc6be8af6cde83d4ce886dff4e5f07 Mon Sep 17 00:00:00 2001 From: Attawit Kittikrairit Date: Sun, 2 Oct 2016 20:56:28 +1100 Subject: [PATCH 5/5] Add admin login link button --- WebContent/inc.body.header.jsp | 3 +++ src/com/sixppl/cmd/EmbedUserCommand.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WebContent/inc.body.header.jsp b/WebContent/inc.body.header.jsp index b5c4e59..a183610 100644 --- a/WebContent/inc.body.header.jsp +++ b/WebContent/inc.body.header.jsp @@ -88,6 +88,9 @@
${sessionScope.user.getNickname()}
    + +
  • Admin Login
    • +
  • Edit Profile
  • Manage Publications
  • Logout
    • diff --git a/src/com/sixppl/cmd/EmbedUserCommand.java b/src/com/sixppl/cmd/EmbedUserCommand.java index 897bc9a..34ebc29 100644 --- a/src/com/sixppl/cmd/EmbedUserCommand.java +++ b/src/com/sixppl/cmd/EmbedUserCommand.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import com.sixppl.dao.AdminLoginDAO; import com.sixppl.dao.AdminUserBanDAO; import com.sixppl.dao.SessionDAO; import com.sixppl.dao.UserDAO; @@ -18,11 +19,13 @@ public class EmbedUserCommand implements Command { private SessionDAO sessionDao; private UserDAO userDao; private AdminUserBanDAO adminUserBanDao; + private AdminLoginDAO adminLoginDao; public EmbedUserCommand() { sessionDao = Application.getSharedInstance().getDAOFactory().getSessionDAO(); userDao = Application.getSharedInstance().getDAOFactory().getUserDAO(); adminUserBanDao = Application.getSharedInstance().getDAOFactory().getAdminUserBanDAO(); + adminLoginDao = Application.getSharedInstance().getDAOFactory().getAdminLoginDAO(); } @Override @@ -32,8 +35,10 @@ public void execute(HttpServletRequest request, HttpServletResponse response) th sessionDto.setSessionID(request.getSession().getId()); int userid = sessionDao.finduserIDbySession(sessionDto); UserDTO userDto = userDao.findUserByUserID(userid); - if(userDto != null) + if(userDto != null){ userDto.setIsBanned(adminUserBanDao.isBanned(userDto.getUserID())); + userDto.setIsAdmin(adminLoginDao.isAdmin(userDto.getUserID())); + } session.setAttribute("user", userDto); }