[freenet-cvs] r8164 - trunk/plugins/Librarian

[cybe...@freenetproject.org]

Author: cyberdo
Date: 2006-03-04 23:47:05 +0000 (Sat, 04 Mar 2006)
New Revision: 8164

Modified:
   trunk/plugins/Librarian/Librarian.java
Log:
Some changes to fit with FRED and beautify the GUI


Modified: trunk/plugins/Librarian/Librarian.java
===================================================================
--- trunk/plugins/Librarian/Librarian.java      2006-03-04 22:02:57 UTC (rev 
8163)
+++ trunk/plugins/Librarian/Librarian.java      2006-03-04 23:47:05 UTC (rev 
8164)
@@ -146,7 +146,8 @@

                if (search.equals("")) {
                        appendDefaultPageStart(out);
-                       appendDefaultPostFields(out);
+                       //appendDefaultPostFields(out);
+                       appendDefaultPostFields(out, search, indexuri);
                        appendDefaultPageEnd(out);
                        return out.toString();
                }
@@ -170,13 +171,13 @@
                        HashMap index = getFullIndex(indexuri);

                        appendDefaultPageStart(out);
-                       appendDefaultPostFields(out, search.replaceAll("\\+", " 
"), indexuri);
+                       appendDefaultPostFields(out, search, indexuri);

-                       out.append("Searching for: " + search.replaceAll("\\+", 
" ") + "\n");
+                       out.append("Searching for: " + search + "\n");

                        //String searchWords[] = search.replaceAll("%20", 
"+").split("+");
                        // Get search result
-                       String searchWords[] = search.split("\\+");
+                       String searchWords[] = search.split(" ");

                        HashSet hs = new HashSet();
                        { // add all for the first word
@@ -203,9 +204,14 @@
                        out.append("<table><tr>\n");
                        Iterator it = hs.iterator();
                        while (it.hasNext()) {
+                               
                                URIWrapper o = (URIWrapper)it.next();
-                               out.append("<table border=1><tr><td 
align=center bgcolor=\"#D0D0D0\">\n");
-                               out.append("  <A HREF=\"/" + o.URI + "\">" + 
o.URI + "</A>\n");
+                               String showurl = o.URI;
+                               if (showurl.length() > 60)
+                                       showurl = showurl.substring(0,10) + 
"..." + 
+                                       showurl.substring(showurl.length()-45);
+                               out.append("<table width=\"100%\" 
border=1><tr><td align=center bgcolor=\"#D0D0D0\">\n");
+                               out.append("  <A HREF=\"/" + o.URI + "\" 
title=\""+o.URI+"\">" + showurl + "</A>\n");
                                out.append("</td></tr><tr><td align=left>\n");
                                out.append("<pre>" + o.descr + "</pre>\n");
                                out.append("</td></tr></table>\n");