boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

*) added previous/next links to blog (in case blog has more entries than get displayed on one page)

Browse Source 
The blog still has a major problem: entries are displayed in random(?) order if there are several entries in the blog

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4339 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
low012 17 years ago
parent a0f7f2faad
commit 739f35d389
3 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File

32
htroot/Blog.html
Unescape View File

@ -6,14 +6,14 @@
<link rel="alternate" type="application/rss+xml" title="RSS" href="Blog.rss" /> <link rel="alternate" type="application/rss+xml" title="RSS" href="Blog.rss" />
</head> </head>
<body id="Blog"> <body id="Blog">
#(display)# #(display)#
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
#%env/templates/submenuPublication.template%# #%env/templates/submenuPublication.template%#
:: ::
#%env/templates/header.template%# #%env/templates/header.template%#
#%env/templates/submenuPublication.template%# #%env/templates/submenuPublication.template%#
:: ::
#%env/templates/embeddedheader.template%# #%env/templates/embeddedheader.template%#
#(/display)# #(/display)#
#(mode)# #(mode)#
<!-- 0: viewing --> <!-- 0: viewing -->
@ -28,7 +28,21 @@
</p> </p>
</div> </div>
#{/entries}# #{/entries}#
#(moreentries)#::<p class="Navigation"><a href="Blog.html?start=#[start]#&amp;num=#[num]#">show more entries...</a></p>#(/moreentries)# <div class="BlogCommentPrevNext">
<p>
#(preventries)#
&lt;&lt; previous entries
::
<a href="Blog.html?start=#[start]#&amp;num=#[num]#">&lt;&lt; previous entries</a>
#(/preventries)#
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
#(moreentries)#
next entries &gt;&gt;
::
<a href="Blog.html?start=#[start]#&amp;num=#[num]#">next entries &gt;&gt;</a>
#(/moreentries)#
</p>
</div>
<p class="Navigation"> <p class="Navigation">
#(admin)#<a href="Blog.html?login=true">Login</a> - ::<a href="Blog.html?edit=true">new entry</a> - <a href="Blog.html?import=xml">import XML-File</a> - <a href="Blog.xml?xml=1">export as XML</a> - #(/admin)#<a href="Blog.html">Blog-Home</a> #(admin)#<a href="Blog.html?login=true">Login</a> - ::<a href="Blog.html?edit=true">new entry</a> - <a href="Blog.html?import=xml">import XML-File</a> - <a href="Blog.xml?xml=1">export as XML</a> - #(/admin)#<a href="Blog.html">Blog-Home</a>
</p> </p>

18
htroot/Blog.java
Unescape View File

@ -99,11 +99,11 @@ public class Blog {
if (post == null) { if (post == null) {
prop.putHTML("peername", yacyCore.seedDB.mySeed().getName()); prop.putHTML("peername", yacyCore.seedDB.mySeed().getName());
prop.put("address", address); prop.put("address", address);
return putBlogDefault(prop, switchboard, address, 0, 20, hasRights, xml); return putBlogDefault(prop, switchboard, address, 0, 10, hasRights, xml);
} }
final int start = post.getInt("start",0); //indicates from where entries should be shown final int start = post.getInt("start",0); //indicates from where entries should be shown
final int num = post.getInt("num",20); //indicates how many entries should be shown final int num = post.getInt("num",10); //indicates how many entries should be shown
if(!hasRights){ if(!hasRights){
final userDB.Entry userentry = switchboard.userDB.proxyAuth((String)header.get("Authorization", "xxxxxx")); final userDB.Entry userentry = switchboard.userDB.proxyAuth((String)header.get("Authorization", "xxxxxx"));
@ -294,9 +294,12 @@ public class Blog {
try { try {
final Iterator i = switchboard.blogDB.keys(false); final Iterator i = switchboard.blogDB.keys(false);
String pageid; String pageid;
int count = 0; //counts how many entries are shown to the user int count = 0; //counts how many entries are shown to the user
if(xml) num = 0; if(xml) num = 0;
final int nextstart = start+num; //indicates the starting offset for next results final int nextstart = start+num; //indicates the starting offset for next results
int prevstart = start-num; //indicates the starting offset for previous results
boolean prev = false; //indicates if there were previous comments to the ones that are dispalyed
if (start > 0) prev = true;
while(i.hasNext() && (num == 0 || num > count)) { while(i.hasNext() && (num == 0 || num > count)) {
pageid = (String) i.next(); pageid = (String) i.next();
if(0 < start--) continue; if(0 < start--) continue;
@ -317,6 +320,15 @@ public class Blog {
} else { } else {
prop.put("moreentries", "0"); prop.put("moreentries", "0");
} }
if(prev) {
prop.put("mode_preventries", "1");
if (prevstart < 0) prevstart = 0;
prop.put("mode_preventries_start", prevstart);
prop.put("mode_preventries_num", num);
} else prop.put("mode_preventries", "0");
} catch (IOException e) { serverLog.logSevere("BLOG", "Error reading blog-DB", e); } } catch (IOException e) { serverLog.logSevere("BLOG", "Error reading blog-DB", e); }
return prop; return prop;
} }

24
htroot/BlogComments.html
Unescape View File

@ -30,17 +30,19 @@
</div> </div>
#{/entries}# #{/entries}#
<div class="BlogCommentPrevNext"> <div class="BlogCommentPrevNext">
#(preventries)# <p>
&lt;&lt; previous entries #(preventries)#
:: &lt;&lt; previous entries
<a href="BlogComments.html?page=#[pageid]#&amp;start=#[start]#&amp;num=#[num]#">&lt;&lt; previous entries</a> ::
#(/preventries)# <a href="BlogComments.html?page=#[pageid]#&amp;start=#[start]#&amp;num=#[num]#">&lt;&lt; previous entries</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #(/preventries)#
#(moreentries)# &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
next entries &gt;&gt; #(moreentries)#
:: next entries &gt;&gt;
<a href="BlogComments.html?page=#[pageid]#&amp;start=#[start]#&amp;num=#[num]#">next entries &gt;&gt;</a> ::
#(/moreentries)# <a href="BlogComments.html?page=#[pageid]#&amp;start=#[start]#&amp;num=#[num]#">next entries &gt;&gt;</a>
#(/moreentries)#
</p>
</div> </div>
#(allow)# #(allow)#
<fieldset> <fieldset>

Write Preview
Loading…
Cancel
Save