[Thaw-dev] r11638 - in trunk/apps/Thaw/src/thaw: core plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-01-27 22:51:50 +0000 (Sat, 27 Jan 2007)
New Revision: 11638

Modified:
   trunk/apps/Thaw/src/thaw/core/Core.java
   trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
   trunk/apps/Thaw/src/thaw/plugins/index/Index.java
Log:
Fix file ordering

Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java     2007-01-27 21:44:19 UTC (rev 
11637)
+++ trunk/apps/Thaw/src/thaw/core/Core.java     2007-01-27 22:51:50 UTC (rev 
11638)
@@ -259,7 +259,7 @@
                        if (ret)
                                
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.ready"));
                        else
-                               
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.disconnected"));
+                               
getMainWindow().setStatus(I18n.getMessage("thaw.statusBar.disconnected"), 
java.awt.Color.RED);
                }

                return ret;

Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2007-01-27 
21:44:19 UTC (rev 11637)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2007-01-27 
22:51:50 UTC (rev 11638)
@@ -300,9 +300,9 @@

                public String[] columnNamesInDb =
                {
-                       "filename",
+                       "LOWER(filename)",
                        "size",
-                       "key",
+                       "LOWER(key)",
                        null
                };


Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2007-01-27 21:44:19 UTC 
(rev 11637)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2007-01-27 22:51:50 UTC 
(rev 11638)
@@ -782,8 +782,8 @@
                                                                                
 "FROM files WHERE indexParent = ?");
                                } else {
                                        st = 
db.getConnection().prepareStatement("SELECT id, filename, publicKey, localPath, 
mime, size "+
-                                                                               
 "FROM files WHERE indexParent = ? ORDER by LOWER("+
-                                                                               
 columnToSort + ")"+ (asc == true ? "" : " DESC"));
+                                                                               
 "FROM files WHERE indexParent = ? ORDER by "+
+                                                                               
 columnToSort + (asc == true ? "" : " DESC"));
                                }

                                st.setInt(1, id);