From e773a29f291b5202ea0ac9046ae2a78bf45c9820 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Wed, 1 Sep 2021 22:12:17 +0400
Subject: [PATCH] Rearranged elements in OPDS entry XML

---
 static/templates/catalog_entries.xml           | 2 +-
 static/templates/catalog_v2_complete_entry.xml | 2 +-
 static/templates/catalog_v2_entries.xml        | 2 +-
 test/server.cpp                                | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/templates/catalog_entries.xml b/static/templates/catalog_entries.xml
index a0e6cf090..144f68bf8 100644
--- a/static/templates/catalog_entries.xml
+++ b/static/templates/catalog_entries.xml
@@ -13,9 +13,9 @@
   <entry>
     <id>urn:uuid:{{id}}</id>
     <title>{{title}}</title>
+    <updated>{{updated}}</updated>
     <summary>{{description}}</summary>
     <language>{{language}}</language>
-    <updated>{{updated}}</updated>
     <name>{{name}}</name>
     <flavour>{{flavour}}</flavour>
     <category>{{category}}</category>
diff --git a/static/templates/catalog_v2_complete_entry.xml b/static/templates/catalog_v2_complete_entry.xml
index cd4abe5f2..76335a3f6 100644
--- a/static/templates/catalog_v2_complete_entry.xml
+++ b/static/templates/catalog_v2_complete_entry.xml
@@ -2,9 +2,9 @@
   <entry>
     <id>urn:uuid:{{id}}</id>
     <title>{{title}}</title>
+    <updated>{{updated}}</updated>
     <summary>{{description}}</summary>
     <language>{{language}}</language>
-    <updated>{{updated}}</updated>
     <name>{{name}}</name>
     <flavour>{{flavour}}</flavour>
     <category>{{category}}</category>
diff --git a/static/templates/catalog_v2_entries.xml b/static/templates/catalog_v2_entries.xml
index 356d3d7b1..451e3b342 100644
--- a/static/templates/catalog_v2_entries.xml
+++ b/static/templates/catalog_v2_entries.xml
@@ -25,9 +25,9 @@
   <entry>
     <id>urn:uuid:{{id}}</id>
     <title>{{title}}</title>
+    <updated>{{updated}}</updated>
     <summary>{{description}}</summary>
     <language>{{language}}</language>
-    <updated>{{updated}}</updated>
     <name>{{name}}</name>
     <flavour>{{flavour}}</flavour>
     <category>{{category}}</category>
diff --git a/test/server.cpp b/test/server.cpp
index 6094e5646..eebae7338 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -618,9 +618,9 @@ std::string maskVariableOPDSFeedData(std::string s)
     "  <entry>\n"                                                       \
     "    <id>urn:uuid:charlesray</id>\n"                                \
     "    <title>Charles, Ray</title>\n"                                 \
+    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
     "    <summary>Wikipedia articles about Ray Charles</summary>\n"     \
     "    <language>fra</language>\n"                                    \
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
     "    <name>wikipedia_fr_ray_charles</name>\n"                       \
     "    <flavour></flavour>\n"                                         \
     "    <category>jazz</category>\n"                                   \
@@ -644,9 +644,9 @@ std::string maskVariableOPDSFeedData(std::string s)
     "  <entry>\n"                                                       \
     "    <id>urn:uuid:raycharles</id>\n"                                \
     "    <title>Ray Charles</title>\n"                                  \
+    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
     "    <summary>Wikipedia articles about Ray Charles</summary>\n"     \
     "    <language>eng</language>\n"                                    \
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
     "    <name>wikipedia_en_ray_charles</name>\n"                       \
     "    <flavour></flavour>\n"                                         \
     "    <category>wikipedia</category>\n"                              \
@@ -670,9 +670,9 @@ std::string maskVariableOPDSFeedData(std::string s)
     "  <entry>\n"                                                       \
     "    <id>urn:uuid:raycharles_uncategorized</id>\n"                  \
     "    <title>Ray (uncategorized) Charles</title>\n"                  \
+    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
     "    <summary>No category is assigned to this library entry.</summary>\n" \
     "    <language>rus</language>\n"                                    \
-    "    <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"                     \
     "    <name>wikipedia_ru_ray_charles</name>\n"                       \
     "    <flavour></flavour>\n"                                         \
     "    <category></category>\n"                                \