From b07717ad8683e1582ccb1db278c02f1914acbbd4 Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Tue, 28 May 2013 09:50:53 +0000
Subject: [PATCH] Split double field corresponding with log date in citatin
 object

svn: r22440
---
 data/evidencestyle/evidence_style.csv | 3 ++-
 gramps/gen/lib/srcattrtype.py         | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/evidencestyle/evidence_style.csv b/data/evidencestyle/evidence_style.csv
index 9cf91c373..f47652109 100644
--- a/data/evidencestyle/evidence_style.csv
+++ b/data/evidencestyle/evidence_style.csv
@@ -1385,7 +1385,8 @@
 ,,,,,,,"(","[LOCATION]","),",,,
 ,,,,,,,,"[RECORD BOOK ID (GENERIC LABEL)]",",",,,
 ,,,,,,,,"[PAGE(S)]",",",,,
-,,,,,,,,"[ITEM OF INTEREST & DATE FOR UNPAGINATED ENTRY]",";",,,
+,,,,,,,,"[ITEM OF INTEREST]",,,,
+,,,,,,,,"[DATE FOR UNPAGINATED ENTRY]",";",,,
 ,,,,,,,,"[ITEM TYPE OR FORMAT]",",",,,
 ,,,,,,,,"[WEBSITE TITLE]",,"Italics",,
 ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,,
diff --git a/gramps/gen/lib/srcattrtype.py b/gramps/gen/lib/srcattrtype.py
index c1ea75868..3e18f66c3 100644
--- a/gramps/gen/lib/srcattrtype.py
+++ b/gramps/gen/lib/srcattrtype.py
@@ -72,6 +72,7 @@ class SrcAttributeType(GrampsType):
         (GEN_BY    , _("Generated by"), "Generated by"), # Generated sources on import
         # possible fields for evidence styles need to be added next
         ]
+
     #following fields are generated with evidencefieldgenerator.py
     #the index starts at 100!
     ABSTRACTOR_6FIRST9 = 529
@@ -198,6 +199,7 @@ class SrcAttributeType(GrampsType):
     DATA_COLLECTION_INFO = 325
     DATE = 115
     DATE_6SHORT9 = 126
+    DATE_FOR_UNPAGINATED_ENTRY = 400
     DATE_OWNED = 269
     DATE_PUBLISHED_UPDATED_OR_ACCESSED = 563
     DATE_RANGE = 146
@@ -297,7 +299,6 @@ class SrcAttributeType(GrampsType):
     ITEM_OF_INTEREST_6COUNTY_STATE_DATE_AND_PO9 = 513
     ITEM_OF_INTEREST_6PARTIES_AND_TYPE_OF_DOCUMENT9 = 458
     ITEM_OF_INTEREST_6SHORT9 = 280
-    ITEM_OF_INTEREST_AND_DATE_FOR_UNPAGINATED_ENTRY = 400
     ITEM_OF_INTEREST_AND_YEAR = 398
     ITEM_OF_INTEREST_WITH_ABBREVIATED_DETAIL = 384
     ITEM_OF_INTEREST_WITH_IDENTIFYING_DETAIL = 383
@@ -718,6 +719,7 @@ class SrcAttributeType(GrampsType):
         (DATA_COLLECTION_INFO, _("Data collection info"), "Data collection info"),
         (DATE, _("Date"), "Date"),
         (DATE_6SHORT9, _("Date (short)"), "Date (short)"),
+        (DATE_FOR_UNPAGINATED_ENTRY, _("Date for unpaginated entry"), "Date for unpaginated entry"),
         (DATE_OWNED, _("Date owned"), "Date owned"),
         (DATE_PUBLISHED_UPDATED_OR_ACCESSED, _("Date published, updated or accessed"), "Date published, updated or accessed"),
         (DATE_RANGE, _("Date range"), "Date range"),
@@ -817,7 +819,6 @@ class SrcAttributeType(GrampsType):
         (ITEM_OF_INTEREST_6COUNTY_STATE_DATE_AND_PO9, _("Item of interest (county, state, date & po.)"), "Item of interest (county, state, date & po.)"),
         (ITEM_OF_INTEREST_6PARTIES_AND_TYPE_OF_DOCUMENT9, _("Item of interest (parties & type of document)"), "Item of interest (parties & type of document)"),
         (ITEM_OF_INTEREST_6SHORT9, _("Item of interest (short)"), "Item of interest (short)"),
-        (ITEM_OF_INTEREST_AND_DATE_FOR_UNPAGINATED_ENTRY, _("Item of interest & date for unpaginated entry"), "Item of interest & date for unpaginated entry"),
         (ITEM_OF_INTEREST_AND_YEAR, _("Item of interest & year"), "Item of interest & year"),
         (ITEM_OF_INTEREST_WITH_ABBREVIATED_DETAIL, _("Item of interest, with abbreviated detail"), "Item of interest, with abbreviated detail"),
         (ITEM_OF_INTEREST_WITH_IDENTIFYING_DETAIL, _("Item of interest, with identifying detail"), "Item of interest, with identifying detail"),
@@ -1113,7 +1114,6 @@ class SrcAttributeType(GrampsType):
         (YEAR_SUPPLIED, _("Year supplied"), "Year supplied"),
         ]
 
-
     #SRCTYPE has some predefined values which map to citation styles
     ESM100 = 17
     ESM101 = 18
@@ -3231,7 +3231,8 @@ class SrcAttributeType(GrampsType):
                 ('(', LOCATION, '),', '', False, False),
                 ('', RECORD_BOOK_ID_6GENERIC_LABEL9, ',', '', False, False),
                 ('', PAGE6S9, ',', '', False, False),
-                ('', ITEM_OF_INTEREST_AND_DATE_FOR_UNPAGINATED_ENTRY, ';', '', False, False),
+                ('', ITEM_OF_INTEREST, '', '', False, False),
+                ('', DATE_FOR_UNPAGINATED_ENTRY, ';', '', False, False),
                 ('', ITEM_TYPE_OR_FORMAT, ',', '', False, False),
                 ('', WEBSITE_TITLE, '', 'Italics', False, False),
                 ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False),