Author: jflesch
Date: 2007-03-03 23:34:26 +0000 (Sat, 03 Mar 2007)
New Revision: 11949
Modified:
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/index/File.java
trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
Log:
Fix searching (bug #1105)
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-03-03 22:19:45 UTC
(rev 11948)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-03-03 23:34:26 UTC
(rev 11949)
@@ -140,7 +140,7 @@
thaw.plugin.fetch.pasteFromClipboard=Coller depuis le presse-papier
thaw.plugin.fetch.chooseADestination=Vous devez choisir une destination
-thaw.plugin.console.console=Console
+thaw.plugin.console.console=Console de log
thaw.plugin.console.saveToFile=Sauvegarder les logs dans un fichier
thaw.plugin.console.maxSize=Taille m?moire maximum utilis?e pour m?moriser les
logs (en octets)
Modified: trunk/apps/Thaw/src/thaw/plugins/index/File.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/File.java 2007-03-03 22:19:45 UTC
(rev 11948)
+++ trunk/apps/Thaw/src/thaw/plugins/index/File.java 2007-03-03 23:34:26 UTC
(rev 11949)
@@ -356,7 +356,7 @@
* Note: Do a SQL requests each time
*/
public boolean isModifiable() {
- if (parent != null) {
+ if (parent == null) {
Logger.debug(this, "isModifiable() => new
Index().isModifiable()");
return (new Index(db, parentId)).isModifiable();
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2007-03-03
22:19:45 UTC (rev 11948)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2007-03-03
23:34:26 UTC (rev 11949)
@@ -41,7 +41,7 @@
if (where == null) {
where = " LOWER("+column+") LIKE ?";
} else {
- where = " AND LOWER("+column+") LIKE ?";
+ where+=" AND LOWER("+column+") LIKE ?";
}
}