- discover, pageHomeColumn

1 files changed, 12 insertions, 127 deletions

diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java
index b24164f5..5e24889b 100644
--- a/src/java/com/juick/http/www/Discover.java
+++ b/src/java/com/juick/http/www/Discover.java
@@ -17,20 +17,13 @@
  */
 package com.juick.http.www;
 
-import com.juick.server.AdsQueries;
 import com.juick.server.MessagesQueries;
 import com.juick.server.TagQueries;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import javax.servlet.ServletException;
@@ -43,8 +36,6 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class Discover {
 
-    private String tagsHTML = null;
-
     protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         com.juick.User visitor = Utils.getVisitorUser(sql, request, response);
         Locale locale = request.getLocale();
@@ -57,10 +48,10 @@ public class Discover {
         if (requesturi.startsWith("/tag/")) {
             paramTagStr = URLDecoder.decode(request.getRequestURI().substring(5), "UTF-8");
             paramTag = TagQueries.getTagID(sql, paramTagStr, false);
-            if (paramTag == 0) {
-                response.sendError(404);
-                return;
-            }
+        }
+        if (paramTag == 0) {
+            response.sendError(404);
+            return;
         }
 
         int paramBefore = 0;
@@ -72,93 +63,36 @@ public class Discover {
             }
         }
 
-        String paramSearch = request.getParameter("search");
-        if (paramSearch != null && paramSearch.length() > 64) {
-            paramSearch = null;
-        }
-
         int visitor_uid = visitor != null ? visitor.UID : 0;
 
-        String title;
-        ArrayList<Integer> mids;
-
-        String paramShow = request.getParameter("show");
-        if (paramShow == null) {
-            if (paramTag > 0) {
-                title = "*" + Utils.encodeHTML(paramTagStr);
-                mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore, (visitor == null) ? 40 : 20);
-            } else if (paramSearch != null) {
-                title = rb.getString("Search") + ": " + Utils.encodeHTML(paramSearch);
-                mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore);
-            } else {
-                title = rb.getString("Last messages");
-                mids = MessagesQueries.getAll(sql, visitor_uid, paramBefore);
-            }
-        } else if (paramShow.equals("photos")) {
-            title = rb.getString("With photos");
-            mids = MessagesQueries.getPhotos(sql, visitor_uid, paramBefore);
-        } else {
-            response.sendError(404);
-            return;
-        }
+        String title = "*" + Utils.encodeHTML(paramTagStr);
+        ArrayList<Integer> mids = MessagesQueries.getTag(sql, paramTag, visitor_uid, paramBefore, (visitor == null) ? 40 : 20);
 
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
         try {
             PageTemplates.pageHead(out, title, null);
-            PageTemplates.pageNavigation(out, locale, visitor, paramSearch);
+            PageTemplates.pageNavigation(out, locale, visitor, null);
 
             out.println("<div id=\"topwrapper\">");
             out.println("<div id=\"wrapper\">");
             out.println("<div id=\"content\">");
 
             if (mids.size() > 0) {
-                int ad_mid = 0;
-                if (visitor != null && paramShow == null && paramTag == 0 && paramSearch == null) {
-                    ad_mid = AdsQueries.getAdMID(sql, visitor.UID);
-                    if (ad_mid > 0 && mids.indexOf(ad_mid) == -1) {
-                        mids.add(0, ad_mid);
-                        AdsQueries.logAdMID(sql, visitor.UID, ad_mid);
-                    } else {
-                        ad_mid = 0;
-                    }
-                }
-
                 out.println("<ul>");
-                PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3, ad_mid);
+                PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3, 0);
                 out.println("</ul>");
             }
 
-            if (visitor != null) {
-                if (mids.size() >= 20) {
-                    String nextpage = "?before=" + mids.get(mids.size() - 1);
-                    if (paramShow != null) {
-                        nextpage += "&amp;show=" + paramShow;
-                    }
-                    if (paramSearch != null) {
-                        nextpage += "&amp;search=" + URLEncoder.encode(paramSearch, "UTF-8");
-                    }
-                    out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older →</a></p>");
-                }
-            } else {
-                out.println("<p class=\"page\"><a href=\"/\">" + rb.getString("LoginToReadMore") + "</a></p>");
+            if (mids.size() >= 20) {
+                String nextpage = "?before=" + mids.get(mids.size() - 1);
+                out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older →</a></p>");
             }
             PageTemplates.pageFooter(request, out, locale, visitor, true);
             out.println("</div>");
             out.println("</div>"); // wrapper
 
-            if (tagsHTML == null) {
-                tagsHTML = getTags(sql, 60);
-            }
-
-            out.println("<div id=\"column\" class=\"abs\">");
-            out.println("  <ul>");
-            out.println("    <li><a href=\"/discover\">" + rb.getString("All messages") + "</a></li>");
-            out.println("    <li><a href=\"/discover?show=photos\">" + rb.getString("With photos") + "</a></li>");
-            out.println("  </ul>");
-            out.println("  <hr/>");
-            out.println("  <p>" + tagsHTML + "</p>");
-            out.println("</div>");
+            PageTemplates.pageHomeColumn(out, sql, locale);
 
             out.println("</div>"); // topwrapper
 
@@ -168,53 +102,4 @@ public class Discover {
             out.close();
         }
     }
-
-    private String getTags(Connection sql, int cnt) {
-        String ret = "";
-        com.juick.Tag tags[] = new com.juick.Tag[cnt];
-
-        int maxUsageCnt = 0;
-        PreparedStatement stmt = null;
-        ResultSet rs = null;
-        try {
-            stmt = sql.prepareStatement("SELECT tags.name AS name,COUNT(DISTINCT messages.user_id) AS cnt FROM (messages INNER JOIN messages_tags ON (messages.ts>TIMESTAMPADD(MONTH,-1,NOW()) AND messages.message_id=messages_tags.message_id)) INNER JOIN tags ON messages_tags.tag_id=tags.tag_id WHERE tags.tag_id NOT IN (SELECT tag_id FROM tags_ignore) GROUP BY tags.tag_id ORDER BY cnt DESC LIMIT ?");
-            stmt.setInt(1, cnt);
-            rs = stmt.executeQuery();
-            rs.beforeFirst();
-            cnt = 0;
-            while (rs.next()) {
-                tags[cnt] = new com.juick.Tag();
-                tags[cnt].Name = rs.getString(1);
-                tags[cnt].UsageCnt = rs.getInt(2);
-                if (tags[cnt].UsageCnt > maxUsageCnt) {
-                    maxUsageCnt = tags[cnt].UsageCnt;
-                }
-                cnt++;
-            }
-        } catch (SQLException e) {
-            System.err.println(e);
-        } finally {
-            Utils.finishSQL(rs, stmt);
-        }
-
-        Arrays.sort(tags, 0, cnt);
-
-        for (int i = 0; i < cnt; i++) {
-            String tag = Utils.encodeHTML(tags[i].Name);
-            try {
-                tag = "<a href=\"/tag/" + URLEncoder.encode(tags[i].Name, "UTF-8") + "\">" + tag + "</a>";
-            } catch (UnsupportedEncodingException e) {
-            }
-
-            if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) {
-                ret += "<big>" + tag + "</big> ";
-            } else if (tags[i].UsageCnt > maxUsageCnt / 3) {
-                ret += "<small>" + tag + "</small> ";
-            } else {
-                ret += tag + " ";
-            }
-        }
-
-        return ret;
-    }
 }