GEP 18: add date from cite in reference part of citation

svn: r22602
This commit is contained in:
Benny Malengier 2013-06-25 09:20:16 +00:00
parent 54ef9241a1
commit a7e5ecbadf
4 changed files with 131 additions and 72 deletions

View File

@ -75,8 +75,8 @@
;;;;;;;;"[COLLECTION]";;".";"P";;;;;; ;;;;;;;;"[COLLECTION]";;".";"P";;;;;;
;;;;;;;;"[REPOSITORY]";;",";"P";;;;;; ;;;;;;;;"[REPOSITORY]";;",";"P";;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;".";"P";"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;".";"P";"LOC";;;;;
5;"EE Archives & Artifacts";"Archived Material";"Manuscript Records";"Series, emphasis on";"F";"ESM97";;"[AUTHOR]";"Author (Grantor)";"to";;"GS";;;;; 5;"EE Archives & Artifacts";"Archived Material";"Manuscript Records";"Series, emphasis on";"F";"ESM97";;"[AUTHOR]";"Author (Grantor)";;;"GS";;;;;
;;;;;;;;"[RECIPIENT]";;",";;"GS";;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;"GS";;;;;
;;;;;;;;"[ID]";"Record ID";",";;;;;;; ;;;;;;;;"[ID]";"Record ID";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";";";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";";";;;;;;;
;;;;;;;;"[FILE NO.]";;",";;;;;;; ;;;;;;;;"[FILE NO.]";;",";;;;;;;
@ -86,8 +86,8 @@
;;;;;;;;"[COLLECTION]";;",";;;;;;; ;;;;;;;;"[COLLECTION]";;",";;;;;;;
;;;;;;;;"[REPOSITORY]";;",";;;;;;; ;;;;;;;;"[REPOSITORY]";;",";;;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;".";;"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;".";;"LOC";;;;;
5;"EE Archives & Artifacts";"Archived Material";"Manuscript Records";"Series, emphasis on";"S";"ESM97";;"[AUTHOR]";;"to";;"S";;;;; 5;"EE Archives & Artifacts";"Archived Material";"Manuscript Records";"Series, emphasis on";"S";"ESM97";;"[AUTHOR]";;;;"S";;;;;
;;;;;;;;"[RECIPIENT]";;",";;"S";;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;"S";;;;;
;;;;;;;;"[ID]";"Record ID";",";;;;;;; ;;;;;;;;"[ID]";"Record ID";",";;;;;;;
;;;;;;;;"[DATE]";;",";;"YEAR";;;;; ;;;;;;;;"[DATE]";;",";;"YEAR";;;;;
;;;;;;;;"[SERIES]";;",";;;;;;; ;;;;;;;;"[SERIES]";;",";;;;;;;
@ -134,8 +134,8 @@
8;"EE Archives & Artifacts";"Archived Material";"Research Report";;"L";"ESM100";;"[AUTHOR]";;",";"A";"SG";;;;; 8;"EE Archives & Artifacts";"Archived Material";"Research Report";;"L";"ESM100";;"[AUTHOR]";;",";"A";"SG";;;;;
;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;".";"A";;;;;; ;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;".";"A";;;;;;
;;;;;;;;"[TITLE]";"Report Title";".";"T";;"Quoted";;;; ;;;;;;;;"[TITLE]";"Report Title";".";"T";;"Quoted";;;;
;;;;;;;;"[TYPE]";"Item Type";"to";"P";;;;;; ;;;;;;;;"[TYPE]";"Item Type";;"P";;;;;;
;;;;;;;;"[RECIPIENT]";;".";"P";;;;;; ;;;;;;;" to";"[RECIPIENT]";;".";"P";;;;;;
;;;;;;;;"[DATE]";"Report Date";".";"P";;;;;; ;;;;;;;;"[DATE]";"Report Date";".";"P";;;;;;
;;;;;;;;"[COLLECTION]";;",";"P";;;;;; ;;;;;;;;"[COLLECTION]";;",";"P";;;;;;
;;;;;;;;"[REPOSITORY]";;",";"P";;;;;; ;;;;;;;;"[REPOSITORY]";;",";"P";;;;;;
@ -144,8 +144,8 @@
;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;",";;;;;;; ;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;",";;;;;;;
;;;;;;;;"[TITLE]";"Report Title";",";;;"Quoted";;;; ;;;;;;;;"[TITLE]";"Report Title";",";;;"Quoted";;;;
;;;;;;;"p.";"[PAGE]";"Page(s)";";";;;;;;; ;;;;;;;"p.";"[PAGE]";"Page(s)";";";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";"to";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";;;;;;;;
;;;;;;;;"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[DATE]";"Report Date";";";;;;;;; ;;;;;;;;"[DATE]";"Report Date";";";;;;;;;
;;;;;;;;"[COLLECTION]";;",";;;;;;; ;;;;;;;;"[COLLECTION]";;",";;;;;;;
;;;;;;;;"[REPOSITORY]";;",";;;;;;; ;;;;;;;;"[REPOSITORY]";;",";;;;;;;
@ -309,7 +309,7 @@
;;;;;;;;"[ID]";"Item ID";",";;;;;;; ;;;;;;;;"[ID]";"Item ID";",";;;;;;;
17;"EE Archives & Artifacts";"Private Holdings";"Historic letter";;"L";"ESM109";;"[AUTHOR]";"Writer";;"A";"SG";;;;; 17;"EE Archives & Artifacts";"Private Holdings";"Historic letter";;"L";"ESM109";;"[AUTHOR]";"Writer";;"A";"SG";;;;;
;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";"P";"PRIVLOC";;"Privacy";;; ;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";"P";"PRIVLOC";;"Privacy";;;
;;;;;;;"to";"[RECIPIENT]";;".";"T";;;;;; ;;;;;;;" to";"[RECIPIENT]";;".";"T";;;;;;
;;;;;;;;"[TYPE]";"Item Type";".";"T";;;;;; ;;;;;;;;"[TYPE]";"Item Type";".";"T";;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";"P";;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";"P";;;;;;
;;;;;;;;"[REPOSITORY]";"Current or Last Known Owner";",";"P";;;;;; ;;;;;;;;"[REPOSITORY]";"Current or Last Known Owner";",";"P";;;;;;
@ -317,15 +317,15 @@
;;;;;;;;"[YEAR]";"Year Owned";".";"P";;;;;; ;;;;;;;;"[YEAR]";"Year Owned";".";"P";;;;;;
17;"EE Archives & Artifacts";"Private Holdings";"Historic letter";;"F";"ESM109";;"[AUTHOR]";"Writer";;;"GS";;;;; 17;"EE Archives & Artifacts";"Private Holdings";"Historic letter";;"F";"ESM109";;"[AUTHOR]";"Writer";;;"GS";;;;;
;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";;"PRIVLOC";;"Privacy";;; ;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";;"PRIVLOC";;"Privacy";;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";",";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";";";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";";";;;;;;;
;;;;;;;;"[REPOSITORY]";"Current or Last Known Owner";",";;;;;;; ;;;;;;;;"[REPOSITORY]";"Current or Last Known Owner";",";;;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;",";;"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;",";;"LOC";;;;;
;;;;;;;;"[YEAR]";"Year Owned";".";;;;;;; ;;;;;;;;"[YEAR]";"Year Owned";".";;;;;;;
;;;;;;;;"[RESEARCH COMMENT]";"Descriptive Detail/Evaluation";".";;;;;;; ;;;;;;;;"[RESEARCH COMMENT]";"Descriptive Detail/Evaluation";".";;;;;;;
17;"EE Archives & Artifacts";"Private Holdings";"Historic letter";;"S";"ESM109";;"[AUTHOR]";"Writer";"to";;"GS";;;;; 17;"EE Archives & Artifacts";"Private Holdings";"Historic letter";;"S";"ESM109";;"[AUTHOR]";"Writer";;;"GS";;;;;
;;;;;;;;"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;;
18;"EE Archives & Artifacts";"Private Holdings";"Interview tape & transcript";;"L";"ESM110";;"[AUTHOR]";"Person Interviewed";".";"A";"SG";;;;; 18;"EE Archives & Artifacts";"Private Holdings";"Interview tape & transcript";;"L";"ESM110";;"[AUTHOR]";"Person Interviewed";".";"A";"SG";;;;;
;;;;;;;;"[LOCATION]";;".";"T";;;;;; ;;;;;;;;"[LOCATION]";;".";"T";;;;;;
@ -354,7 +354,7 @@
;;;;;;;;"[REPOSITORY ADDRESS]";;".";"P";"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;".";"P";"LOC";;;;;
;;;;;;;;"[YEAR]";"Year Owned";".";"P";;;;;; ;;;;;;;;"[YEAR]";"Year Owned";".";"P";;;;;;
19;"EE Archives & Artifacts";"Private Holdings";"Legal document, unrecorded";;"F";"ESM111";;"[AUTHOR]";"Author (Grantor)";",";;;;;;; 19;"EE Archives & Artifacts";"Private Holdings";"Legal document, unrecorded";;"F";"ESM111";;"[AUTHOR]";"Author (Grantor)";",";;;;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[ID]";"Record ID";",";;;;;;; ;;;;;;;;"[ID]";"Record ID";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";";";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";";";;;;;;;
;;;;;;;;"[FORMAT]";"Item Format";",";;;;;;; ;;;;;;;;"[FORMAT]";"Item Format";",";;;;;;;
@ -364,7 +364,7 @@
;;;;;;;;"[YEAR]";"Year Owned";".";;;;;;; ;;;;;;;;"[YEAR]";"Year Owned";".";;;;;;;
;;;;;;;;"[RESEARCH COMMENT]";"Descriptive Detail/Evaluation";".";;;;;;; ;;;;;;;;"[RESEARCH COMMENT]";"Descriptive Detail/Evaluation";".";;;;;;;
19;"EE Archives & Artifacts";"Private Holdings";"Legal document, unrecorded";;"S";"ESM111";;"[AUTHOR]";"Author (Grantor)";;;;;;;; 19;"EE Archives & Artifacts";"Private Holdings";"Legal document, unrecorded";;"S";"ESM111";;"[AUTHOR]";"Author (Grantor)";;;;;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[ID]";"Record ID";",";;;;;;; ;;;;;;;;"[ID]";"Record ID";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";;"YEAR";;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";;"YEAR";;;;;
20;"EE Archives & Artifacts";"Private Holdings";"Personal correspondence";;"L";"ESM112";;"[COLLECTION]";;".";"T";;;;;; 20;"EE Archives & Artifacts";"Private Holdings";"Personal correspondence";;"L";"ESM112";;"[COLLECTION]";;".";"T";;;;;;
@ -373,7 +373,7 @@
20;"EE Archives & Artifacts";"Private Holdings";"Personal correspondence";;"F";"ESM112";;"[AUTHOR]";"Writer";",";;"GS";;;;; 20;"EE Archives & Artifacts";"Private Holdings";"Personal correspondence";;"F";"ESM112";;"[AUTHOR]";"Writer";",";;"GS";;;;;
;;;;;;;;"[AFFILIATION]";"Writer's Affiliation";",";;;;;;; ;;;;;;;;"[AFFILIATION]";"Writer's Affiliation";",";;;;;;;
;;;;;;;;"[ADDRESS]";"Writer's Address";",";;"PRIVLOC";;"Privacy";;; ;;;;;;;;"[ADDRESS]";"Writer's Address";",";;"PRIVLOC";;"Privacy";;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";",";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;;
;;;;;;;;"[SUBJECT]";;";";;;;;;; ;;;;;;;;"[SUBJECT]";;";";;;;;;;
@ -383,14 +383,14 @@
;;;;;;;;"[REPOSITORY]";"Owner";",";;;;;;; ;;;;;;;;"[REPOSITORY]";"Owner";",";;;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;".";;"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;".";;"LOC";;;;;
20;"EE Archives & Artifacts";"Private Holdings";"Personal correspondence";;"S";"ESM112";;"[AUTHOR]";"Writer";;;"S";;;;; 20;"EE Archives & Artifacts";"Private Holdings";"Personal correspondence";;"S";"ESM112";;"[AUTHOR]";"Writer";;;"S";;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;;
21;"EE Archives & Artifacts";"Private Holdings";"Personal e-mail";;"L";"ESM113";;"[COLLECTION]";;".";"T";;;;;; 21;"EE Archives & Artifacts";"Private Holdings";"Personal e-mail";;"L";"ESM113";;"[COLLECTION]";;".";"T";;;;;;
;;;;;;;;"[REPOSITORY]";"Owner";",";"P";;;;;; ;;;;;;;;"[REPOSITORY]";"Owner";",";"P";;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;".";"P";"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;".";"P";"LOC";;;;;
21;"EE Archives & Artifacts";"Private Holdings";"Personal e-mail";;"F";"ESM113";;"[AUTHOR]";"Writer";",";;"GS";;;;; 21;"EE Archives & Artifacts";"Private Holdings";"Personal e-mail";;"F";"ESM113";;"[AUTHOR]";"Writer";",";;"GS";;;;;
;;;;;;;;"[ADDRESS]";"Writer's Address";",";;"PRIVLOC";;"Privacy";;; ;;;;;;;;"[ADDRESS]";"Writer's Address";",";;"PRIVLOC";;"Privacy";;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";",";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;;
;;;;;;;;"[SUBJECT]";;",";;;;;;; ;;;;;;;;"[SUBJECT]";;",";;;;;;;
@ -400,14 +400,14 @@
;;;;;;;;"[REPOSITORY]";"Owner";",";;;;;;; ;;;;;;;;"[REPOSITORY]";"Owner";",";;;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;".";;"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;".";;"LOC";;;;;
21;"EE Archives & Artifacts";"Private Holdings";"Personal e-mail";;"S";"ESM113";;"[AUTHOR]";"Writer";;;"S";;;;; 21;"EE Archives & Artifacts";"Private Holdings";"Personal e-mail";;"S";"ESM113";;"[AUTHOR]";"Writer";;;"S";;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";",";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;;
22;"EE Archives & Artifacts";"Private Holdings";"Research Report";;"L";"ESM114";;"[AUTHOR]";;",";"A";"SG";;;;; 22;"EE Archives & Artifacts";"Private Holdings";"Research Report";;"L";"ESM114";;"[AUTHOR]";;",";"A";"SG";;;;;
;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;".";"A";;;;;; ;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;".";"A";;;;;;
;;;;;;;;"[TITLE]";"Report Title";".";"T";;"Quoted";;;; ;;;;;;;;"[TITLE]";"Report Title";".";"T";;"Quoted";;;;
;;;;;;;;"[TYPE]";"Item Type";"to";"T";;;;;; ;;;;;;;;"[TYPE]";"Item Type";;"T";;;;;;
;;;;;;;;"[RECIPIENT]";;;"T";;;;;; ;;;;;;;" to";"[RECIPIENT]";;;"T";;;;;;
;;;;;;;;"[ADDRESS]";"Recipient Address";",";;;;"Privacy";;; ;;;;;;;;"[ADDRESS]";"Recipient Address";",";;;;"Privacy";;;
;;;;;;;;"[LOCATION]";"Recipient Location";",";"P";;;;;; ;;;;;;;;"[LOCATION]";"Recipient Location";",";"P";;;;;;
;;;;;;;;"[REPORT DATE]";;".";"P";;;;;; ;;;;;;;;"[REPORT DATE]";;".";"P";;;;;;
@ -418,8 +418,8 @@
;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;",";;;;;;; ;;;;;;;;"[PROFESSIONAL CREDENTIALS]";;",";;;;;;;
;;;;;;;;"[TITLE]";"Report Title";",";;;"Quoted";;;; ;;;;;;;;"[TITLE]";"Report Title";",";;;"Quoted";;;;
;;;;;;;;"[PAGE]";"Page(s)";";";;;;;;; ;;;;;;;;"[PAGE]";"Page(s)";";";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";"to";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";;;;;;;;
;;;;;;;;"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[ADDRESS]";"Recipient Address";;;;;"Privacy";;; ;;;;;;;;"[ADDRESS]";"Recipient Address";;;;;"Privacy";;;
;;;;;;;;"[LOCATION]";"Recipient Location";",";;;;;;; ;;;;;;;;"[LOCATION]";"Recipient Location";",";;;;;;;
;;;;;;;;"[REPORT DATE]";;";";;;;;;; ;;;;;;;;"[REPORT DATE]";;";";;;;;;;
@ -486,7 +486,7 @@
;;;;;;;;"[COLLECTION]";;".";;;;;;; ;;;;;;;;"[COLLECTION]";;".";;;;;;;
26;"EE Business & institutional Records";"Corporate Records";"Extract supplied by staff";;"L";"ESM163";;"[AUTHOR]";"Writer";;"A";;;;;; 26;"EE Business & institutional Records";"Corporate Records";"Extract supplied by staff";;"L";"ESM163";;"[AUTHOR]";"Writer";;"A";;;;;;
;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";"P";"PRIVLOC";;"Privacy";;; ;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";"P";"PRIVLOC";;"Privacy";;;
;;;;;;;"to";"[RECIPIENT]";;".";"T";;;;;; ;;;;;;;" to";"[RECIPIENT]";;".";"T";;;;;;
;;;;;;;;"[TYPE]";"Item Type";".";"T";;;;;; ;;;;;;;;"[TYPE]";"Item Type";".";"T";;;;;;
;;;;;;;;"[DATE RANGE]";"Record Date Range";".";"P";;;;;; ;;;;;;;;"[DATE RANGE]";"Record Date Range";".";"P";;;;;;
;;;;;;;;"[REPOSITORY]";"Owner";",";"P";;;;;; ;;;;;;;;"[REPOSITORY]";"Owner";",";"P";;;;;;
@ -494,7 +494,7 @@
;;;;;;;;"[YEAR]";;".";"P";;;;;; ;;;;;;;;"[YEAR]";;".";"P";;;;;;
26;"EE Business & institutional Records";"Corporate Records";"Extract supplied by staff";;"F";"ESM163";;"[AUTHOR]";"Writer";;;;;;;; 26;"EE Business & institutional Records";"Corporate Records";"Extract supplied by staff";;"F";"ESM163";;"[AUTHOR]";"Writer";;;;;;;;
;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";;"PRIVLOC";;"Privacy";;; ;;;;;;;"(";"[ADDRESS]";"Writer's Address";")";;"PRIVLOC";;"Privacy";;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";",";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;;
;;;;;;;;"[SUBJECT]";"Owner";";";;;;;;; ;;;;;;;;"[SUBJECT]";"Owner";";";;;;;;;
@ -502,7 +502,7 @@
;;;;;;;;"[REPOSITORY ADDRESS]";;",";;"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;",";;"LOC";;;;;
;;;;;;;;"[YEAR]";;".";;;;;;; ;;;;;;;;"[YEAR]";;".";;;;;;;
26;"EE Business & institutional Records";"Corporate Records";"Extract supplied by staff";;"S";"ESM163";;"[AUTHOR]";"Writer";;;;;;;; 26;"EE Business & institutional Records";"Corporate Records";"Extract supplied by staff";;"S";"ESM163";;"[AUTHOR]";"Writer";;;;;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;;
27;"EE Business & institutional Records";"Corporate Records";"Microfilm";;"L";"ESM164";;"[COLLECTION]";;".";"T";;;;;; 27;"EE Business & institutional Records";"Corporate Records";"Microfilm";;"L";"ESM164";;"[COLLECTION]";;".";"T";;;;;;
;;;;;;;;"[SERIES]";;".";"T";;;;;; ;;;;;;;;"[SERIES]";;".";"T";;;;;;
@ -705,7 +705,7 @@
;;;;;;;;"[INSTITUTION]";;",";;;;;;; ;;;;;;;;"[INSTITUTION]";;",";;;;;;;
;;;;;;;;"[LOCATION]";"Location of Institution";";";;;;;;; ;;;;;;;;"[LOCATION]";"Location of Institution";";";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";;;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";;;;;;;;
;;;;;;;"to";"[RECIPIENT]";;";";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;";";;;;;;;
;;;;;;;;"[REPOSITORY]";"Record Holder";",";;;;;;; ;;;;;;;;"[REPOSITORY]";"Record Holder";",";;;;;;;
;;;;;;;;"[REPOSITORY ADDRESS]";;",";;"LOC";;;;; ;;;;;;;;"[REPOSITORY ADDRESS]";;",";;"LOC";;;;;
;;;;;;;;"[YEAR]";"When Held";".";;;;;;; ;;;;;;;;"[YEAR]";"When Held";".";;;;;;;
@ -726,18 +726,18 @@
;;;;;;;;"[TYPE]";"Record Type";".";;;;;;; ;;;;;;;;"[TYPE]";"Record Type";".";;;;;;;
40;"EE Cemetery Records";"Cemetery Office Records";"Office records";"supplied by staff";"L";"ESM210";;"[AUTHOR]";"Cemetery (Author)";;"A";;;;;; 40;"EE Cemetery Records";"Cemetery Office Records";"Office records";"supplied by staff";"L";"ESM210";;"[AUTHOR]";"Cemetery (Author)";;"A";;;;;;
;;;;;;;"(";"[LOCATION]";;")";"P";;;;;; ;;;;;;;"(";"[LOCATION]";;")";"P";;;;;;
;;;;;;;"to";"[RECIPIENT]";;".";"T";;;;;; ;;;;;;;" to";"[RECIPIENT]";;".";"T";;;;;;
;;;;;;;;"[TYPE]";"Item Type";".";"T";;;;;; ;;;;;;;;"[TYPE]";"Item Type";".";"T";;;;;;
;;;;;;;;"[YEAR]";"Year(s)";".";"T";;;;;; ;;;;;;;;"[YEAR]";"Year(s)";".";"T";;;;;;
40;"EE Cemetery Records";"Cemetery Office Records";"Office records";"supplied by staff";"F";"ESM210";;"[AUTHOR]";"Cemetery (Author)";;;;;;;; 40;"EE Cemetery Records";"Cemetery Office Records";"Office records";"supplied by staff";"F";"ESM210";;"[AUTHOR]";"Cemetery (Author)";;;;;;;;
;;;;;;;"(";"[LOCATION]";;")";;;;;;; ;;;;;;;"(";"[LOCATION]";;")";;;;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[TYPE]";"Item Type";",";;;;;;; ;;;;;;;;"[TYPE]";"Item Type";",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";",";;;;;;;
;;;;;;;;"[SUBJECT]";"Subject or nature of data provided";".";;;;;;; ;;;;;;;;"[SUBJECT]";"Subject or nature of data provided";".";;;;;;;
40;"EE Cemetery Records";"Cemetery Office Records";"Office records";"supplied by staff";"S";"ESM210";;"[AUTHOR]";"Cemetery (Author)";;;;;;;; 40;"EE Cemetery Records";"Cemetery Office Records";"Office records";"supplied by staff";"S";"ESM210";;"[AUTHOR]";"Cemetery (Author)";;;;;;;;
;;;;;;;"(";"[LOCATION]";;")";;"LOC";;;;; ;;;;;;;"(";"[LOCATION]";;")";;"LOC";;;;;
;;;;;;;"to";"[RECIPIENT]";;",";;;;;;; ;;;;;;;" to";"[RECIPIENT]";;",";;;;;;;
;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;; ;;;;;;;;"[DATE]";"Record Date(s)";".";;;;;;;
41;"EE Cemetery Records";"Cemetery Office Records";"Online images";;"L";"ESM211";;"[AUTHOR]";"Creator";".";"A";;;;;; 41;"EE Cemetery Records";"Cemetery Office Records";"Online images";;"L";"ESM211";;"[AUTHOR]";"Creator";".";"A";;;;;;
;;;;;;;;"[WEBSITE]";;".";"T";;"Italics";;;; ;;;;;;;;"[WEBSITE]";;".";"T";;"Italics";;;;

1 N Category Category Type Type Description Type Identifier LDEL Fields Label RDEL GEDCOM Shorten Attribute Privacy Optional Hint Tooltip
75 [COLLECTION] . P
76 [REPOSITORY] , P
77 [REPOSITORY ADDRESS] . P LOC
78 5 EE Archives & Artifacts Archived Material Manuscript Records Series, emphasis on F ESM97 [AUTHOR] Author (Grantor) to GS
79 to [RECIPIENT] , GS
80 [ID] Record ID ,
81 [DATE] Record Date(s) ;
82 [FILE NO.] ,
86 [COLLECTION] ,
87 [REPOSITORY] ,
88 [REPOSITORY ADDRESS] . LOC
89 5 EE Archives & Artifacts Archived Material Manuscript Records Series, emphasis on S ESM97 [AUTHOR] to S
90 to [RECIPIENT] , S
91 [ID] Record ID ,
92 [DATE] , YEAR
93 [SERIES] ,
134 8 EE Archives & Artifacts Archived Material Research Report L ESM100 [AUTHOR] , A SG
135 [PROFESSIONAL CREDENTIALS] . A
136 [TITLE] Report Title . T Quoted
137 [TYPE] Item Type to P
138 to [RECIPIENT] . P
139 [DATE] Report Date . P
140 [COLLECTION] , P
141 [REPOSITORY] , P
144 [PROFESSIONAL CREDENTIALS] ,
145 [TITLE] Report Title , Quoted
146 p. [PAGE] Page(s) ;
147 [TYPE] Item Type to
148 to [RECIPIENT] ,
149 [DATE] Report Date ;
150 [COLLECTION] ,
151 [REPOSITORY] ,
309 [ID] Item ID ,
310 17 EE Archives & Artifacts Private Holdings Historic letter L ESM109 [AUTHOR] Writer A SG
311 ( [ADDRESS] Writer's Address ) P PRIVLOC Privacy
312 to to [RECIPIENT] . T
313 [TYPE] Item Type . T
314 [DATE] Record Date(s) . P
315 [REPOSITORY] Current or Last Known Owner , P
317 [YEAR] Year Owned . P
318 17 EE Archives & Artifacts Private Holdings Historic letter F ESM109 [AUTHOR] Writer GS
319 ( [ADDRESS] Writer's Address ) PRIVLOC Privacy
320 to to [RECIPIENT] ,
321 [TYPE] Item Type ,
322 [DATE] Record Date(s) ;
323 [REPOSITORY] Current or Last Known Owner ,
324 [REPOSITORY ADDRESS] , LOC
325 [YEAR] Year Owned .
326 [RESEARCH COMMENT] Descriptive Detail/Evaluation .
327 17 EE Archives & Artifacts Private Holdings Historic letter S ESM109 [AUTHOR] Writer to GS
328 to [RECIPIENT] ,
329 [DATE] Record Date(s) .
330 18 EE Archives & Artifacts Private Holdings Interview tape & transcript L ESM110 [AUTHOR] Person Interviewed . A SG
331 [LOCATION] . T
354 [REPOSITORY ADDRESS] . P LOC
355 [YEAR] Year Owned . P
356 19 EE Archives & Artifacts Private Holdings Legal document, unrecorded F ESM111 [AUTHOR] Author (Grantor) ,
357 to to [RECIPIENT] ,
358 [ID] Record ID ,
359 [DATE] Record Date(s) ;
360 [FORMAT] Item Format ,
364 [YEAR] Year Owned .
365 [RESEARCH COMMENT] Descriptive Detail/Evaluation .
366 19 EE Archives & Artifacts Private Holdings Legal document, unrecorded S ESM111 [AUTHOR] Author (Grantor)
367 to to [RECIPIENT] ,
368 [ID] Record ID ,
369 [DATE] Record Date(s) . YEAR
370 20 EE Archives & Artifacts Private Holdings Personal correspondence L ESM112 [COLLECTION] . T
373 20 EE Archives & Artifacts Private Holdings Personal correspondence F ESM112 [AUTHOR] Writer , GS
374 [AFFILIATION] Writer's Affiliation ,
375 [ADDRESS] Writer's Address , PRIVLOC Privacy
376 to to [RECIPIENT] ,
377 [TYPE] Item Type ,
378 [DATE] Record Date(s) ,
379 [SUBJECT] ;
383 [REPOSITORY] Owner ,
384 [REPOSITORY ADDRESS] . LOC
385 20 EE Archives & Artifacts Private Holdings Personal correspondence S ESM112 [AUTHOR] Writer S
386 to to [RECIPIENT] ,
387 [DATE] Record Date(s) .
388 21 EE Archives & Artifacts Private Holdings Personal e-mail L ESM113 [COLLECTION] . T
389 [REPOSITORY] Owner , P
390 [REPOSITORY ADDRESS] . P LOC
391 21 EE Archives & Artifacts Private Holdings Personal e-mail F ESM113 [AUTHOR] Writer , GS
392 [ADDRESS] Writer's Address , PRIVLOC Privacy
393 to to [RECIPIENT] ,
394 [TYPE] Item Type ,
395 [DATE] Record Date(s) ,
396 [SUBJECT] ,
400 [REPOSITORY] Owner ,
401 [REPOSITORY ADDRESS] . LOC
402 21 EE Archives & Artifacts Private Holdings Personal e-mail S ESM113 [AUTHOR] Writer S
403 to to [RECIPIENT] ,
404 [TYPE] Item Type ,
405 [DATE] Record Date(s) .
406 22 EE Archives & Artifacts Private Holdings Research Report L ESM114 [AUTHOR] , A SG
407 [PROFESSIONAL CREDENTIALS] . A
408 [TITLE] Report Title . T Quoted
409 [TYPE] Item Type to T
410 to [RECIPIENT] T
411 [ADDRESS] Recipient Address , Privacy
412 [LOCATION] Recipient Location , P
413 [REPORT DATE] . P
418 [PROFESSIONAL CREDENTIALS] ,
419 [TITLE] Report Title , Quoted
420 [PAGE] Page(s) ;
421 [TYPE] Item Type to
422 to [RECIPIENT] ,
423 [ADDRESS] Recipient Address Privacy
424 [LOCATION] Recipient Location ,
425 [REPORT DATE] ;
486 [COLLECTION] .
487 26 EE Business & institutional Records Corporate Records Extract supplied by staff L ESM163 [AUTHOR] Writer A
488 ( [ADDRESS] Writer's Address ) P PRIVLOC Privacy
489 to to [RECIPIENT] . T
490 [TYPE] Item Type . T
491 [DATE RANGE] Record Date Range . P
492 [REPOSITORY] Owner , P
494 [YEAR] . P
495 26 EE Business & institutional Records Corporate Records Extract supplied by staff F ESM163 [AUTHOR] Writer
496 ( [ADDRESS] Writer's Address ) PRIVLOC Privacy
497 to to [RECIPIENT] ,
498 [TYPE] Item Type ,
499 [DATE] Record Date(s) ,
500 [SUBJECT] Owner ;
502 [REPOSITORY ADDRESS] , LOC
503 [YEAR] .
504 26 EE Business & institutional Records Corporate Records Extract supplied by staff S ESM163 [AUTHOR] Writer
505 to to [RECIPIENT] ,
506 [DATE] Record Date(s) .
507 27 EE Business & institutional Records Corporate Records Microfilm L ESM164 [COLLECTION] . T
508 [SERIES] . T
705 [INSTITUTION] ,
706 [LOCATION] Location of Institution ;
707 [DATE] Record Date(s)
708 to to [RECIPIENT] ;
709 [REPOSITORY] Record Holder ,
710 [REPOSITORY ADDRESS] , LOC
711 [YEAR] When Held .
726 [TYPE] Record Type .
727 40 EE Cemetery Records Cemetery Office Records Office records supplied by staff L ESM210 [AUTHOR] Cemetery (Author) A
728 ( [LOCATION] ) P
729 to to [RECIPIENT] . T
730 [TYPE] Item Type . T
731 [YEAR] Year(s) . T
732 40 EE Cemetery Records Cemetery Office Records Office records supplied by staff F ESM210 [AUTHOR] Cemetery (Author)
733 ( [LOCATION] )
734 to to [RECIPIENT] ,
735 [TYPE] Item Type ,
736 [DATE] Record Date(s) ,
737 [SUBJECT] Subject or nature of data provided .
738 40 EE Cemetery Records Cemetery Office Records Office records supplied by staff S ESM210 [AUTHOR] Cemetery (Author)
739 ( [LOCATION] ) LOC
740 to to [RECIPIENT] ,
741 [DATE] Record Date(s) .
742 41 EE Cemetery Records Cemetery Office Records Online images L ESM211 [AUTHOR] Creator . A
743 [WEBSITE] . T Italics

View File

@ -38,6 +38,7 @@ _ = glocale.translation.gettext
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from .srcattrtype import * from .srcattrtype import *
from .date import Date
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -91,7 +92,7 @@ class SrcTemplate(object):
""" """
UNKNOWN = -1 UNKNOWN = -1
CUSTOM = 0 CUSTOM = 0
#SRCTEMPLATE has some predefined values which map to citation styles #SRCTEMPLATE has some predefined values which map to citation styles
ESM100 = 17 ESM100 = 17
ESM101 = 18 ESM101 = 18
@ -454,9 +455,9 @@ class SrcTemplate(object):
None, None), None, None),
('', SrcAttributeType.TITLE, _('Report Title'), '.', STYLE_QUOTE, False, False, EMPTY, GED_TITLE, ('', SrcAttributeType.TITLE, _('Report Title'), '.', STYLE_QUOTE, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), 'to', EMPTY, False, False, EMPTY, GED_PUBINF, ('', SrcAttributeType.TYPE, _('Item Type'), '', EMPTY, False, False, EMPTY, GED_PUBINF,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_PUBINF, (' to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_PUBINF,
None, None), None, None),
('', SrcAttributeType.DATE, _('Report Date'), '.', EMPTY, False, False, EMPTY, GED_PUBINF, ('', SrcAttributeType.DATE, _('Report Date'), '.', EMPTY, False, False, EMPTY, GED_PUBINF,
None, None), None, None),
@ -476,9 +477,9 @@ class SrcTemplate(object):
None, None), None, None),
('p.', SrcAttributeType.PAGE, _('Page(s)'), ';', EMPTY, False, False, EMPTY, EMPTY, ('p.', SrcAttributeType.PAGE, _('Page(s)'), ';', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), 'to', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.DATE, _('Report Date'), ';', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.DATE, _('Report Date'), ';', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -876,7 +877,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, GED_PUBINF, ('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, GED_PUBINF,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_TITLE, (' to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), '.', EMPTY, False, False, EMPTY, GED_TITLE, ('', SrcAttributeType.TYPE, _('Item Type'), '.', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
@ -894,7 +895,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, EMPTY, ('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -910,9 +911,9 @@ class SrcTemplate(object):
None, None), None, None),
], ],
REF_TYPE_S: [ REF_TYPE_S: [
('', SrcAttributeType.AUTHOR, _('Writer'), 'to', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -984,7 +985,7 @@ class SrcTemplate(object):
REF_TYPE_F: [ REF_TYPE_F: [
('', SrcAttributeType.AUTHOR, _('Author (Grantor)'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Author (Grantor)'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1006,7 +1007,7 @@ class SrcTemplate(object):
REF_TYPE_S: [ REF_TYPE_S: [
('', SrcAttributeType.AUTHOR, _('Author (Grantor)'), '', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Author (Grantor)'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1030,7 +1031,7 @@ class SrcTemplate(object):
None, None), None, None),
('', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ',', EMPTY, True, False, EMPTY, EMPTY, ('', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ',', EMPTY, True, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1052,7 +1053,7 @@ class SrcTemplate(object):
REF_TYPE_S: [ REF_TYPE_S: [
('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1072,7 +1073,7 @@ class SrcTemplate(object):
None, None), None, None),
('', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ',', EMPTY, True, False, EMPTY, EMPTY, ('', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ',', EMPTY, True, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1094,7 +1095,7 @@ class SrcTemplate(object):
REF_TYPE_S: [ REF_TYPE_S: [
('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1110,9 +1111,9 @@ class SrcTemplate(object):
None, None), None, None),
('', SrcAttributeType.TITLE, _('Report Title'), '.', STYLE_QUOTE, False, False, EMPTY, GED_TITLE, ('', SrcAttributeType.TITLE, _('Report Title'), '.', STYLE_QUOTE, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), 'to', EMPTY, False, False, EMPTY, GED_TITLE, ('', SrcAttributeType.TYPE, _('Item Type'), '', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), '', EMPTY, False, False, EMPTY, GED_TITLE, (' to', SrcAttributeType.RECIPIENT, _(''), '', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.ADDRESS, _('Recipient Address'), ',', EMPTY, True, False, EMPTY, EMPTY, ('', SrcAttributeType.ADDRESS, _('Recipient Address'), ',', EMPTY, True, False, EMPTY, EMPTY,
None, None), None, None),
@ -1136,9 +1137,9 @@ class SrcTemplate(object):
None, None), None, None),
('', SrcAttributeType.PAGE, _('Page(s)'), ';', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.PAGE, _('Page(s)'), ';', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), 'to', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.ADDRESS, _('Recipient Address'), '', EMPTY, True, False, EMPTY, EMPTY, ('', SrcAttributeType.ADDRESS, _('Recipient Address'), '', EMPTY, True, False, EMPTY, EMPTY,
None, None), None, None),
@ -1302,7 +1303,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, GED_PUBINF, ('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, GED_PUBINF,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_TITLE, (' to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), '.', EMPTY, False, False, EMPTY, GED_TITLE, ('', SrcAttributeType.TYPE, _('Item Type'), '.', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
@ -1320,7 +1321,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, EMPTY, ('(', SrcAttributeType.ADDRESS, _('Writer\'s Address'), ')', EMPTY, True, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1338,7 +1339,7 @@ class SrcTemplate(object):
REF_TYPE_S: [ REF_TYPE_S: [
('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Writer'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1838,7 +1839,7 @@ class SrcTemplate(object):
None, None), None, None),
('', SrcAttributeType.DATE, _('Record Date(s)'), '', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.DATE, _('Record Date(s)'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ';', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ';', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.REPOSITORY, _('Record Holder'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.REPOSITORY, _('Record Holder'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1894,7 +1895,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.LOCATION, _(''), ')', EMPTY, False, False, EMPTY, GED_PUBINF, ('(', SrcAttributeType.LOCATION, _(''), ')', EMPTY, False, False, EMPTY, GED_PUBINF,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_TITLE, (' to', SrcAttributeType.RECIPIENT, _(''), '.', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), '.', EMPTY, False, False, EMPTY, GED_TITLE, ('', SrcAttributeType.TYPE, _('Item Type'), '.', EMPTY, False, False, EMPTY, GED_TITLE,
None, None), None, None),
@ -1906,7 +1907,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.LOCATION, _(''), ')', EMPTY, False, False, EMPTY, EMPTY, ('(', SrcAttributeType.LOCATION, _(''), ')', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.TYPE, _('Item Type'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -1920,7 +1921,7 @@ class SrcTemplate(object):
None, None), None, None),
('(', SrcAttributeType.LOCATION, _(''), ')', EMPTY, False, False, SHORTERALG_LOC, EMPTY, ('(', SrcAttributeType.LOCATION, _(''), ')', EMPTY, False, False, SHORTERALG_LOC, EMPTY,
None, None), None, None),
('to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.DATE, _('Record Date(s)'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -7960,9 +7961,9 @@ class SrcTemplate(object):
None, None), None, None),
], ],
REF_TYPE_F: [ REF_TYPE_F: [
('', SrcAttributeType.AUTHOR, _('Author (Grantor)'), 'to', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _('Author (Grantor)'), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -7984,9 +7985,9 @@ class SrcTemplate(object):
None, None), None, None),
], ],
REF_TYPE_S: [ REF_TYPE_S: [
('', SrcAttributeType.AUTHOR, _(''), 'to', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.AUTHOR, _(''), '', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY, (' to', SrcAttributeType.RECIPIENT, _(''), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY, ('', SrcAttributeType.ID, _('Record ID'), ',', EMPTY, False, False, EMPTY, EMPTY,
None, None), None, None),
@ -8190,17 +8191,20 @@ class SrcTemplate(object):
raise NotImplementedError raise NotImplementedError
self.template_key = template_key self.template_key = template_key
def set_attr_list(self, attr_list, attr_list_citation=None): def set_attr_list(self, attr_list, attr_list_citation=None, date_citation=None):
""" """
Set the attribute list of this template. Setting once for different Set the attribute list of this template. Setting once for different
references saves some time. references saves some time.
attr_list should be the source attribute list attr_list should be the source attribute list
If citation given, citation attributes overrule source attributes for If citation given, citation attributes overrule source attributes for
the Full and Short references the Full and Short references
The citation date is not stored as attribute, so pass Date() object via
date_citation if a date is known.
""" """
self.empty() self.empty()
self.attr_list = attr_list or [] self.attr_list = attr_list or []
self.attr_list_cite = attr_list_citation or [] self.attr_list_cite = attr_list_citation or []
self.date_citation = date_citation
# store attributes in a dict last to first. this overwrites data so first # store attributes in a dict last to first. this overwrites data so first
# attribute will be the one taken if duplicates are present # attribute will be the one taken if duplicates are present
for attr in self.attr_list[::-1]: for attr in self.attr_list[::-1]:
@ -8260,6 +8264,10 @@ class SrcTemplate(object):
else: else:
self.attrmap[key] = (None, self.attrmap[key] = (None,
attr.get_value(), None) attr.get_value(), None)
if self.date_citation:
#we store the date of the citation in attrmap
key = SrcAttributeType.DATE
self.attrmap[key] = (None, self.date_citation, None)
def reference_L(self, attr_list=None): def reference_L(self, attr_list=None):
""" """
@ -8349,6 +8357,9 @@ class SrcTemplate(object):
#we apply the shortening algorithm #we apply the shortening algorithm
## TODO: not implemented yet ## TODO: not implemented yet
pass pass
#if field is a Date object, we now convert to string
if isinstance(field, Date):
field = str(field)
if field.strip(): if field.strip():
fieldadded[-1] = True fieldadded[-1] = True
ref[-1] += ldeltodo ref[-1] += ldeltodo
@ -8395,7 +8406,7 @@ class SrcTemplate(object):
curval = ref[-1] curval = ref[-1]
if len(curval) and curval[-1] == '.': if len(curval) and curval[-1] == '.':
pass pass
elif len(curval) and curval[-1] == ',': elif len(curval) and curval[-1] in [',', ';']:
ref[-1] = ref[-1][:-1] + rdel ref[-1] = ref[-1][:-1] + rdel
else: else:
ref[-1] = ref[-1] + rdel ref[-1] = ref[-1] + rdel
@ -8403,7 +8414,7 @@ class SrcTemplate(object):
fieldadded[-1] = False fieldadded[-1] = False
elif len(rdel) and rdel[0] == ',': elif len(rdel) and rdel[0] == ',':
curval = ref[-1] curval = ref[-1]
if len(curval) and curval[-1] == '.': if len(curval) and curval[-1] in ['.', ';']:
pass pass
elif len(curval) and curval[-1] == ',': elif len(curval) and curval[-1] == ',':
pass pass

View File

@ -47,7 +47,8 @@ from gramps.gen.lib import SrcAttribute, SrcTemplate
from gramps.gen.plug.report.utils import get_address_ref_str from gramps.gen.plug.report.utils import get_address_ref_str
from ...autocomp import StandardCustomSelector from ...autocomp import StandardCustomSelector
from ...widgets.srctemplatetreeview import SrcTemplateTreeView from ...widgets.srctemplatetreeview import SrcTemplateTreeView
from ...widgets import UndoableEntry, MonitoredEntryIndicator from ...widgets import (UndoableEntry, MonitoredEntryIndicator, MonitoredDate,
ValidatableMaskedEntry)
from .grampstab import GrampsTab from .grampstab import GrampsTab
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -92,8 +93,8 @@ class SrcTemplateTab(GrampsTab):
self._set_label(show_image=False) self._set_label(show_image=False)
widget.connect('key_press_event', self.key_pressed) widget.connect('key_press_event', self.key_pressed)
self.tmplfields = TemplateFields(self.dbstate.db, self.tmplfields = TemplateFields(self.dbstate.db, self.uistate,
self.glade.get_object('gridfields'), self.track, self.glade.get_object('gridfields'),
self.src, None, self.callback_src_changed, None) self.src, None, self.callback_src_changed, None)
self.autotitle = self.glade.get_object("autotitle_checkbtn") self.autotitle = self.glade.get_object("autotitle_checkbtn")
#self.vbox_fields_label = self.glade.get_object('fields_01') #self.vbox_fields_label = self.glade.get_object('fields_01')
@ -174,8 +175,8 @@ class TemplateFields(object):
Class to manage fields of a source template. Class to manage fields of a source template.
Can be used on source and on citation level. Can be used on source and on citation level.
""" """
def __init__(self, db, grid, src, cite, callback_src_changed, def __init__(self, db, uistate, track, grid, src, cite,
callback_cite_changed): callback_src_changed, callback_cite_changed):
""" """
grid: The Gtk.Grid that should hold the fields grid: The Gtk.Grid that should hold the fields
src : The source to which the fields belong src : The source to which the fields belong
@ -183,6 +184,8 @@ class TemplateFields(object):
""" """
self.gridfields = grid self.gridfields = grid
self.db = db self.db = db
self.uistate = uistate
self.track = track
self.src = src self.src = src
self.cite = cite self.cite = cite
self.callback_src_changed = callback_src_changed self.callback_src_changed = callback_src_changed
@ -191,6 +194,7 @@ class TemplateFields(object):
#storage #storage
self.lbls = [] self.lbls = []
self.inpts = [] self.inpts = []
self.btns = []
self.monentry = [] self.monentry = []
def reset_template_fields(self, index): def reset_template_fields(self, index):
@ -212,9 +216,12 @@ class TemplateFields(object):
self.gridfields.remove(inpt) self.gridfields.remove(inpt)
for mon in self.monentry: for mon in self.monentry:
del mon del mon
for btn in self.btns:
self.gridfields.remove(btn)
self.lbls = [] self.lbls = []
self.inpts = [] self.inpts = []
self.monentry = [] self.monentry = []
self.btns = []
row = 1 row = 1
# now add new fields # now add new fields
fieldsL = [] fieldsL = []
@ -313,6 +320,10 @@ class TemplateFields(object):
SrcAttributeType.REPOSITORY_ADDRESS, SrcAttributeType.REPOSITORY_ADDRESS,
SrcAttributeType.REPOSITORY_CALL_NUMBER]: SrcAttributeType.REPOSITORY_CALL_NUMBER]:
self._add_repo_entry(srcattrtype, row) self._add_repo_entry(srcattrtype, row)
elif self.cite and srcattrtype == SrcAttributeType.DATE:
#the DATE on level citation is not an attribute but stored
#as date in the citation
self._add_cite_date(row)
else: else:
#setup entry #setup entry
self._add_normal_entry(srcattrtype, row, hint, tooltip) self._add_normal_entry(srcattrtype, row, hint, tooltip)
@ -339,6 +350,30 @@ class TemplateFields(object):
read_only=self.db.readonly, read_only=self.db.readonly,
parameter=srcattrtype) parameter=srcattrtype)
def _add_cite_date(self, row):
"""
Add the entry corresponding to the date field on citation level
"""
inpt = ValidatableMaskedEntry()
inpt.set_halign(Gtk.Align.FILL)
inpt.set_hexpand(True)
inpt.set_tooltip_text("The date of the entry in the source you are"
" referencing with this citation. E.g. the date a house was visited"
" during a census , or the date an entry was made in a"
" birth log/registry")
self.gridfields.attach(inpt, 1, row-1, 1, 1)
self.inpts.append(inpt)
btn = self.make_btn('gramps-date')
self.gridfields.attach(btn, 2, row-1, 1, 1)
self.btns.append(btn)
MonitoredDate(
inpt,
btn,
self.cite.get_date_object(),
self.uistate,
self.track,
self.db.readonly)
def _add_repo_entry(self, srcattrtype, row): def _add_repo_entry(self, srcattrtype, row):
""" """
Add a field that obtains info from repository Add a field that obtains info from repository
@ -375,6 +410,16 @@ class TemplateFields(object):
self.gridfields.attach(lbl, 1, row-1, 1, 1) self.gridfields.attach(lbl, 1, row-1, 1, 1)
self.lbls.append(lbl) self.lbls.append(lbl)
def make_btn(self, stockid):
"""
Create a button for use with a stock image
"""
image = Gtk.Image.new_from_stock('gramps-date', Gtk.IconSize.MENU)
btn = Gtk.Button()
btn.set_image(image)
btn.set_always_show_image(True)
return btn
def get_src_field(self, srcattrtype): def get_src_field(self, srcattrtype):
return self.__get_field(srcattrtype, self.src) return self.__get_field(srcattrtype, self.src)

View File

@ -361,10 +361,12 @@ class EditSource(EditPrimary):
#set new attrlist in template #set new attrlist in template
if self.citation_loaded: if self.citation_loaded:
citeattr = self.citation.get_attribute_list() citeattr = self.citation.get_attribute_list()
citedate = self.citation.get_date_object()
else: else:
citeattr = None citeattr = None
self.srctemp.set_attr_list(self.obj.get_attribute_list(), citeattr) citedate = None
self.srctemp.set_attr_list(self.obj.get_attribute_list(), citeattr,
citedate)
#set fields with the template #set fields with the template
self.refL.set_text(self.srctemp.reference_L()) self.refL.set_text(self.srctemp.reference_L())
@ -503,8 +505,8 @@ class EditSource(EditPrimary):
self._add_tab(notebook_ref, self.reftab) self._add_tab(notebook_ref, self.reftab)
self.track_ref_for_deletion("reftab") self.track_ref_for_deletion("reftab")
#reftab contains the citation template fields #reftab contains the citation template fields
self.tmplfields = TemplateFields(self.dbstate.db, self.tmplfields = TemplateFields(self.dbstate.db, self.uistate,
self.glade.get_object('grid_citefields'), self.track, self.glade.get_object('grid_citefields'),
self.obj, self.citation, None, self.callback_cite_changed) self.obj, self.citation, None, self.callback_cite_changed)
self.tmplfields.reset_template_fields(self.obj.get_source_template()[0]) self.tmplfields.reset_template_fields(self.obj.get_source_template()[0])
@ -821,6 +823,8 @@ class EditSource(EditPrimary):
#error in database, link to citation handle that does not exist #error in database, link to citation handle that does not exist
raise Exception raise Exception
self.citation.unserialize(newcite.serialize()) self.citation.unserialize(newcite.serialize())
#we have a citation:
self.citation_loaded = True
if not self.citation_ready: if not self.citation_ready:
self._setup_citation_fields() self._setup_citation_fields()
self._create_citation_tabbed_pages() self._create_citation_tabbed_pages()
@ -830,7 +834,6 @@ class EditSource(EditPrimary):
self.tmplfields.reset_template_fields(self.obj.get_source_template()[0]) self.tmplfields.reset_template_fields(self.obj.get_source_template()[0])
self.cinf.set_visible(True) self.cinf.set_visible(True)
self.btnclose_cite.set_sensitive(True) self.btnclose_cite.set_sensitive(True)
self.citation_loaded = True
self.notebook_ref.set_visible(True) self.notebook_ref.set_visible(True)
def citation_changed(self): def citation_changed(self):