From 4908dfac99298478dbb6b1189ce1775bd1c0e5eb Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 10 Nov 2020 11:32:11 -0500 Subject: [PATCH 01/21] remove duplicated next link --- templates/site-layout.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/site-layout.html b/templates/site-layout.html index 5912ca0..596c65c 100644 --- a/templates/site-layout.html +++ b/templates/site-layout.html @@ -150,11 +150,6 @@ accesskey="+" href="${os.url_carry (start_index = os.next_page_index)}">Next - | - Next - From 64bd8f608db2fd9cc99efea9801456b5de78433a Mon Sep 17 00:00:00 2001 From: Marshall <363752922@qq.com> Date: Wed, 11 Nov 2020 15:00:52 -0500 Subject: [PATCH 02/21] move footer outsite div --- templates/bibrec.html | 3 +-- templates/results.html | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/bibrec.html b/templates/bibrec.html index 0bfbbbb..f5637d2 100644 --- a/templates/bibrec.html +++ b/templates/bibrec.html @@ -373,10 +373,9 @@ ${site_top()} height="32" alt="RDF/XML Metadata" /> --> - + ${site_footer()} - diff --git a/templates/results.html b/templates/results.html index ca13f82..031ea77 100644 --- a/templates/results.html +++ b/templates/results.html @@ -130,10 +130,9 @@ which contains *all* Project Gutenberg metadata in one RDF/XML file. - + ${site_footer ()} - ${site_top ()} From a96edf9273c55c900a68a5d8ae982432e4ff3ff4 Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 24 Nov 2020 15:57:16 -0500 Subject: [PATCH 03/21] threadlocal removed parameter removed in sqlalchemy 1.4 https://docs.sqlalchemy.org/en/13/core/pooling.html#sqlalchemy.pool.Pool.__init__ --- ConnectionPool.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ConnectionPool.py b/ConnectionPool.py index cdbdd95..8ead47d 100644 --- a/ConnectionPool.py +++ b/ConnectionPool.py @@ -59,8 +59,7 @@ class ConnectionPool (plugins.SimplePlugin): pool_size = pool_size, max_overflow = max_overflow, timeout = timeout, - recycle = recycle, - use_threadlocal = True) + recycle = recycle) def connect (self): From b2f2303cdbdf739eb743b7a9efa175758e30dd68 Mon Sep 17 00:00:00 2001 From: Marshall <363752922@qq.com> Date: Mon, 30 Nov 2020 14:11:24 -0500 Subject: [PATCH 04/21] make 2 version of html for mobile and standard --- templates/bibrec.html | 272 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 270 insertions(+), 2 deletions(-) diff --git a/templates/bibrec.html b/templates/bibrec.html index f5637d2..3a9f074 100644 --- a/templates/bibrec.html +++ b/templates/bibrec.html @@ -84,7 +84,274 @@ ${site_top()}

${os.title}

-
+
+
+ +
+
+ +
+ +
+ Book Cover +
+ +
+
+
No cover available
+
+ +
    +
  • + ${tw_share(os.canonical_url, os.twit)} +
    • +
  • + ${fb_share(os.canonical_url)} +
    • +
  • + +
    • +
+ +
+ +
+
+ +
+
+ + + +
+ +

Download This eBook

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Format ${help ('Format')}UrlSize${help ('Dropbox')}${help ('Google Drive')}${help ('OneDrive')}
${file_.hr_filetype}${file_.url}${file_.hr_extent} + + + + + + +
More Files…${os.qualify (e.base_dir)} +
+
+ + + +
+ +
+ + + +

${e.header}

+ + + +
+ + + + + + ${e.title} + ${e.subtitle} + ${e.extra} + + + +
+ + +
+
+ + + +
+ +

Bibliographic Record ${help (_('Table: Bibliographic Record'))}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${author.role} + ${author.name_and_dates}
${marc.caption} + ${marc.text} + + \1', text) + text = re.sub(r'#(\d+)', r'#\1', text) + ?> + ${ Markup (gg.insert_breaks (text)) } + + ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } + + ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } + + ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } + + ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } +
Language${language.language}${language.language}
LoC Class + ${locc.id}: ${locc.locc} +
Subject + + ${subject.subject} + +
Category${dcmitype.description}
EBook-No.${e.project_gutenberg_id}
Release Date
Copyright Status${e.rights}
Downloads${e.downloads} downloads in the last 30 days.
Price$0.00
+ +
+ + + +
+ + +
+
+ +
@@ -350,7 +617,8 @@ ${site_top()}
-
+
+
@@ -129,8 +130,6 @@ ${site_top()}
-

Download This eBook

- From 18dee4c04e1eb6fd369cedd60effbc74e05486a3 Mon Sep 17 00:00:00 2001 From: Marshall <363752922@qq.com> Date: Tue, 1 Dec 2020 13:55:44 -0500 Subject: [PATCH 06/21] avoid duplicate code for bibrec page update --- templates/bibrec.html | 271 +----------------------------------------- 1 file changed, 4 insertions(+), 267 deletions(-) diff --git a/templates/bibrec.html b/templates/bibrec.html index 6136fde..9a85b7b 100644 --- a/templates/bibrec.html +++ b/templates/bibrec.html @@ -85,272 +85,7 @@ ${site_top()}
-
- -
-
-
- -
- Book Cover -
- -
-
-
No cover available
-
- -
    -
  • - ${tw_share(os.canonical_url, os.twit)} -
    • -
  • - ${fb_share(os.canonical_url)} -
    • -
  • - -
    • -
- -
- -
-

Download This eBook

-
- -
-
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Format ${help ('Format')}UrlSize${help ('Dropbox')}${help ('Google Drive')}${help ('OneDrive')}
${file_.hr_filetype}${file_.url}${file_.hr_extent} - - - - - - -
More Files…${os.qualify (e.base_dir)} -
-
- - - -
- -
- - - -

${e.header}

- - - -
- - - - - - ${e.title} - ${e.subtitle} - ${e.extra} - - - -
- - -
-
- - - -
- -

Bibliographic Record ${help (_('Table: Bibliographic Record'))}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${author.role} - ${author.name_and_dates}
${marc.caption} - ${marc.text} - - \1', text) - text = re.sub(r'#(\d+)', r'#\1', text) - ?> - ${ Markup (gg.insert_breaks (text)) } - - ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } - - ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } - - ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } - - ${ Markup (gg.insert_breaks(gg.xmlspecialchars(marc.text))) } -
Language${language.language}${language.language}
LoC Class - ${locc.id}: ${locc.locc} -
Subject - - ${subject.subject} - -
Category${dcmitype.description}
EBook-No.${e.project_gutenberg_id}
Release Date
Copyright Status${e.rights}
Downloads${e.downloads} downloads in the last 30 days.
Price$0.00
- -
- - - -
- - -
-
- -
@@ -387,8 +122,11 @@ ${site_top()}
- +
+
+
+
@@ -617,7 +355,6 @@ ${site_top()}
-
-
-
-
+
@@ -353,8 +351,10 @@ ${site_top()}
-
+
+
+