git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
842afa6
)
chapter url handling fixes
author
Niki Roo
<niki@nikiroo.be>
Wed, 13 May 2020 14:18:28 +0000
(16:18 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Wed, 13 May 2020 14:18:28 +0000
(16:18 +0200)
src/be/nikiroo/fanfix/library/WebLibraryServer.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/library/WebLibraryServer.java
b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index b76d8dc100df5de6682e05618de5a0b92768da10..8a874010257072cc93018f92583c1d82620fedfd 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/WebLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/WebLibraryServer.java
@@
-626,7
+626,7
@@
public class WebLibraryServer implements Runnable {
builder.append("<div class='book_line'>");
builder.append("<a href='");
builder.append("<div class='book_line'>");
builder.append("<a href='");
- builder.append(getViewUrl(meta.getLuid(),
0
, null));
+ builder.append(getViewUrl(meta.getLuid(),
null
, null));
builder.append("'");
builder.append(" class='link'>");
builder.append("'");
builder.append(" class='link'>");
@@
-784,7
+784,7
@@
public class WebLibraryServer implements Runnable {
String paragraphStr = cover.length < off + 4 ? null : cover[off + 3];
// 1-based (0 = desc)
String paragraphStr = cover.length < off + 4 ? null : cover[off + 3];
// 1-based (0 = desc)
- int chapter =
-1
;
+ int chapter =
0
;
if (chapterStr != null) {
try {
chapter = Integer.parseInt(chapterStr);
if (chapterStr != null) {
try {
chapter = Integer.parseInt(chapterStr);
@@
-864,9
+864,9
@@
public class WebLibraryServer implements Runnable {
desc.append(story.getMeta().getTitle());
desc.append("</h1>\n");
desc.append("<div class='desc'>\n");
desc.append(story.getMeta().getTitle());
desc.append("</h1>\n");
desc.append("<div class='desc'>\n");
- desc.append("\t<
div
class='cover'>\n");
+ desc.append("\t<
a href='" + next + "'
class='cover'>\n");
desc.append("\t\t<img src='/story/" + luid + "/cover'/>\n");
desc.append("\t\t<img src='/story/" + luid + "/cover'/>\n");
- desc.append("\t</
div
>\n");
+ desc.append("\t</
a
>\n");
desc.append("\t<table class='details'>\n");
Map<String, String> details = BasicLibrary
.getMetaDesc(story.getMeta());
desc.append("\t<table class='details'>\n");
Map<String, String> details = BasicLibrary
.getMetaDesc(story.getMeta());
@@
-970,15
+970,12
@@
public class WebLibraryServer implements Runnable {
// List of chap/para links
// List of chap/para links
- String blink = "/view/story/" + luid + "/";
- appendItemA(builder, 3, blink + "0", "Description",
+ appendItemA(builder, 3, getViewUrl(luid, 0, null), "Description",
paragraph == 0 && chapter == 0);
paragraph == 0 && chapter == 0);
-
if (paragraph > 0) {
if (paragraph > 0) {
- blink = blink + chapter + "/";
for (int i = 1; i <= chap.getParagraphs().size(); i++) {
for (int i = 1; i <= chap.getParagraphs().size(); i++) {
- appendItemA(builder, 3,
blink + i, "Image " + i
,
- paragraph == i);
+ appendItemA(builder, 3,
getViewUrl(luid, chapter, i)
,
+
"Image " + i,
paragraph == i);
}
} else {
int i = 1;
}
} else {
int i = 1;
@@
-988,7
+985,8
@@
public class WebLibraryServer implements Runnable {
chapName += ": " + c.getName();
}
chapName += ": " + c.getName();
}
- appendItemA(builder, 3, blink + i, chapName, chapter == i);
+ appendItemA(builder, 3, getViewUrl(luid, i, null), chapName,
+ chapter == i);
i++;
}
i++;
}
@@
-1064,12
+1062,12
@@
public class WebLibraryServer implements Runnable {
return "";
}
return "";
}
- private String getViewUrl(String luid,
int
chap, Integer para) {
+ private String getViewUrl(String luid,
Integer
chap, Integer para) {
return VIEWER_URL //
.replace("{luid}", luid) //
return VIEWER_URL //
.replace("{luid}", luid) //
- .replace("
{chap}", Integer.toString(chap)
) //
+ .replace("
/{chap}", chap == null ? "" : "/" + chap
) //
.replace("/{para}",
.replace("/{para}",
-
para == null ? "" : "/" + Integer.toString(para)
);
+
(chap == null || para == null) ? "" : "/" + para
);
}
private String getStoryUrl(String luid, int chap, Integer para) {
}
private String getStoryUrl(String luid, int chap, Integer para) {