[Thaw-dev] r11209 - trunk/apps/Thaw/src/thaw/plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-03 14:21:39 +0000 (Sun, 03 Dec 2006)
New Revision: 11209

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/Link.java
   trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
Log:
Fix key comparaison problem in SQL query

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Link.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Link.java    2006-12-03 01:32:40 UTC 
(rev 11208)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Link.java    2006-12-03 14:21:39 UTC 
(rev 11209)
@@ -76,7 +76,7 @@
                    || l.getPublicKey().length() < 40)
                        return false;

-               return (l.getPublicKey().substring(0, 
40).equals(getPublicKey().substring(0, 40)));
+               return (l.getPublicKey().substring(4, 
40).equals(getPublicKey().substring(4, 40)));
        }

        public boolean compare(Index l) {
@@ -87,7 +87,7 @@
                    || l.getPublicKey().length() < 40)
                        return false;

-               return (l.getPublicKey().substring(0, 
40).equals(getPublicKey().substring(0, 40)));
+               return (l.getPublicKey().substring(4, 
40).equals(getPublicKey().substring(4, 40)));
        }

        public void setParent(Index index) {
@@ -177,7 +177,7 @@

                        st = db.getConnection().prepareStatement("SELECT 
publicKey from indexes WHERE publicKey LIKE ?");

-                       st.setString(1, key.substring(0, 40)+"%");
+                       st.setString(1, "%"+key.substring(3, 40)+"%");

                        if(st.execute()) {
                                ResultSet result = st.getResultSet();

Modified: trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java        
2006-12-03 01:32:40 UTC (rev 11208)
+++ trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java        
2006-12-03 14:21:39 UTC (rev 11209)
@@ -78,6 +78,9 @@
                        return false;

                for (int i = 0 ; i < linkList.length ; i++) {
+                       if (linkList[i] == null)
+                               continue;
+
                        if (l.compare(linkList[i]))
                                return true;
                }