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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-05-22 23:32:03 +0000 (Tue, 22 May 2007)
New Revision: 13323

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/Index.java
Log:
Update the index key hardcoded inside Thaw

Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2007-05-22 22:39:15 UTC 
(rev 13322)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java   2007-05-22 23:32:03 UTC 
(rev 13323)
@@ -1373,7 +1373,7 @@

                                        insertLinkSt.execute();
                                } catch(SQLException e) {
-                                       Logger.error(this, "Error while adding 
link : "+e.toString());
+                                       Logger.error(this, "Error while adding 
link to index '"+toString()+"' : "+e.toString());
                                }

                                return;
@@ -1391,6 +1391,8 @@

                                        String key = attrs.getValue("key");
                                        String filename = 
FreenetURIHelper.getFilenameFromKey(key);
+                                       if (filename == null)
+                                               filename = key;
                                        String mime = attrs.getValue("mime");
                                        long size = 
Long.parseLong(attrs.getValue("size"));

@@ -1404,7 +1406,7 @@
                                                insertFileSt.execute();
                                        }
                                } catch(SQLException e) {
-                                       Logger.error(this, "Error while adding 
file: "+e.toString());
+                                       Logger.error(this, "Error while adding 
file to index '"+toString()+"' : "+e.toString());
                                }

                                return;
@@ -1580,7 +1582,9 @@

                                // Parse the input
                                SAXParser saxParser = factory.newSAXParser();
+                               Logger.info(this, "Parsing index ...");
                                saxParser.parse(input, handler );
+                               Logger.info(this, "Parsing done");
                        } catch(javax.xml.parsers.ParserConfigurationException 
e) {
                                Logger.error(this, "Error (1) while parsing 
index: "+e.toString());
                        } catch(org.xml.sax.SAXException e) {