2018-11-29 Fred Gleason <fredg@paravelsystems.com>

* Added a 'SERVICES.INCLUDE_IMPORT_MARKERS' field to the database.
	* Added a 'LOGS.INCLUDE_IMPORT_MARKERS' field to the database.
	* Incremented the database version to 301.
	* Added an 'Inlcude Import Markers in Finished Logs' checkbox to
	the 'Edit Service' dialog in rdadmin(1).

docs/opsguide/rdadmin.xml

@@ -361,6 +361,18 @@
 	as-played data to be purged from the database the specified number
 	of days after being generated.
       </para>
+      <para>
+	The <computeroutput>Include Import Markers in Finished Logs</computeroutput>
+	box, if ticked, will cause markers to indicate the base location
+	of imported Music and Traffic events to be retained even after
+	such events have been imported. Some users find these markers
+	distracting, so their retention can be disabled by clearing this
+	check box.
+      </para>
+      <warning>
+	If import markers are not included in finished logs, then it will
+	not be possible re-import music or traffic data into those logs.
+      </warning>
       <sect3 xml:id="sect.rdadmin.manage_services.general.configure_autofill_carts">
 	<title>Configuring Autofill Carts</title>
 	<para>

docs/tables/logs.txt

@@ -1,34 +1,34 @@
                LOGS Table Layout for Rivendell
 
 The LOGS table holds data concerning each log object that exists
-on the system.  Following is the layout of a record in the LOGS
-table:
+on the system.
 
 FIELD NAME           TYPE             REMARKS
 -------------------------------------------------------------------
-NAME                 varchar(64)
-LOG_EXISTS           enum('N','Y')
-TYPE                 int(11)          0=Log, 1=Event, 2=Clock, 3=Grid
-SERVICE              varchar(10)      From SERVICES.NAME
-DESCRIPTION          varchar(64)
-ORIGIN_USER          varchar(191)     From USERS.LOGIN_NAME
-ORIGIN_DATETIME      datetime    
-LINK_DATETIME        datetime
-MODIFIED_DATETIME    datetime
-AUTO_REFRESH         enum('N','Y')
-START_DATE	     date
-END_DATE	     date
-PURGE_DATE           date
-IMPORT_DATE          date
-SCHEDULED_TRACKS     int unsigned(10)
-COMPLETED_TRACKS     int unsigned(10)
-MUSIC_LINKS          int
-MUSIC_LINKED         enum('N','Y')
-TRAFFIC_LINKS        int
-TRAFFIC_LINKED       enum('N','Y')
-NEXT_ID              int(11)
-LOCK_USER_NAME       varchar(191)     From USER.LOGIN_NAME
-LOCK_STATION_NAME    varchar(64)      From STATIONS.NAME
-LOCK_IPV4_ADDRESS    varchar(16)
-LOCK_DATETIME        datetime
-LOCK_GUID            varchar(82)
+NAME                    varchar(64)
+LOG_EXISTS              enum('N','Y')
+TYPE                    int(11)          0=Log, 1=Event, 2=Clock, 3=Grid
+SERVICE                 varchar(10)      From SERVICES.NAME
+DESCRIPTION             varchar(64)
+ORIGIN_USER             varchar(191)     From USERS.LOGIN_NAME
+ORIGIN_DATETIME         datetime    
+LINK_DATETIME           datetime
+MODIFIED_DATETIME       datetime
+AUTO_REFRESH            enum('N','Y')
+START_DATE              date
+END_DATE  	        date
+PURGE_DATE              date
+IMPORT_DATE             date
+SCHEDULED_TRACKS        int unsigned(10)
+COMPLETED_TRACKS        int unsigned(10)
+INCLUDE_IMPORT_MARKERS  enum('N','Y')
+MUSIC_LINKS             int
+MUSIC_LINKED            enum('N','Y')
+TRAFFIC_LINKS           int
+TRAFFIC_LINKED          enum('N','Y')
+NEXT_ID                 int(11)
+LOCK_USER_NAME          varchar(191)     From USER.LOGIN_NAME
+LOCK_STATION_NAME       varchar(64)      From STATIONS.NAME
+LOCK_IPV4_ADDRESS       varchar(16)
+LOCK_DATETIME           datetime
+LOCK_GUID               varchar(82)

docs/tables/services.txt

@@ -18,6 +18,7 @@ AUTO_REFRESH            enum('N','Y')
 DEFAULT_LOG_SHELFLIFE   int(11)
 LOG_SHELFLIFE_ORIGIN    int(11)               0=Air Date, 1=Log Creation
 ELR_SHELFLIFE           int(11)
+INCLUDE_IMPORT_MARKERS  enum('N','Y')
 TFC_PATH                varchar(191)
 TFC_PREIMPORT_CMD       text
 TFC_WIN_PATH            varchar(191)