From a0965c48bfa3c4aa13ffc8e36d7ac45662393116 Mon Sep 17 00:00:00 2001
From: ariddell <abr@ariddell.org>
Date: Mon, 29 Dec 2014 18:44:32 -0500
Subject: [PATCH] Fix encoding and field order in volume metadata

By default, Python's json.dumps(...) converts utf-8 to ASCII. This is
not what we want.
---
 nonfree/9780979587115/metadata.json              | 4 ++--
 nonfree/pg9439/metadata.json                     | 4 ++--
 nonfree/women-smith-manor/metadata.json          | 8 ++++----
 volumes/castlesinairano00frangoog/metadata.json  | 4 ++--
 volumes/colburnsmodernn00morggoog/metadata.json  | 4 ++--
 volumes/destinyorchiefsd01ferr/metadata.json     | 4 ++--
 volumes/destinyorchiefsd02ferr/metadata.json     | 4 ++--
 volumes/florencemacarthy01morg_0/metadata.json   | 6 +++---
 volumes/florencemacarthy02morg_0/metadata.json   | 6 +++---
 volumes/florencemacarthy03morg_0/metadata.json   | 6 +++---
 volumes/florencemacarthy04morg_0/metadata.json   | 6 +++---
 volumes/gilbertgurney00hookuoft/metadata.json    | 4 ++--
 volumes/glenarvon01lambc/metadata.json           | 6 +++---
 volumes/glenarvon02lambc/metadata.json           | 6 +++---
 volumes/glenarvon03lambc/metadata.json           | 6 +++---
 volumes/godolphin00lyttrich/metadata.json        | 4 ++--
 volumes/inheritance01ferruoft/metadata.json      | 4 ++--
 volumes/inheritance02ferruoft/metadata.json      | 4 ++--
 volumes/owencastleorwhic01sull/metadata.json     | 4 ++--
 volumes/owencastleorwhic02sull/metadata.json     | 4 ++--
 volumes/owencastleorwhic03sull/metadata.json     | 4 ++--
 volumes/owencastleorwhic04sull/metadata.json     | 4 ++--
 volumes/posthumousrecor00caungoog/metadata.json  | 4 ++--
 volumes/princessorbguine00morg/metadata.json     | 4 ++--
 volumes/talesofpeerageth00sulluoft/metadata.json | 4 ++--
 volumes/venetia00disriala/metadata.json          | 4 ++--
 volumes/viviangrey00disrrich/metadata.json       | 4 ++--
 volumes/widowandmarquess00hookuoft/metadata.json | 4 ++--
 volumes/womanoridaathen01sydgoog/metadata.json   | 4 ++--
 29 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/nonfree/9780979587115/metadata.json b/nonfree/9780979587115/metadata.json
index 88013e4..1cb4373 100644
--- a/nonfree/9780979587115/metadata.json
+++ b/nonfree/9780979587115/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "0db0299a2953ad4c97e78c48782e1c4efd98adf3",
  "extra_info": {
+  "note": "Extracted from book with ISBN 9780979587115",
   "publisher": "zittaw press",
-  "date": 2007,
-  "note": "Extracted from book with ISBN 9780979587115"
+  "date": 2007
  }
 }
\ No newline at end of file
diff --git a/nonfree/pg9439/metadata.json b/nonfree/pg9439/metadata.json
index f244656..c92c644 100644
--- a/nonfree/pg9439/metadata.json
+++ b/nonfree/pg9439/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "e7f5ab858f422a165d8b8ec845458836dc9d0677",
  "extra_info": {
+  "note": "I Ennui; II Almeria, Madame de Fleury, and the Dun; III Manoeuvring; IV Vivian; V Emilie de Coulanges and the Beginning of The Absentee; VI The Conclusion of The Absentee.",
   "publisher": "Project Gutenberg",
-  "date": 2005,
-  "note": "I Ennui; II Almeria, Madame de Fleury, and the Dun; III Manoeuvring; IV Vivian; V Emilie de Coulanges and the Beginning of The Absentee; VI The Conclusion of The Absentee."
+  "date": 2005
  }
 }
\ No newline at end of file
diff --git a/nonfree/women-smith-manor/metadata.json b/nonfree/women-smith-manor/metadata.json
index c695bd3..5c95d0c 100644
--- a/nonfree/women-smith-manor/metadata.json
+++ b/nonfree/women-smith-manor/metadata.json
@@ -7,9 +7,9 @@
  "date_updated": "2014-12-19",
  "sha1": "a1750dff929a83d39a183a5afd781a9026a771c4",
  "extra_info": {
-  "see_also": "http://digital.library.upenn.edu/women/smith/manor/manor.html",
+  "note": "Edition referenced is London: Pandora Press, 1987.",
+  "see_also": "http://digital.library.upenn.edu/women/smith/manor/manor.html\"",
   "publisher": "A Celebration of Women Writers",
-  "date": "n.d.",
-  "note": "Edition referenced is London: Pandora Press, 1987."
+  "date": "n.d."
  }
-}
+}
\ No newline at end of file
diff --git a/volumes/castlesinairano00frangoog/metadata.json b/volumes/castlesinairano00frangoog/metadata.json
index 3728661..2692e1f 100644
--- a/volumes/castlesinairano00frangoog/metadata.json
+++ b/volumes/castlesinairano00frangoog/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "a5538f1d45094c5543f359e9460eca052a0f1382",
  "extra_info": {
-  "date": 1842,
-  "publisher": "Leipzig: Bernh. Tauchnitz Jun."
+  "publisher": "Leipzig: Bernh. Tauchnitz Jun.",
+  "date": 1842
  }
 }
\ No newline at end of file
diff --git a/volumes/colburnsmodernn00morggoog/metadata.json b/volumes/colburnsmodernn00morggoog/metadata.json
index 5481684..15e8131 100644
--- a/volumes/colburnsmodernn00morggoog/metadata.json
+++ b/volumes/colburnsmodernn00morggoog/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "a0500498019822b2ab7344cce9bb27e84694597f",
  "extra_info": {
-  "date": 1835,
-  "publisher": "London: Henry Colburn"
+  "publisher": "London: Henry Colburn",
+  "date": 1835
  }
 }
\ No newline at end of file
diff --git a/volumes/destinyorchiefsd01ferr/metadata.json b/volumes/destinyorchiefsd01ferr/metadata.json
index a565a65..761942d 100644
--- a/volumes/destinyorchiefsd01ferr/metadata.json
+++ b/volumes/destinyorchiefsd01ferr/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "299b7bc23b319ab3f2aeb9ecfbe14b3fcd190c45",
  "extra_info": {
-  "date": 1882,
   "note": "Edinburgh edition.",
-  "publisher": "London : R. Bentley"
+  "publisher": "London : R. Bentley",
+  "date": 1882
  }
 }
\ No newline at end of file
diff --git a/volumes/destinyorchiefsd02ferr/metadata.json b/volumes/destinyorchiefsd02ferr/metadata.json
index ddd3e47..d18cf7b 100644
--- a/volumes/destinyorchiefsd02ferr/metadata.json
+++ b/volumes/destinyorchiefsd02ferr/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "9e4b49de462985f47489ed31608de840c60e8382",
  "extra_info": {
-  "date": 1882,
   "note": "Edinburgh edition.",
-  "publisher": "London : R. Bentley"
+  "publisher": "London : R. Bentley",
+  "date": 1882
  }
 }
\ No newline at end of file
diff --git a/volumes/florencemacarthy01morg_0/metadata.json b/volumes/florencemacarthy01morg_0/metadata.json
index e7730cf..56098fc 100644
--- a/volumes/florencemacarthy01morg_0/metadata.json
+++ b/volumes/florencemacarthy01morg_0/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "66b6afd63d6e7f5efa008f96c8f5f9e1d069d045",
  "extra_info": {
-  "date": 1819,
-  "note": "Fourth edition",
-  "publisher": "London: Henry Colburn"
+  "note": "'Fourth edition.'",
+  "publisher": "London: Henry Colburn",
+  "date": 1819
  }
 }
\ No newline at end of file
diff --git a/volumes/florencemacarthy02morg_0/metadata.json b/volumes/florencemacarthy02morg_0/metadata.json
index 6dd5f19..f8878af 100644
--- a/volumes/florencemacarthy02morg_0/metadata.json
+++ b/volumes/florencemacarthy02morg_0/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "de3a72ba1b67555f4307707de6d78d662e0aed1d",
  "extra_info": {
-  "date": 1819,
-  "note": "Fourth edition",
-  "publisher": "London: Henry Colburn"
+  "note": "'Fourth edition.'",
+  "publisher": "London: Henry Colburn",
+  "date": 1819
  }
 }
\ No newline at end of file
diff --git a/volumes/florencemacarthy03morg_0/metadata.json b/volumes/florencemacarthy03morg_0/metadata.json
index af87bf9..3022d3e 100644
--- a/volumes/florencemacarthy03morg_0/metadata.json
+++ b/volumes/florencemacarthy03morg_0/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "a3e00cfc4391c19977cd17d9ac0ae2e42f44cece",
  "extra_info": {
-  "date": 1819,
-  "note": "Fourth edition",
-  "publisher": "London: Henry Colburn"
+  "note": "'Fourth edition.'",
+  "publisher": "London: Henry Colburn",
+  "date": 1819
  }
 }
\ No newline at end of file
diff --git a/volumes/florencemacarthy04morg_0/metadata.json b/volumes/florencemacarthy04morg_0/metadata.json
index f93e4ae..aff5221 100644
--- a/volumes/florencemacarthy04morg_0/metadata.json
+++ b/volumes/florencemacarthy04morg_0/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "d9a565da545bc7183ebc1f09f86e6e2f6b4a854e",
  "extra_info": {
-  "date": 1819,
-  "note": "Fourth edition",
-  "publisher": "London: Henry Colburn"
+  "note": "'Fourth edition.'",
+  "publisher": "London: Henry Colburn",
+  "date": 1819
  }
 }
\ No newline at end of file
diff --git a/volumes/gilbertgurney00hookuoft/metadata.json b/volumes/gilbertgurney00hookuoft/metadata.json
index 380c49c..05dc14e 100644
--- a/volumes/gilbertgurney00hookuoft/metadata.json
+++ b/volumes/gilbertgurney00hookuoft/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "9f01b459840abb2fb247314a6629a1dec4161f57",
  "extra_info": {
-  "date": 1841,
-  "publisher": "London : R. Bentley ; Edinburgh : Bell and Bradfute"
+  "publisher": "London : R. Bentley ; Edinburgh : Bell and Bradfute",
+  "date": 1841
  }
 }
\ No newline at end of file
diff --git a/volumes/glenarvon01lambc/metadata.json b/volumes/glenarvon01lambc/metadata.json
index ffe6be8..eec0033 100644
--- a/volumes/glenarvon01lambc/metadata.json
+++ b/volumes/glenarvon01lambc/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "2711d142a06d040a2ca8e46ec58dfe84ee8b6d9d",
  "extra_info": {
-  "date": 1816,
-  "note": "'Third edition.' Roman \u00e0 clef about author's relationship with Lord Byron.",
-  "publisher": "London: Henry Colburn"
+  "note": "'Third edition.' Roman à clef about author's relationship with Lord Byron.",
+  "publisher": "London: Henry Colburn",
+  "date": 1816
  }
 }
\ No newline at end of file
diff --git a/volumes/glenarvon02lambc/metadata.json b/volumes/glenarvon02lambc/metadata.json
index a9223e3..b9043ab 100644
--- a/volumes/glenarvon02lambc/metadata.json
+++ b/volumes/glenarvon02lambc/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "40d2491e07dd2f1c71413b65bc551804cb93b0f3",
  "extra_info": {
-  "date": 1816,
-  "note": "'Third edition.' Roman \u00e0 clef about author's relationship with Lord Byron.",
-  "publisher": "London: Henry Colburn"
+  "note": "'Third edition.' Roman à clef about author's relationship with Lord Byron.",
+  "publisher": "London: Henry Colburn",
+  "date": 1816
  }
 }
\ No newline at end of file
diff --git a/volumes/glenarvon03lambc/metadata.json b/volumes/glenarvon03lambc/metadata.json
index 12671f6..be047ea 100644
--- a/volumes/glenarvon03lambc/metadata.json
+++ b/volumes/glenarvon03lambc/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "e7158c596fcf05fc02c34482badca62b3fdaa1ea",
  "extra_info": {
-  "date": 1816,
-  "note": "'Third edition.' Roman \u00e0 clef about author's relationship with Lord Byron.",
-  "publisher": "London: Henry Colburn"
+  "note": "'Third edition.' Roman à clef about author's relationship with Lord Byron.",
+  "publisher": "London: Henry Colburn",
+  "date": 1816
  }
 }
\ No newline at end of file
diff --git a/volumes/godolphin00lyttrich/metadata.json b/volumes/godolphin00lyttrich/metadata.json
index 5f4951b..d19748a 100644
--- a/volumes/godolphin00lyttrich/metadata.json
+++ b/volumes/godolphin00lyttrich/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "47253fdaf91b0d0eeb29454bf134a76c305a0843",
  "extra_info": {
-  "date": 1892,
-  "publisher": "Boston: Estes and Lauriat"
+  "publisher": "Boston: Estes and Lauriat",
+  "date": 1892
  }
 }
\ No newline at end of file
diff --git a/volumes/inheritance01ferruoft/metadata.json b/volumes/inheritance01ferruoft/metadata.json
index 74c42ea..e870201 100644
--- a/volumes/inheritance01ferruoft/metadata.json
+++ b/volumes/inheritance01ferruoft/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "c5813c9854424a872ef816b35fad4b6fb0b6b9ce",
  "extra_info": {
-  "date": 1882,
-  "publisher": "London: R. Bentley"
+  "publisher": "London: R. Bentley",
+  "date": 1882
  }
 }
\ No newline at end of file
diff --git a/volumes/inheritance02ferruoft/metadata.json b/volumes/inheritance02ferruoft/metadata.json
index d570ed8..6d70f60 100644
--- a/volumes/inheritance02ferruoft/metadata.json
+++ b/volumes/inheritance02ferruoft/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "fa88ea823d97679ece64bf339ddda15237f5deae",
  "extra_info": {
-  "date": 1882,
-  "publisher": "London: R. Bentley"
+  "publisher": "London: R. Bentley",
+  "date": 1882
  }
 }
\ No newline at end of file
diff --git a/volumes/owencastleorwhic01sull/metadata.json b/volumes/owencastleorwhic01sull/metadata.json
index 1f424a8..29440d9 100644
--- a/volumes/owencastleorwhic01sull/metadata.json
+++ b/volumes/owencastleorwhic01sull/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "73cc3096fc3b240f2ff33c91e816ec13a78da015",
  "extra_info": {
-  "date": 1823,
   "note": "Second edition",
-  "publisher": "London: A.K. Newman and Co."
+  "publisher": "London: A.K. Newman and Co.",
+  "date": 1823
  }
 }
\ No newline at end of file
diff --git a/volumes/owencastleorwhic02sull/metadata.json b/volumes/owencastleorwhic02sull/metadata.json
index b74f34c..fcd0a83 100644
--- a/volumes/owencastleorwhic02sull/metadata.json
+++ b/volumes/owencastleorwhic02sull/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "be31b988ca25f315a2f8819ba6ee8da396bb3370",
  "extra_info": {
-  "date": 1823,
   "note": "Second edition",
-  "publisher": "London: A.K. Newman and Co."
+  "publisher": "London: A.K. Newman and Co.",
+  "date": 1823
  }
 }
\ No newline at end of file
diff --git a/volumes/owencastleorwhic03sull/metadata.json b/volumes/owencastleorwhic03sull/metadata.json
index bd59b43..ccea353 100644
--- a/volumes/owencastleorwhic03sull/metadata.json
+++ b/volumes/owencastleorwhic03sull/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "dfe88b1d38b8b6ce60f2f7b1fafe6ce0ad72e99e",
  "extra_info": {
-  "date": 1823,
   "note": "Second edition",
-  "publisher": "London: A.K. Newman and Co."
+  "publisher": "London: A.K. Newman and Co.",
+  "date": 1823
  }
 }
\ No newline at end of file
diff --git a/volumes/owencastleorwhic04sull/metadata.json b/volumes/owencastleorwhic04sull/metadata.json
index 196feb2..b868e9d 100644
--- a/volumes/owencastleorwhic04sull/metadata.json
+++ b/volumes/owencastleorwhic04sull/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "02a324f7d1125a5c2df2814fec6795fddb44ce8e",
  "extra_info": {
-  "date": 1823,
   "note": "Second edition",
-  "publisher": "London: A.K. Newman and Co."
+  "publisher": "London: A.K. Newman and Co.",
+  "date": 1823
  }
 }
\ No newline at end of file
diff --git a/volumes/posthumousrecor00caungoog/metadata.json b/volumes/posthumousrecor00caungoog/metadata.json
index e8b8c2c..fe86d3a 100644
--- a/volumes/posthumousrecor00caungoog/metadata.json
+++ b/volumes/posthumousrecor00caungoog/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "bbb6c69f7097dd867d2ef9315ee3c5820c739e92",
  "extra_info": {
-  "date": 1836,
-  "publisher": "New York : Leavitt, Lord & Co."
+  "publisher": "New York : Leavitt, Lord & Co.",
+  "date": 1836
  }
 }
\ No newline at end of file
diff --git a/volumes/princessorbguine00morg/metadata.json b/volumes/princessorbguine00morg/metadata.json
index 63a1756..3214fbf 100644
--- a/volumes/princessorbguine00morg/metadata.json
+++ b/volumes/princessorbguine00morg/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "d402540e5ba86fea2ab8337dd854220ad4d1bc8b",
  "extra_info": {
-  "date": 1835,
   "note": "Publisher is in Brussels. In one volume.",
-  "publisher": "Brussels: Ad. Wahlen"
+  "publisher": "Brussels: Ad. Wahlen",
+  "date": 1835
  }
 }
\ No newline at end of file
diff --git a/volumes/talesofpeerageth00sulluoft/metadata.json b/volumes/talesofpeerageth00sulluoft/metadata.json
index ea84d27..2ffdeca 100644
--- a/volumes/talesofpeerageth00sulluoft/metadata.json
+++ b/volumes/talesofpeerageth00sulluoft/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "03844ffc118d2efef75b764686e38924eac1aad3",
  "extra_info": {
-  "date": 1849,
-  "publisher": "London : R. Bentley ; Edinburgh : Bell and Bradfute"
+  "publisher": "London : R. Bentley ; Edinburgh : Bell and Bradfute",
+  "date": 1849
  }
 }
\ No newline at end of file
diff --git a/volumes/venetia00disriala/metadata.json b/volumes/venetia00disriala/metadata.json
index a5d3d7e..af33a98 100644
--- a/volumes/venetia00disriala/metadata.json
+++ b/volumes/venetia00disriala/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "9f8e470114189b4dc996b3776f60b9fc7ee2ce8c",
  "extra_info": {
-  "date": 1871,
-  "publisher": "London: Longmans, Green, and Co."
+  "publisher": "London: Longmans, Green, and Co.",
+  "date": 1871
  }
 }
\ No newline at end of file
diff --git a/volumes/viviangrey00disrrich/metadata.json b/volumes/viviangrey00disrrich/metadata.json
index 407274a..b8cc8fd 100644
--- a/volumes/viviangrey00disrrich/metadata.json
+++ b/volumes/viviangrey00disrrich/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "2d2db726d7591261f92915b161d32fd5ec266177",
  "extra_info": {
-  "date": 1859,
-  "publisher": "London : Routledge, Warnes, and Routledge"
+  "publisher": "London : Routledge, Warnes, and Routledge",
+  "date": 1859
  }
 }
\ No newline at end of file
diff --git a/volumes/widowandmarquess00hookuoft/metadata.json b/volumes/widowandmarquess00hookuoft/metadata.json
index 1826f69..9f3de34 100644
--- a/volumes/widowandmarquess00hookuoft/metadata.json
+++ b/volumes/widowandmarquess00hookuoft/metadata.json
@@ -7,7 +7,7 @@
  "date_updated": "2014-12-19",
  "sha1": "48c5f5d3f2d611e9b79b80c374f539bdf96df32b",
  "extra_info": {
-  "date": 1842,
-  "publisher": "London: Richard Bentley"
+  "publisher": "London: Richard Bentley",
+  "date": 1842
  }
 }
\ No newline at end of file
diff --git a/volumes/womanoridaathen01sydgoog/metadata.json b/volumes/womanoridaathen01sydgoog/metadata.json
index 7380cb5..666d227 100644
--- a/volumes/womanoridaathen01sydgoog/metadata.json
+++ b/volumes/womanoridaathen01sydgoog/metadata.json
@@ -7,8 +7,8 @@
  "date_updated": "2014-12-19",
  "sha1": "837f8b252dfa7db54da753df5f4c60f271d40756",
  "extra_info": {
-  "date": 1809,
   "note": "American edition. Contains volumes 1 and 2. Google removed preface.",
-  "publisher": "Philadelphia: Bradford & Inskeep"
+  "publisher": "Philadelphia: Bradford & Inskeep",
+  "date": 1809
  }
 }
\ No newline at end of file