diff options
Diffstat (limited to 'docs')
41 files changed, 202 insertions, 380 deletions
diff --git a/docs/man/gammu-backup.5 b/docs/man/gammu-backup.5 index f152511..e6e2406 100644 --- a/docs/man/gammu-backup.5 +++ b/docs/man/gammu-backup.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-BACKUP" "5" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-BACKUP" "5" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-backup \- gammu(1) backup file format. . diff --git a/docs/man/gammu-config.1 b/docs/man/gammu-config.1 index 66fbb94..6fb367f 100644 --- a/docs/man/gammu-config.1 +++ b/docs/man/gammu-config.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-CONFIG" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-CONFIG" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-config \- Gammu configurator . diff --git a/docs/man/gammu-detect.1 b/docs/man/gammu-detect.1 index 9dde576..9be1995 100644 --- a/docs/man/gammu-detect.1 +++ b/docs/man/gammu-detect.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-DETECT" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-DETECT" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-detect \- Gammu device detection . diff --git a/docs/man/gammu-smsbackup.5 b/docs/man/gammu-smsbackup.5 index c74d00d..c4601f2 100644 --- a/docs/man/gammu-smsbackup.5 +++ b/docs/man/gammu-smsbackup.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSBACKUP" "5" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSBACKUP" "5" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsbackup \- gammu(1) SMS backup file format. . diff --git a/docs/man/gammu-smsd-dbi.7 b/docs/man/gammu-smsd-dbi.7 index 0168638..acc9077 100644 --- a/docs/man/gammu-smsd-dbi.7 +++ b/docs/man/gammu-smsd-dbi.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-DBI" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-DBI" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-dbi \- gammu-smsd(1) backend using DBI abstraction layer to use any supported database as a message storage . @@ -88,7 +88,7 @@ drivers for example include: .IP \(bu 2 \fBfreetds\fP \- for MS SQL Server or Sybase .UNINDENT -.SH CREATING TABLES +.SH CREATING TABLES FOR SQLITE .sp SQL script for creating tables in SQLite database: .INDENT 0.0 @@ -96,16 +96,11 @@ SQL script for creating tables in SQLite database: .sp .nf .ft C -CREATE TABLE daemons ( - Start TEXT NOT NULL, - Info TEXT NOT NULL -); - CREATE TABLE gammu ( - Version INTEGER NOT NULL DEFAULT \(aq0\(aq + Version INTEGER NOT NULL DEFAULT \(aq0\(aq PRIMARY KEY ); -INSERT INTO gammu (Version) VALUES (15); +INSERT INTO gammu (Version) VALUES (16); CREATE TABLE inbox ( UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime(\(aqnow\(aq)), @@ -149,6 +144,7 @@ CREATE TABLE outbox ( DeliveryReport TEXT DEFAULT \(aqdefault\(aq, CreatorID TEXT NOT NULL, Retries INTEGER DEFAULT \(aq0\(aq, + Priority INTEGER DEFAULT \(aq0\(aq, CHECK (Coding IN (\(aqDefault_No_Compression\(aq,\(aqUnicode_No_Compression\(aq,\(aq8bit\(aq,\(aqDefault_Compression\(aq,\(aqUnicode_Compression\(aq)), CHECK (DeliveryReport IN (\(aqdefault\(aq,\(aqyes\(aq,\(aqno\(aq)) @@ -175,18 +171,6 @@ CREATE TABLE outbox_multipart ( PRIMARY KEY (ID, SequencePosition) ); -CREATE TABLE pbk ( - ID INTEGER PRIMARY KEY AUTOINCREMENT, - GroupID INTEGER NOT NULL DEFAULT \(aq\-1\(aq, - Name TEXT NOT NULL, - Number TEXT NOT NULL -); - -CREATE TABLE pbk_groups ( - Name TEXT NOT NULL, - ID INTEGER PRIMARY KEY AUTOINCREMENT -); - CREATE TABLE phones ( ID TEXT NOT NULL, UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime(\(aqnow\(aq)), @@ -195,6 +179,7 @@ CREATE TABLE phones ( Send TEXT NOT NULL DEFAULT \(aqno\(aq, Receive TEXT NOT NULL DEFAULT \(aqno\(aq, IMEI TEXT PRIMARY KEY NOT NULL, + IMSI TEXT NOT NULL, NetCode TEXT DEFAULT \(aqERROR\(aq, NetName TEXT DEFAULT \(aqERROR\(aq, Client TEXT NOT NULL, diff --git a/docs/man/gammu-smsd-files.7 b/docs/man/gammu-smsd-files.7 index 40c8ef4..9eafe59 100644 --- a/docs/man/gammu-smsd-files.7 +++ b/docs/man/gammu-smsd-files.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-FILES" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-FILES" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-files \- gammu-smsd(1) backend using filesystem as a message storage . diff --git a/docs/man/gammu-smsd-inject.1 b/docs/man/gammu-smsd-inject.1 index 9d15fc7..c985884 100644 --- a/docs/man/gammu-smsd-inject.1 +++ b/docs/man/gammu-smsd-inject.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-INJECT" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-INJECT" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-inject \- Inject messages into queue of SMS daemon for Gammu . diff --git a/docs/man/gammu-smsd-monitor.1 b/docs/man/gammu-smsd-monitor.1 index 073befc..c891f91 100644 --- a/docs/man/gammu-smsd-monitor.1 +++ b/docs/man/gammu-smsd-monitor.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-MONITOR" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-MONITOR" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-monitor \- Monitor state of SMS daemon for Gammu . diff --git a/docs/man/gammu-smsd-mysql.7 b/docs/man/gammu-smsd-mysql.7 index 70a99f7..fd04cb9 100644 --- a/docs/man/gammu-smsd-mysql.7 +++ b/docs/man/gammu-smsd-mysql.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-MYSQL" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-MYSQL" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-mysql \- gammu-smsd(1) backend using MySQL database server as a message storage . @@ -91,7 +91,7 @@ For creating the SQL tables you need more privileges, especially for creating triggers, which are used for some functionality. .UNINDENT .UNINDENT -.SH CREATING TABLES +.SH CREATING TABLES FOR MYSQL .sp SQL script for creating tables in MySQL database: .INDENT 0.0 @@ -108,34 +108,18 @@ SQL script for creating tables in MySQL database: \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \-\- -\-\- Table structure for table \(gadaemons\(ga -\-\- - -CREATE TABLE \(gadaemons\(ga ( - \(gaStart\(ga text NOT NULL, - \(gaInfo\(ga text NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; - -\-\- -\-\- Dumping data for table \(gadaemons\(ga -\-\- - - -\-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- - -\-\- \-\- Table structure for table \(gagammu\(ga \-\- CREATE TABLE \(gagammu\(ga ( - \(gaVersion\(ga integer NOT NULL default \(aq0\(aq + \(gaVersion\(ga integer NOT NULL default \(aq0\(aq PRIMARY KEY ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; \-\- \-\- Dumping data for table \(gagammu\(ga \-\- -INSERT INTO \(gagammu\(ga (\(gaVersion\(ga) VALUES (15); +INSERT INTO \(gagammu\(ga (\(gaVersion\(ga) VALUES (16); \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- @@ -152,7 +136,7 @@ CREATE TABLE \(gainbox\(ga ( \(gaUDH\(ga text NOT NULL, \(gaSMSCNumber\(ga varchar(20) NOT NULL default \(aq\(aq, \(gaClass\(ga integer NOT NULL default \(aq\-1\(aq, - \(gaTextDecoded\(ga text NOT NULL default \(aq\(aq, + \(gaTextDecoded\(ga text NOT NULL, \(gaID\(ga integer unsigned NOT NULL auto_increment, \(gaRecipientID\(ga text NOT NULL, \(gaProcessed\(ga enum(\(aqfalse\(aq,\(aqtrue\(aq) NOT NULL default \(aqfalse\(aq, @@ -181,7 +165,7 @@ CREATE TABLE \(gaoutbox\(ga ( \(gaCoding\(ga enum(\(aqDefault_No_Compression\(aq,\(aqUnicode_No_Compression\(aq,\(aq8bit\(aq,\(aqDefault_Compression\(aq,\(aqUnicode_Compression\(aq) NOT NULL default \(aqDefault_No_Compression\(aq, \(gaUDH\(ga text, \(gaClass\(ga integer default \(aq\-1\(aq, - \(gaTextDecoded\(ga text NOT NULL default \(aq\(aq, + \(gaTextDecoded\(ga text NOT NULL, \(gaID\(ga integer unsigned NOT NULL auto_increment, \(gaMultiPart\(ga enum(\(aqfalse\(aq,\(aqtrue\(aq) default \(aqfalse\(aq, \(gaRelativeValidity\(ga integer default \(aq\-1\(aq, @@ -190,6 +174,7 @@ CREATE TABLE \(gaoutbox\(ga ( \(gaDeliveryReport\(ga enum(\(aqdefault\(aq,\(aqyes\(aq,\(aqno\(aq) default \(aqdefault\(aq, \(gaCreatorID\(ga text NOT NULL, \(gaRetries\(ga int(3) default 0, + \(gaPriority\(ga integer default 0, PRIMARY KEY \(gaID\(ga (\(gaID\(ga) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; @@ -212,7 +197,7 @@ CREATE TABLE \(gaoutbox_multipart\(ga ( \(gaCoding\(ga enum(\(aqDefault_No_Compression\(aq,\(aqUnicode_No_Compression\(aq,\(aq8bit\(aq,\(aqDefault_Compression\(aq,\(aqUnicode_Compression\(aq) NOT NULL default \(aqDefault_No_Compression\(aq, \(gaUDH\(ga text, \(gaClass\(ga integer default \(aq\-1\(aq, - \(gaTextDecoded\(ga text default NULL, + \(gaTextDecoded\(ga text, \(gaID\(ga integer unsigned NOT NULL default \(aq0\(aq, \(gaSequencePosition\(ga integer NOT NULL default \(aq1\(aq, PRIMARY KEY (\(gaID\(ga, \(gaSequencePosition\(ga) @@ -222,43 +207,6 @@ CREATE TABLE \(gaoutbox_multipart\(ga ( \-\- Dumping data for table \(gaoutbox_multipart\(ga \-\- - -\-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- - -\-\- -\-\- Table structure for table \(gapbk\(ga -\-\- - -CREATE TABLE \(gapbk\(ga ( - \(gaID\(ga integer NOT NULL auto_increment, - \(gaGroupID\(ga integer NOT NULL default \(aq\-1\(aq, - \(gaName\(ga text NOT NULL, - \(gaNumber\(ga text NOT NULL, - PRIMARY KEY (\(gaID\(ga) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; - -\-\- -\-\- Dumping data for table \(gapbk\(ga -\-\- - - -\-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- - -\-\- -\-\- Table structure for table \(gapbk_groups\(ga -\-\- - -CREATE TABLE \(gapbk_groups\(ga ( - \(gaName\(ga text NOT NULL, - \(gaID\(ga integer NOT NULL auto_increment, - PRIMARY KEY \(gaID\(ga (\(gaID\(ga) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ; - -\-\- -\-\- Dumping data for table \(gapbk_groups\(ga -\-\- - - \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \-\- @@ -273,6 +221,7 @@ CREATE TABLE \(gaphones\(ga ( \(gaSend\(ga enum(\(aqyes\(aq,\(aqno\(aq) NOT NULL default \(aqno\(aq, \(gaReceive\(ga enum(\(aqyes\(aq,\(aqno\(aq) NOT NULL default \(aqno\(aq, \(gaIMEI\(ga varchar(35) NOT NULL, + \(gaIMSI\(ga varchar(35) NOT NULL, \(gaNetCode\(ga varchar(10) default \(aqERROR\(aq, \(gaNetName\(ga varchar(35) default \(aqERROR\(aq, \(gaClient\(ga text NOT NULL, @@ -304,7 +253,7 @@ CREATE TABLE \(gasentitems\(ga ( \(gaUDH\(ga text NOT NULL, \(gaSMSCNumber\(ga varchar(20) NOT NULL default \(aq\(aq, \(gaClass\(ga integer NOT NULL default \(aq\-1\(aq, - \(gaTextDecoded\(ga text NOT NULL default \(aq\(aq, + \(gaTextDecoded\(ga text NOT NULL, \(gaID\(ga integer unsigned NOT NULL default \(aq0\(aq, \(gaSenderID\(ga varchar(255) NOT NULL, \(gaSequencePosition\(ga integer NOT NULL default \(aq1\(aq, diff --git a/docs/man/gammu-smsd-null.7 b/docs/man/gammu-smsd-null.7 index 49bb2f9..5d6fc67 100644 --- a/docs/man/gammu-smsd-null.7 +++ b/docs/man/gammu-smsd-null.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-NULL" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-NULL" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-null \- gammu-smsd(1) backend not storing messages . diff --git a/docs/man/gammu-smsd-odbc.7 b/docs/man/gammu-smsd-odbc.7 index 1a8ae81..06fb62e 100644 --- a/docs/man/gammu-smsd-odbc.7 +++ b/docs/man/gammu-smsd-odbc.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-ODBC" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-ODBC" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-odbc \- gammu-smsd(1) backend using ODBC abstraction layer to use any supported database as a message storage . @@ -66,6 +66,18 @@ On Microsoft Windows, you can find instructions on Microsoft website: .sp For unixODBC this is documented in the user manual: \fI\%http://www.unixodbc.org/doc/UserManual/\fP +.SH CREATING TABLES +.sp +Prior to starting SMSD you have to create tables it will use. Gammu ships SQL +scripts for several databases to do that: +.INDENT 0.0 +.IP \(bu 2 +mysql\-create +.IP \(bu 2 +pgsql\-create +.IP \(bu 2 +sqlite\-create +.UNINDENT .SH EXAMPLE .sp Example configuration: diff --git a/docs/man/gammu-smsd-pgsql.7 b/docs/man/gammu-smsd-pgsql.7 index 97b64d4..40928ef 100644 --- a/docs/man/gammu-smsd-pgsql.7 +++ b/docs/man/gammu-smsd-pgsql.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-PGSQL" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-PGSQL" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-pgsql \- gammu-smsd(1) backend using PostgreSQL database server as a message storage . @@ -65,7 +65,7 @@ host = localhost gammu\-smsdrc .UNINDENT .UNINDENT -.SH CREATING TABLES +.SH CREATING TABLES FOR POSTGRESQL .sp SQL script for creating tables in PostgreSQL database: .INDENT 0.0 @@ -106,8 +106,6 @@ $update_timestamp$ LANGUAGE plpgsql; \-\-CREATE SEQUENCE outbox_multipart_ID_seq; -\-\-CREATE SEQUENCE pbk_groups_ID_seq; - \-\-CREATE SEQUENCE sentitems_ID_seq; \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- @@ -122,40 +120,23 @@ $update_timestamp$ LANGUAGE plpgsql; \-\-CREATE UNIQUE INDEX outbox_multipart_pkey ON outbox_multipart USING btree ("ID"); -\-\-CREATE UNIQUE INDEX pbk_groups_pkey ON pbk_groups USING btree ("ID"); - \-\-CREATE UNIQUE INDEX sentitems_pkey ON sentitems USING btree ("ID"); \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- -\-\- -\-\- Table structure for table "daemons" -\-\- - -CREATE TABLE daemons ( - "Start" text NOT NULL, - "Info" text NOT NULL -); - -\-\- -\-\- Dumping data for table "daemons" -\-\- - - -\-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \-\- \-\- Table structure for table "gammu" \-\- CREATE TABLE gammu ( - "Version" smallint NOT NULL DEFAULT \(aq0\(aq + "Version" smallint NOT NULL DEFAULT \(aq0\(aq PRIMARY KEY ); \-\- \-\- Dumping data for table "gammu" \-\- -INSERT INTO gammu ("Version") VALUES (15); +INSERT INTO gammu ("Version") VALUES (16); \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- @@ -217,7 +198,8 @@ CREATE TABLE outbox ( "SendingTimeOut" timestamp(0) WITHOUT time zone NOT NULL DEFAULT LOCALTIMESTAMP(0), "DeliveryReport" varchar(10) DEFAULT \(aqdefault\(aq, "CreatorID" text NOT NULL, - "Retries" integer DEFAULT "0", + "Retries" integer DEFAULT \(aq0\(aq, + "Priority" integer DEFAULT \(aq0\(aq, CHECK ("Coding" IN (\(aqDefault_No_Compression\(aq,\(aqUnicode_No_Compression\(aq,\(aq8bit\(aq,\(aqDefault_Compression\(aq,\(aqUnicode_Compression\(aq)), CHECK ("DeliveryReport" IN (\(aqdefault\(aq,\(aqyes\(aq,\(aqno\(aq)) @@ -265,40 +247,6 @@ CREATE TABLE outbox_multipart ( \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \-\- -\-\- Table structure for table "pbk" -\-\- - -CREATE TABLE pbk ( - "ID" serial PRIMARY KEY, - "GroupID" integer NOT NULL DEFAULT \(aq\-1\(aq, - "Name" text NOT NULL, - "Number" text NOT NULL -); - -\-\- -\-\- Dumping data for table "pbk" -\-\- - - -\-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- - -\-\- -\-\- Table structure for table "pbk_groups" -\-\- - -CREATE TABLE pbk_groups ( - "Name" text NOT NULL, - "ID" serial PRIMARY KEY -); - -\-\- -\-\- Dumping data for table "pbk_groups" -\-\- - - -\-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- - -\-\- \-\- Table structure for table "phones" \-\- @@ -310,6 +258,7 @@ CREATE TABLE phones ( "Send" boolean NOT NULL DEFAULT \(aqno\(aq, "Receive" boolean NOT NULL DEFAULT \(aqno\(aq, "IMEI" varchar(35) PRIMARY KEY NOT NULL, + "IMSI" varchar(35) NOT NULL, "NetCode" varchar(10) DEFAULT \(aqERROR\(aq, "NetName" varchar(35) DEFAULT \(aqERROR\(aq, "Client" text NOT NULL, diff --git a/docs/man/gammu-smsd-run.7 b/docs/man/gammu-smsd-run.7 index 52d12f3..178cbd7 100644 --- a/docs/man/gammu-smsd-run.7 +++ b/docs/man/gammu-smsd-run.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-RUN" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-RUN" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-run \- documentation for RunOnReceive directive . diff --git a/docs/man/gammu-smsd-sql.7 b/docs/man/gammu-smsd-sql.7 index c99431d..b1d05ef 100644 --- a/docs/man/gammu-smsd-sql.7 +++ b/docs/man/gammu-smsd-sql.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-SQL" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-SQL" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-sql \- gammu-smsd(1) backend using SQL abstraction layer to use any supported database as a message storage . @@ -98,11 +98,6 @@ You can customize name of all tables in the \fB[tables]\fP\&. The SQL queries will reflect this, so it\(aqs enough to change table name in this section. .INDENT 0.0 .TP -.B daemons -Name of the daemons table. -.UNINDENT -.INDENT 0.0 -.TP .B gammu Name of the gammu\-table table. .UNINDENT @@ -163,6 +158,9 @@ query specific, which are numeric and are specific only for given query (or set .B \fB%I\fP IMEI of phone .TP +.B \fB%S\fP +SIM IMSI +.TP .B \fB%P\fP PHONE ID (hostname) .TP diff --git a/docs/man/gammu-smsd-tables.7 b/docs/man/gammu-smsd-tables.7 index 69b84fb..ed78880 100644 --- a/docs/man/gammu-smsd-tables.7 +++ b/docs/man/gammu-smsd-tables.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD-TABLES" "7" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD-TABLES" "7" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd-tables \- description of tables for database backends of gammu-smsd(1) . @@ -47,9 +47,6 @@ Received messages are stored in \fI\%inbox\fP table. Transmitted messages are read from table \fI\%outbox\fP and possible subsequent parts of the same message from \fI\%outbox_multipart\fP\&. .SH DESCRIPTION OF TABLES -.SS daemons -.sp -Information about running daemons. .SS gammu .sp Table holding single field \fBVersion\fP \- version of a database schema. See @@ -163,7 +160,7 @@ SMS relative validity like encoded using GSM specs .B \fBSenderID\fP (text) which SMSD instance should send this one sequence, see \fBPhoneID\fP and smsd\-multi\&. If blank, first SMSD who -sees this message will process it. +sees this message first will process it. .TP .B \fBSendingTimeOut\fP (timestamp) used by SMSD instance for own targets @@ -176,6 +173,9 @@ identification of program created the message .TP .B \fBRetries\fP (integer) number of attempted retries when sending this message +.TP +.B \fBPriority\fP (integer) +priority of message, messages with higher priority are processed first .UNINDENT .SS outbox_multipart .sp @@ -238,6 +238,9 @@ indicates whether SMSD is receiving messages, depends on configuration directive .B \fBIMEI\fP (text) IMEI of phone .TP +.B \fBIMSI\fP (text) +SIM IMSI +.TP .B \fBClient\fP (text) client name, usually string Gammu with version .TP @@ -348,12 +351,6 @@ SMS relative validity like encoded using GSM specs .B \fBCreatorID\fP (text) copied from CreatorID from outbox table .UNINDENT -.SS pbk -.sp -Not used by SMSD currently, included only for application usage. -.SS pbk_groups -.sp -Not used by SMSD currently, included only for application usage. .SH HISTORY OF DATABASE STRUCTURE .sp \fBNOTE:\fP @@ -368,10 +365,29 @@ production environment. .sp History of schema versions: .sp +16 +.INDENT 0.0 +.INDENT 3.5 +.INDENT 0.0 +.IP \(bu 2 +Removed unused \fBdaemons\fP, \fBpbk\fP and \fBpbk_groups\fP tables. +.IP \(bu 2 +Added primary key to the \fBgammu\fP table. +.IP \(bu 2 +Added \fBPriority\fP field to the \fI\%outbox\fP\&. +.IP \(bu 2 +Added \fBIMSI\fP field to the \fI\%phones\fP\&. +.UNINDENT +.sp +Changed in version 1.37.90. + +.UNINDENT +.UNINDENT +.sp 15 .INDENT 0.0 .INDENT 3.5 -Added \fBRetries\fP field. +Added \fBRetries\fP field to the \fI\%outbox\fP\&. .sp Changed in version 1.36.7. diff --git a/docs/man/gammu-smsd.1 b/docs/man/gammu-smsd.1 index 47b718f..0f448c7 100644 --- a/docs/man/gammu-smsd.1 +++ b/docs/man/gammu-smsd.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSD" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSD" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsd \- SMS daemon for Gammu . diff --git a/docs/man/gammu-smsdrc.5 b/docs/man/gammu-smsdrc.5 index 5919059..38edc16 100644 --- a/docs/man/gammu-smsdrc.5 +++ b/docs/man/gammu-smsdrc.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU-SMSDRC" "5" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU-SMSDRC" "5" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu-smsdrc \- gammu-smsd(1) configuration file . @@ -334,6 +334,19 @@ Default is 1 (enabled). .UNINDENT .INDENT 0.0 .TP +.B CheckNetwork +New in version 1.37.90. + +.sp +Whether to check network status periodically. +.sp +If phone is reported to be not on the network, SMSD +tries to power it on. +.sp +Default is 1 (enabled). +.UNINDENT +.INDENT 0.0 +.TP .B ResetFrequency The number of seconds between performing a preventive soft reset in order to minimize the cases of hanging phones e.g. Nokia 5110 will sometimes freeze to @@ -400,6 +413,9 @@ When you set PhoneID, all messages (including injected ones) will be marked by this string (stored as SenderID in the database) and it allows more SMS daemons to share a single database. .sp +SMSD daemon will in such case send outbox messages only with +matching or empty SenderID. +.sp This option has actually no effect with gammu\-smsd\-files\&. .UNINDENT .INDENT 0.0 @@ -653,6 +669,8 @@ Possible values: .IP \(bu 2 \fBaccess\fP \- Microsoft Access .IP \(bu 2 +\fBoracle\fP \- Oracle +.IP \(bu 2 \fBodbc\fP \- Generic ODBC .UNINDENT .sp diff --git a/docs/man/gammu.1 b/docs/man/gammu.1 index 99c5764..38ea0ec 100644 --- a/docs/man/gammu.1 +++ b/docs/man/gammu.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMU" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMU" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammu \- Does some neat things with your cellular phone or modem. . @@ -1884,13 +1884,6 @@ Displays information about battery and power source. .UNINDENT .INDENT 0.0 .TP -.B getlocation -Gets network information from phone (same as networkinfo) -and prints location (latitude and longitude) based on information from -\fI\%OpenCellID\fP\&. -.UNINDENT -.INDENT 0.0 -.TP .B getsecuritystatus Show, if phone wait for security code (like PIN, PUK, etc.) or not .UNINDENT @@ -2232,13 +2225,13 @@ Can\(aqt set parity on the device. No response in specified timeout. Probably phone not connected. .TP .B 115 -Frame not requested right now. See <\fI\%http://wammu.eu/support/bugs/\fP> for information how to report it. +Frame not requested right now. See <\fI\%https://wammu.eu/support/bugs/\fP> for information how to report it. .TP .B 116 -Unknown response from phone. See <\fI\%http://wammu.eu/support/bugs/\fP> for information how to report it. +Unknown response from phone. See <\fI\%https://wammu.eu/support/bugs/\fP> for information how to report it. .TP .B 117 -Unknown frame. See <\fI\%http://wammu.eu/support/bugs/\fP> for information how to report it. +Unknown frame. See <\fI\%https://wammu.eu/support/bugs/\fP> for information how to report it. .TP .B 118 Unknown connection type string. Check config file. @@ -2630,7 +2623,7 @@ With this settings, Gammu generates /tmp/gammu.log on each connection to phone and stores dump of communication there. You can also find some hints for improving support for your phone in this log. .sp -See <\fI\%http://wammu.eu/support/bugs/\fP> for more information on reporting bugs. +See <\fI\%https://wammu.eu/support/bugs/\fP> for more information on reporting bugs. .sp Please report bugs to \fI\%Gammu bug tracker\fP\&. .SH AUTHOR diff --git a/docs/man/gammurc.5 b/docs/man/gammurc.5 index b53d37a..dc19f6f 100644 --- a/docs/man/gammurc.5 +++ b/docs/man/gammurc.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GAMMURC" "5" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "GAMMURC" "5" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME gammurc \- gammu(1) configuration file . @@ -62,7 +62,7 @@ You can use gammu\-config or gammu\-detect to generate configuration file or start from \fI\%Fully documented example\fP\&. .sp For hints about configuring your phone, you can check Gammu Phone -Database <\fI\%http://wammu.eu/phones/\fP> to see what user users +Database <\fI\%https://wammu.eu/phones/\fP> to see what user users experienced. .sp This file use ini file syntax, see ini\&. diff --git a/docs/man/jadmaker.1 b/docs/man/jadmaker.1 index 9007a0f..411e74a 100644 --- a/docs/man/jadmaker.1 +++ b/docs/man/jadmaker.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "JADMAKER" "1" "Aug 16, 2016" "1.37.4" "Gammu" +.TH "JADMAKER" "1" "Oct 18, 2016" "1.37.90" "Gammu" .SH NAME jadmaker \- JAD File Generator . diff --git a/docs/manual/config/index.rst b/docs/manual/config/index.rst index f98f731..02bd0af 100644 --- a/docs/manual/config/index.rst +++ b/docs/manual/config/index.rst @@ -30,7 +30,7 @@ You can use :ref:`gammu-config` or :ref:`gammu-detect` to generate configuration file or start from :ref:`Fully documented example`. For hints about configuring your phone, you can check Gammu Phone -Database <http://wammu.eu/phones/> to see what user users +Database <https://wammu.eu/phones/> to see what user users experienced. This file use ini file syntax, see :ref:`ini`. diff --git a/docs/manual/faq/config.rst b/docs/manual/faq/config.rst index 976a406..37c3b48 100644 --- a/docs/manual/faq/config.rst +++ b/docs/manual/faq/config.rst @@ -127,4 +127,4 @@ You can also find additional user experiences in `Gammu Phones Database`_. .. seealso:: :ref:`faq-phones`, :ref:`gammurc` -.. _Gammu Phones Database: http://wammu.eu/phones/ +.. _Gammu Phones Database: https://wammu.eu/phones/ diff --git a/docs/manual/faq/phone.rst b/docs/manual/faq/phone.rst index 9a57a90..c0a3d43 100644 --- a/docs/manual/faq/phone.rst +++ b/docs/manual/faq/phone.rst @@ -48,7 +48,7 @@ This option is supported since Gammu 1.29.90. .. _faq-android: -Are Andriod phones supported? +Are Android phones supported? ----------------------------- Unfortunately no at the moment. Any help in this area is welcome. @@ -67,4 +67,4 @@ Are iPhone phones supported? Unfortunately no at the moment. Any help in this area is welcome. -.. _Gammu Phones Database: http://wammu.eu/phones/ +.. _Gammu Phones Database: https://wammu.eu/phones/ diff --git a/docs/manual/faq/python.rst b/docs/manual/faq/python.rst index d63d455..033dd25 100644 --- a/docs/manual/faq/python.rst +++ b/docs/manual/faq/python.rst @@ -16,4 +16,4 @@ the :file:`examples` subdirectory. .. seealso:: :ref:`python`, :ref:`python-gammu-examples` -.. _Gammu: http://wammu.eu/gammu/ +.. _Gammu: https://wammu.eu/gammu/ diff --git a/docs/manual/faq/smsd.rst b/docs/manual/faq/smsd.rst index 01412fb..851f8d2 100644 --- a/docs/manual/faq/smsd.rst +++ b/docs/manual/faq/smsd.rst @@ -86,4 +86,4 @@ This can occasionally happen and can have several reasons. .. _MySQL: http://www.mysql.com/ .. _PostgreSQL: http://www.postgresql.org/ .. _libdbi: http://libdbi.sourceforge.net/ -.. _Gammu Phones Database: http://wammu.eu/phones/ +.. _Gammu Phones Database: https://wammu.eu/phones/ diff --git a/docs/manual/gammu/index.rst b/docs/manual/gammu/index.rst index 4ab1cfe..eba4cba 100644 --- a/docs/manual/gammu/index.rst +++ b/docs/manual/gammu/index.rst @@ -20,7 +20,7 @@ Description +++++++++++ This program is a tool for mobile phones. Many vendors and phones -are supported, for actual listing see `Gammu Phones Database <http://wammu.eu/phones/>`_. +are supported, for actual listing see `Gammu Phones Database <https://wammu.eu/phones/>`_. Options @@ -1466,12 +1466,6 @@ Phone information commands .. option:: getdisplaystatus -.. option:: getlocation - - Gets network information from phone (same as networkinfo) - and prints location (latitude and longitude) based on information from - `OpenCellID <http://opencellid.org>`_. - .. option:: getsecuritystatus Show, if phone wait for security code (like PIN, PUK, etc.) or not @@ -1723,11 +1717,11 @@ values increased by 100: 114 No response in specified timeout. Probably phone not connected. 115 - Frame not requested right now. See <http://wammu.eu/support/bugs/> for information how to report it. + Frame not requested right now. See <https://wammu.eu/support/bugs/> for information how to report it. 116 - Unknown response from phone. See <http://wammu.eu/support/bugs/> for information how to report it. + Unknown response from phone. See <https://wammu.eu/support/bugs/> for information how to report it. 117 - Unknown frame. See <http://wammu.eu/support/bugs/> for information how to report it. + Unknown frame. See <https://wammu.eu/support/bugs/> for information how to report it. 118 Unknown connection type string. Check config file. 119 @@ -1985,6 +1979,6 @@ With this settings, Gammu generates /tmp/gammu.log on each connection to phone and stores dump of communication there. You can also find some hints for improving support for your phone in this log. -See <http://wammu.eu/support/bugs/> for more information on reporting bugs. +See <https://wammu.eu/support/bugs/> for more information on reporting bugs. Please report bugs to `Gammu bug tracker <https://github.com/gammu/gammu/issues>`_. diff --git a/docs/manual/project/contributing.rst b/docs/manual/project/contributing.rst index ede7cc0..364e174 100644 --- a/docs/manual/project/contributing.rst +++ b/docs/manual/project/contributing.rst @@ -5,7 +5,7 @@ We welcome contribution in any area, if you don't have developer skills, you can always contribute to :doc:`localization` or just `donate us money`_. In case you are interested in fixing some code, please read :doc:`../internal/index` to understand structure of Gammu code. We also maintain list of -`wanted skills <http://wammu.eu/contribute/wanted/>`_ where you can find in +`wanted skills <https://wammu.eu/contribute/wanted/>`_ where you can find in which areas we currently mostly lack manpower. Sending patches @@ -49,4 +49,4 @@ To manually create patch you can use following steps: 5. Call ``diff -rup -X .git gammu work > patchfile``. 6. Send ``patchfile`` to us (you can use bug tracker or mailing list). -.. _donate us money: http://wammu.eu/donate/ +.. _donate us money: https://wammu.eu/donate/ diff --git a/docs/manual/project/install.rst b/docs/manual/project/install.rst index e70ac07..539137e 100644 --- a/docs/manual/project/install.rst +++ b/docs/manual/project/install.rst @@ -9,7 +9,7 @@ Prebuilt Binaries for Linux Many distributions come with prebuilt Gammu binaries, if you can use them, it is definitely the easiest thing. There are also binary packages of latest release built for many distributions available on Gammu home -page <http://wammu.eu/gammu/>. +page <https://wammu.eu/gammu/>. You can usually also find Gammu in your distribution, so unless you need a newer version, just install package from your distribution. @@ -38,7 +38,7 @@ Gammu packages are included in Gentoo. Additionally source tarball contains Prebuilt Binaries for Windows ----------------------------- -You can download Windows binaries from <http://wammu.eu/gammu/>. For +You can download Windows binaries from <https://wammu.eu/gammu/>. For Windows 95, 98 and NT 4.0 you will also need ShFolder DLL, which can be downloaded from Microsoft: @@ -50,7 +50,7 @@ http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=6AE02498 Dependencies ------------ -You need CMake from <http://www.cmake.org/> for compiling Gammu. +You need CMake from <https://cmake.org/> for compiling Gammu. Additionally pkg-config <http://pkg-config.freedesktop.org/> is used for detecting available libraries. @@ -80,8 +80,7 @@ Required for fbususb/dku2 connection support on Linux. libCURL +++++++ -Required for new versions notification (see :option:`gammu checkversion`) and -OpenCellID access (see :option:`gammu getlocation`). +Required for new versions notification (see :option:`gammu checkversion`). .. seealso:: http://curl.haxx.se/libcurl/ diff --git a/docs/manual/protocol/s60.rst b/docs/manual/protocol/s60.rst index f1f8d92..9eeecf9 100644 --- a/docs/manual/protocol/s60.rst +++ b/docs/manual/protocol/s60.rst @@ -78,7 +78,7 @@ not distributed with Gammu due to licensing reasons. On some phones, the Python for S60 2.0 will not start, in this case you need to install some additional support libraries coming with Python for S60 2.0 - :file:`pips.sis`, :file:`ssl.sis` and :file:`stdioserver.sis`. You can get - all of them at http://wammu.eu/s60/ as well. + all of them at https://wammu.eu/s60/ as well. Installing Python for S60 and Series60 remote applet can be done in several ways: @@ -112,10 +112,10 @@ Downloading from phone ++++++++++++++++++++++ Downloading files from the phone and installing them directly. You can -download all required files from http://wammu.eu/s60/. +download all required files from https://wammu.eu/s60/. .. figure:: s60-download-qr.png - :target: http://wammu.eu/s60/ + :target: https://wammu.eu/s60/ :alt: QR code for download of applet. QR code for download of applet. diff --git a/docs/manual/python/exceptions.rst b/docs/manual/python/exceptions.rst index f65b26f..771aaf0 100644 --- a/docs/manual/python/exceptions.rst +++ b/docs/manual/python/exceptions.rst @@ -162,7 +162,7 @@ .. exception:: gammu.ERR_FRAMENOTREQUESTED Exception corresponding to gammu error ERR_FRAMENOTREQUESTED. - Verbose error description: Frame not requested right now. See <http://wammu.eu/support/bugs/> for information how to report it. + Verbose error description: Frame not requested right now. See <https://wammu.eu/support/bugs/> for information how to report it. .. exception:: gammu.ERR_FULL @@ -337,7 +337,7 @@ .. exception:: gammu.ERR_UNKNOWNFRAME Exception corresponding to gammu error ERR_UNKNOWNFRAME. - Verbose error description: Unknown frame. See <http://wammu.eu/support/bugs/> for information how to report it. + Verbose error description: Unknown frame. See <https://wammu.eu/support/bugs/> for information how to report it. .. exception:: gammu.ERR_UNKNOWNMODELSTRING @@ -347,7 +347,7 @@ .. exception:: gammu.ERR_UNKNOWNRESPONSE Exception corresponding to gammu error ERR_UNKNOWNRESPONSE. - Verbose error description: Unknown response from phone. See <http://wammu.eu/support/bugs/> for information how to report it. + Verbose error description: Unknown response from phone. See <https://wammu.eu/support/bugs/> for information how to report it. .. exception:: gammu.ERR_USING_DEFAULTS diff --git a/docs/manual/quick/index.rst b/docs/manual/quick/index.rst index bfdb9d1..b83c13e 100644 --- a/docs/manual/quick/index.rst +++ b/docs/manual/quick/index.rst @@ -11,7 +11,7 @@ Gammu family consists of several programs and libraries: :ref:`gammu` Command line utility to talk to the phone. It performs one time operations only. -`Wammu <http://wammu.eu/wammu>`_ +`Wammu <https://wammu.eu/wammu>`_ Graphical interface for Gammu, providing basic functions. :ref:`gammu-smsd` Daemon to receive and send messages using your phone. @@ -30,7 +30,7 @@ Installing Gammu On most platforms you can install Gammu from binaries - most Linux distributions ship Gammu and for Windows you can download binaries from -`Gammu website <http://wammu.eu/download/>`_. You can find more detailed +`Gammu website <https://wammu.eu/download/>`_. You can find more detailed instructions (including instructions for compiling from source) in :ref:`installing`. diff --git a/docs/manual/smsd/config.rst b/docs/manual/smsd/config.rst index f3caab9..b1a8349 100644 --- a/docs/manual/smsd/config.rst +++ b/docs/manual/smsd/config.rst @@ -248,6 +248,17 @@ General parameters of SMS daemon Default is 1 (enabled). +.. config:option:: CheckNetwork + + .. versionadded:: 1.37.90 + + Whether to check network status periodically. + + If phone is reported to be not on the network, SMSD + tries to power it on. + + Default is 1 (enabled). + .. config:option:: ResetFrequency The number of seconds between performing a preventive soft reset in order to @@ -302,6 +313,9 @@ General parameters of SMS daemon When you set PhoneID, all messages (including injected ones) will be marked by this string (stored as SenderID in the database) and it allows more SMS daemons to share a single database. + + SMSD daemon will in such case send :ref:`outbox` messages only with + matching or empty SenderID. This option has actually no effect with :ref:`gammu-smsd-files`. @@ -508,6 +522,7 @@ database: * ``mssql`` - Microsoft SQL Server * ``sybase`` - Sybase * ``access`` - Microsoft Access + * ``oracle`` - Oracle * ``odbc`` - Generic ODBC .. versionadded:: 1.28.93 diff --git a/docs/manual/smsd/dbi.rst b/docs/manual/smsd/dbi.rst index 812c709..d9f30ad 100644 --- a/docs/manual/smsd/dbi.rst +++ b/docs/manual/smsd/dbi.rst @@ -52,8 +52,10 @@ drivers for example include: .. _libdbi: http://libdbi.sourceforge.net/ .. _libdbi-drivers: http://libdbi-drivers.sourceforge.net/ -Creating tables ---------------- +.. _sqlite-create: + +Creating tables for SQLite +-------------------------- SQL script for creating tables in SQLite database: diff --git a/docs/manual/smsd/mysql.rst b/docs/manual/smsd/mysql.rst index c446ba4..d57f6c0 100644 --- a/docs/manual/smsd/mysql.rst +++ b/docs/manual/smsd/mysql.rst @@ -54,8 +54,8 @@ privileges should be enough: .. _mysql-create: -Creating tables ---------------- +Creating tables for MySQL +------------------------- SQL script for creating tables in MySQL database: diff --git a/docs/manual/smsd/odbc.rst b/docs/manual/smsd/odbc.rst index 86091fb..4b3475d 100644 --- a/docs/manual/smsd/odbc.rst +++ b/docs/manual/smsd/odbc.rst @@ -49,6 +49,17 @@ http://support.microsoft.com/kb/305599 For unixODBC this is documented in the user manual: http://www.unixodbc.org/doc/UserManual/ +Creating tables +--------------- + +Prior to starting SMSD you have to create tables it will use. Gammu ships SQL +scripts for several databases to do that: + +* :ref:`mysql-create` +* :ref:`pgsql-create` +* :ref:`sqlite-create` + + Example ------- diff --git a/docs/manual/smsd/pgsql.rst b/docs/manual/smsd/pgsql.rst index f2ed617..021456f 100644 --- a/docs/manual/smsd/pgsql.rst +++ b/docs/manual/smsd/pgsql.rst @@ -33,8 +33,10 @@ The configuration file then can look like: .. seealso:: :ref:`gammu-smsdrc` -Creating tables ---------------- +.. _pgsql-create: + +Creating tables for PostgreSQL +------------------------------ SQL script for creating tables in PostgreSQL database: diff --git a/docs/manual/smsd/sql.rst b/docs/manual/smsd/sql.rst index 8c932a9..190abcf 100644 --- a/docs/manual/smsd/sql.rst +++ b/docs/manual/smsd/sql.rst @@ -47,10 +47,6 @@ Tables You can customize name of all tables in the :config:section:`[tables]`. The SQL queries will reflect this, so it's enough to change table name in this section. -.. config:option:: daemons - - Name of the :ref:`daemons` table. - .. config:option:: gammu Name of the :ref:`gammu-table` table. @@ -102,6 +98,8 @@ Phone Specific Parameters ``%I`` IMEI of phone +``%S`` + SIM IMSI ``%P`` PHONE ID (hostname) ``%N`` diff --git a/docs/manual/smsd/tables.rst b/docs/manual/smsd/tables.rst index 37191b6..de02aa5 100644 --- a/docs/manual/smsd/tables.rst +++ b/docs/manual/smsd/tables.rst @@ -26,13 +26,6 @@ of the same message from :ref:`outbox_multipart`. Description of tables --------------------- -.. _daemons: - -daemons -+++++++ - -Information about running daemons. - .. _gammu-table: gammu @@ -153,7 +146,7 @@ Fields description: ``SenderID`` (text) which SMSD instance should send this one sequence, see :config:option:`PhoneID` and :ref:`smsd-multi`. If blank, first SMSD who - sees this message will process it. + sees this message first will process it. ``SendingTimeOut`` (timestamp) used by SMSD instance for own targets @@ -167,6 +160,9 @@ Fields description: ``Retries`` (integer) number of attempted retries when sending this message +``Priority`` (integer) + priority of message, messages with higher priority are processed first + .. _outbox_multipart: outbox_multipart @@ -226,6 +222,9 @@ Fields description: ``IMEI`` (text) IMEI of phone +``IMSI`` (text) + SIM IMSI + ``Client`` (text) client name, usually string Gammu with version @@ -330,16 +329,6 @@ Fields description: copied from CreatorID from outbox table -pbk -+++ - -Not used by SMSD currently, included only for application usage. - -pbk_groups -++++++++++ - -Not used by SMSD currently, included only for application usage. - .. _smsd-tables-history: History of database structure @@ -354,9 +343,18 @@ History of database structure History of schema versions: +16 + + * Removed unused ``daemons``, ``pbk`` and ``pbk_groups`` tables. + * Added primary key to the ``gammu`` table. + * Added ``Priority`` field to the :ref:`outbox`. + * Added ``IMSI`` field to the :ref:`phones`. + + .. versionchanged:: 1.37.90 + 15 - Added ``Retries`` field. + Added ``Retries`` field to the :ref:`outbox`. .. versionchanged:: 1.36.7 diff --git a/docs/sql/mysql.sql b/docs/sql/mysql.sql index c5d4548..1abecc0 100644 --- a/docs/sql/mysql.sql +++ b/docs/sql/mysql.sql @@ -7,34 +7,18 @@ -- -------------------------------------------------------- -- --- Table structure for table `daemons` --- - -CREATE TABLE `daemons` ( - `Start` text NOT NULL, - `Info` text NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; - --- --- Dumping data for table `daemons` --- - - --- -------------------------------------------------------- - --- -- Table structure for table `gammu` -- CREATE TABLE `gammu` ( - `Version` integer NOT NULL default '0' + `Version` integer NOT NULL default '0' PRIMARY KEY ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; -- -- Dumping data for table `gammu` -- -INSERT INTO `gammu` (`Version`) VALUES (15); +INSERT INTO `gammu` (`Version`) VALUES (16); -- -------------------------------------------------------- @@ -51,7 +35,7 @@ CREATE TABLE `inbox` ( `UDH` text NOT NULL, `SMSCNumber` varchar(20) NOT NULL default '', `Class` integer NOT NULL default '-1', - `TextDecoded` text NOT NULL default '', + `TextDecoded` text NOT NULL, `ID` integer unsigned NOT NULL auto_increment, `RecipientID` text NOT NULL, `Processed` enum('false','true') NOT NULL default 'false', @@ -80,7 +64,7 @@ CREATE TABLE `outbox` ( `Coding` enum('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression') NOT NULL default 'Default_No_Compression', `UDH` text, `Class` integer default '-1', - `TextDecoded` text NOT NULL default '', + `TextDecoded` text NOT NULL, `ID` integer unsigned NOT NULL auto_increment, `MultiPart` enum('false','true') default 'false', `RelativeValidity` integer default '-1', @@ -89,6 +73,7 @@ CREATE TABLE `outbox` ( `DeliveryReport` enum('default','yes','no') default 'default', `CreatorID` text NOT NULL, `Retries` int(3) default 0, + `Priority` integer default 0, PRIMARY KEY `ID` (`ID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; @@ -111,7 +96,7 @@ CREATE TABLE `outbox_multipart` ( `Coding` enum('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression') NOT NULL default 'Default_No_Compression', `UDH` text, `Class` integer default '-1', - `TextDecoded` text default NULL, + `TextDecoded` text, `ID` integer unsigned NOT NULL default '0', `SequencePosition` integer NOT NULL default '1', PRIMARY KEY (`ID`, `SequencePosition`) @@ -121,43 +106,6 @@ CREATE TABLE `outbox_multipart` ( -- Dumping data for table `outbox_multipart` -- - --- -------------------------------------------------------- - --- --- Table structure for table `pbk` --- - -CREATE TABLE `pbk` ( - `ID` integer NOT NULL auto_increment, - `GroupID` integer NOT NULL default '-1', - `Name` text NOT NULL, - `Number` text NOT NULL, - PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; - --- --- Dumping data for table `pbk` --- - - --- -------------------------------------------------------- - --- --- Table structure for table `pbk_groups` --- - -CREATE TABLE `pbk_groups` ( - `Name` text NOT NULL, - `ID` integer NOT NULL auto_increment, - PRIMARY KEY `ID` (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ; - --- --- Dumping data for table `pbk_groups` --- - - -- -------------------------------------------------------- -- @@ -172,6 +120,7 @@ CREATE TABLE `phones` ( `Send` enum('yes','no') NOT NULL default 'no', `Receive` enum('yes','no') NOT NULL default 'no', `IMEI` varchar(35) NOT NULL, + `IMSI` varchar(35) NOT NULL, `NetCode` varchar(10) default 'ERROR', `NetName` varchar(35) default 'ERROR', `Client` text NOT NULL, @@ -203,7 +152,7 @@ CREATE TABLE `sentitems` ( `UDH` text NOT NULL, `SMSCNumber` varchar(20) NOT NULL default '', `Class` integer NOT NULL default '-1', - `TextDecoded` text NOT NULL default '', + `TextDecoded` text NOT NULL, `ID` integer unsigned NOT NULL default '0', `SenderID` varchar(255) NOT NULL, `SequencePosition` integer NOT NULL default '1', diff --git a/docs/sql/pgsql.sql b/docs/sql/pgsql.sql index dccfd74..7288d78 100644 --- a/docs/sql/pgsql.sql +++ b/docs/sql/pgsql.sql @@ -31,8 +31,6 @@ $update_timestamp$ LANGUAGE plpgsql; --CREATE SEQUENCE outbox_multipart_ID_seq; ---CREATE SEQUENCE pbk_groups_ID_seq; - --CREATE SEQUENCE sentitems_ID_seq; -- -------------------------------------------------------- @@ -47,40 +45,23 @@ $update_timestamp$ LANGUAGE plpgsql; --CREATE UNIQUE INDEX outbox_multipart_pkey ON outbox_multipart USING btree ("ID"); ---CREATE UNIQUE INDEX pbk_groups_pkey ON pbk_groups USING btree ("ID"); - --CREATE UNIQUE INDEX sentitems_pkey ON sentitems USING btree ("ID"); -- -------------------------------------------------------- --- --- Table structure for table "daemons" --- - -CREATE TABLE daemons ( - "Start" text NOT NULL, - "Info" text NOT NULL -); - --- --- Dumping data for table "daemons" --- - - --- -------------------------------------------------------- -- -- Table structure for table "gammu" -- CREATE TABLE gammu ( - "Version" smallint NOT NULL DEFAULT '0' + "Version" smallint NOT NULL DEFAULT '0' PRIMARY KEY ); -- -- Dumping data for table "gammu" -- -INSERT INTO gammu ("Version") VALUES (15); +INSERT INTO gammu ("Version") VALUES (16); -- -------------------------------------------------------- @@ -142,7 +123,8 @@ CREATE TABLE outbox ( "SendingTimeOut" timestamp(0) WITHOUT time zone NOT NULL DEFAULT LOCALTIMESTAMP(0), "DeliveryReport" varchar(10) DEFAULT 'default', "CreatorID" text NOT NULL, - "Retries" integer DEFAULT "0", + "Retries" integer DEFAULT '0', + "Priority" integer DEFAULT '0', CHECK ("Coding" IN ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')), CHECK ("DeliveryReport" IN ('default','yes','no')) @@ -190,40 +172,6 @@ CREATE TABLE outbox_multipart ( -- -------------------------------------------------------- -- --- Table structure for table "pbk" --- - -CREATE TABLE pbk ( - "ID" serial PRIMARY KEY, - "GroupID" integer NOT NULL DEFAULT '-1', - "Name" text NOT NULL, - "Number" text NOT NULL -); - --- --- Dumping data for table "pbk" --- - - --- -------------------------------------------------------- - --- --- Table structure for table "pbk_groups" --- - -CREATE TABLE pbk_groups ( - "Name" text NOT NULL, - "ID" serial PRIMARY KEY -); - --- --- Dumping data for table "pbk_groups" --- - - --- -------------------------------------------------------- - --- -- Table structure for table "phones" -- @@ -235,6 +183,7 @@ CREATE TABLE phones ( "Send" boolean NOT NULL DEFAULT 'no', "Receive" boolean NOT NULL DEFAULT 'no', "IMEI" varchar(35) PRIMARY KEY NOT NULL, + "IMSI" varchar(35) NOT NULL, "NetCode" varchar(10) DEFAULT 'ERROR', "NetName" varchar(35) DEFAULT 'ERROR', "Client" text NOT NULL, diff --git a/docs/sql/sqlite.sql b/docs/sql/sqlite.sql index ab21635..f7c5915 100644 --- a/docs/sql/sqlite.sql +++ b/docs/sql/sqlite.sql @@ -1,13 +1,8 @@ -CREATE TABLE daemons ( - Start TEXT NOT NULL, - Info TEXT NOT NULL -); - CREATE TABLE gammu ( - Version INTEGER NOT NULL DEFAULT '0' + Version INTEGER NOT NULL DEFAULT '0' PRIMARY KEY ); -INSERT INTO gammu (Version) VALUES (15); +INSERT INTO gammu (Version) VALUES (16); CREATE TABLE inbox ( UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')), @@ -51,6 +46,7 @@ CREATE TABLE outbox ( DeliveryReport TEXT DEFAULT 'default', CreatorID TEXT NOT NULL, Retries INTEGER DEFAULT '0', + Priority INTEGER DEFAULT '0', CHECK (Coding IN ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')), CHECK (DeliveryReport IN ('default','yes','no')) @@ -77,18 +73,6 @@ CREATE TABLE outbox_multipart ( PRIMARY KEY (ID, SequencePosition) ); -CREATE TABLE pbk ( - ID INTEGER PRIMARY KEY AUTOINCREMENT, - GroupID INTEGER NOT NULL DEFAULT '-1', - Name TEXT NOT NULL, - Number TEXT NOT NULL -); - -CREATE TABLE pbk_groups ( - Name TEXT NOT NULL, - ID INTEGER PRIMARY KEY AUTOINCREMENT -); - CREATE TABLE phones ( ID TEXT NOT NULL, UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')), @@ -97,6 +81,7 @@ CREATE TABLE phones ( Send TEXT NOT NULL DEFAULT 'no', Receive TEXT NOT NULL DEFAULT 'no', IMEI TEXT PRIMARY KEY NOT NULL, + IMSI TEXT NOT NULL, NetCode TEXT DEFAULT 'ERROR', NetName TEXT DEFAULT 'ERROR', Client TEXT NOT NULL, |