Skip to content

Commit 86fc928

Browse files
switowskiludmilamarian
authored andcommitted
BibSword: Move tables creation to tabcreate.sql
Signed-off-by: Sebastian Witowski <witowski.sebastian@gmail.com>
1 parent 802ea9e commit 86fc928

File tree

2 files changed

+33
-35
lines changed

2 files changed

+33
-35
lines changed

modules/bibsword/lib/bibsword_client_dblayer.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@
2626
from invenio.dbquery import run_sql
2727

2828

29-
# CREATE TABLE `swrCLIENTTEMPSUBMISSION` (
30-
# `id` varchar(128) NOT NULL,
31-
# `object` longblob NOT NULL,
32-
# `last_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
33-
# PRIMARY KEY (`id`)
34-
# )
35-
36-
3729
def store_temp_submission(
3830
sid,
3931
sobject_blob
@@ -124,19 +116,6 @@ def delete_temp_submission(
124116
return res
125117

126118

127-
# CREATE TABLE `swrCLIENTSUBMISSION` (
128-
# `id_user` int(15) unsigned NOT NULL,
129-
# `id_record` mediumint(8) unsigned NOT NULL,
130-
# `id_server` int(11) unsigned NOT NULL,
131-
# `url_alternate` varchar(256) NOT NULL DEFAULT '',
132-
# `url_edit` varchar(256) NOT NULL DEFAULT '',
133-
# `status` varchar(256) NOT NULL DEFAULT '',
134-
# `submitted` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
135-
# `last_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
136-
# PRIMARY KEY (`id_record`,`id_server`)
137-
# )
138-
139-
140119
def archive_submission(
141120
user_id,
142121
record_id,
@@ -243,20 +222,6 @@ def get_submissions(
243222
return result
244223

245224

246-
# CREATE TABLE `swrCLIENTSERVER` (
247-
# `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
248-
# `name` varchar(64) NOT NULL,
249-
# `engine` varchar(64) NOT NULL,
250-
# `username` varchar(64) NOT NULL,
251-
# `password` varchar(64) NOT NULL,
252-
# `email` varchar(64) NOT NULL,
253-
# `service_document_parsed` longblob,
254-
# `update_frequency` varchar(16) NOT NULL,
255-
# `last_updated` timestamp DEFAULT 0,
256-
# PRIMARY KEY (`id`)
257-
# )
258-
259-
260225
def get_servers(
261226
server_id=None,
262227
with_dict=False

modules/miscutil/sql/tabcreate.sql

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5021,6 +5021,39 @@ CREATE TABLE `pidLOG` (
50215021
CONSTRAINT `pidlog_ibfk_1` FOREIGN KEY (`id_pid`) REFERENCES `pidSTORE` (`id`)
50225022
) ENGINE=MYISAM;
50235023

5024+
-- tables for bibsword
5025+
CREATE TABLE `swrCLIENTTEMPSUBMISSION` (
5026+
`id` varchar(128) NOT NULL,
5027+
`object` longblob NOT NULL,
5028+
`last_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
5029+
PRIMARY KEY (`id`)
5030+
) ENGINE=MYISAM;
5031+
5032+
CREATE TABLE `swrCLIENTSUBMISSION` (
5033+
`id_user` int(15) unsigned NOT NULL,
5034+
`id_record` mediumint(8) unsigned NOT NULL,
5035+
`id_server` int(11) unsigned NOT NULL,
5036+
`url_alternate` varchar(256) NOT NULL DEFAULT '',
5037+
`url_edit` varchar(256) NOT NULL DEFAULT '',
5038+
`status` varchar(256) NOT NULL DEFAULT '',
5039+
`submitted` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
5040+
`last_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
5041+
PRIMARY KEY (`id_record`,`id_server`)
5042+
) ENGINE=MYISAM;
5043+
5044+
CREATE TABLE `swrCLIENTSERVER` (
5045+
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
5046+
`name` varchar(64) NOT NULL,
5047+
`engine` varchar(64) NOT NULL,
5048+
`username` varchar(64) NOT NULL,
5049+
`password` varchar(64) NOT NULL,
5050+
`email` varchar(64) NOT NULL,
5051+
`service_document_parsed` longblob,
5052+
`update_frequency` varchar(16) NOT NULL,
5053+
`last_updated` timestamp DEFAULT 0,
5054+
PRIMARY KEY (`id`)
5055+
) ENGINE=MYISAM;
5056+
50245057
-- maint-1.1 upgrade recipes:
50255058
INSERT INTO upgrade (upgrade, applied) VALUES ('invenio_release_1_1_0',NOW());
50265059
INSERT INTO upgrade (upgrade, applied) VALUES ('invenio_2012_10_31_tablesorter_location',NOW());

0 commit comments

Comments
 (0)