Author: jflesch
Date: 2007-10-28 18:33:01 +0000 (Sun, 28 Oct 2007)
New Revision: 15623
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigTab.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
Log:
Make the spam protection on the indexes disabled by default (too annoying)
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-10-28 15:06:26 UTC
(rev 15622)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-10-28 18:33:01 UTC
(rev 15623)
@@ -631,7 +631,7 @@
successful = true;
finished = true;
running = false;
-
+
startupTime =
Long.valueOf(msg.getValue("StartupTime")).longValue();
completionTime =
Long.valueOf(msg.getValue("CompletionTime")).longValue();
publicKey = msg.getValue("URI");
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-10-28
15:06:26 UTC (rev 15622)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-10-28
18:33:01 UTC (rev 15623)
@@ -390,7 +390,7 @@
thaw.plugin.index.mustReinsert=Vous devez r?inserer l'index pour que les
changements fassent effet
-thaw.plugin.index.fetchNegative=Toujours t?l?charger les derni?res versions
des indexes ? chaque rafraichissement
+thaw.plugin.index.fetchNegative=Toujours t?l?charger les derni?res versions
des indexes avant de charger les commentaires
thaw.plugin.index.fetchComments=R?cup?rer les commentaires
thaw.plugin.index.warningNonNegative=Attention ! T?l?charger les commentaires
sans avoir la derni?re version de l'index peut vous faire t?l?charger des spams
!
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-10-28 15:06:26 UTC
(rev 15622)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-10-28 18:33:01 UTC
(rev 15623)
@@ -399,7 +399,7 @@
thaw.plugin.index.comment.failed=Comment sending has failed. Retry ?
-thaw.plugin.index.fetchNegative=Always download the latest versions of the
indexes at each refresh
+thaw.plugin.index.fetchNegative=Always download the latest versions of the
indexes before downloading the comments
thaw.plugin.index.fetchComments=Fetch the comments
thaw.plugin.index.warningNonNegative=Warning ! Downloading comments without
having the latest versions of the indexes may result in receiving spams !
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-10-28 15:06:26 UTC
(rev 15622)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-10-28 18:33:01 UTC
(rev 15623)
@@ -390,7 +390,7 @@
thaw.plugin.index.mustReinsert=Vous devez r\u00e9inserer l'index pour que les
changements fassent effet
-thaw.plugin.index.fetchNegative=Toujours t\u00e9l\u00e9charger les
derni\u00e8res versions des indexes \u00e0 chaque rafraichissement
+thaw.plugin.index.fetchNegative=Toujours t\u00e9l\u00e9charger les
derni\u00e8res versions des indexes avant de charger les commentaires
thaw.plugin.index.fetchComments=R\u00e9cup\u00e9rer les commentaires
thaw.plugin.index.warningNonNegative=Attention ! T\u00e9l\u00e9charger les
commentaires sans avoir la derni\u00e8re version de l'index peut vous faire
t\u00e9l\u00e9charger des spams !
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-10-28 15:06:26 UTC
(rev 15622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-10-28 18:33:01 UTC
(rev 15623)
@@ -798,7 +798,7 @@
private boolean rewriteKey = true;
private FCPQueueManager queueManager;
private boolean fetchingNegRev = false;
- private boolean mustFetchNegRev = true;
+ private boolean mustFetchNegRev = false;
private int specificRev = 0;
public int downloadFromFreenet(Observer o, IndexTree tree,
FCPQueueManager queueManager, int specificRev) {
@@ -807,7 +807,7 @@
rewriteKey = true;
fetchingNegRev = false;
- mustFetchNegRev = true;
+ mustFetchNegRev = false;
if (config != null && config.getValue("indexFetchNegative") !=
null)
mustFetchNegRev =
Boolean.valueOf(config.getValue("indexFetchNegative")).booleanValue();
@@ -1426,7 +1426,7 @@
public void forceFlagsReload() {
- Logger.debug(this, "forceReload() => loadData()");
+ Logger.verbose(this, "forceReload() => loadData()");
loadData();
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigTab.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigTab.java 2007-10-28
15:06:26 UTC (rev 15622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigTab.java 2007-10-28
18:33:01 UTC (rev 15623)
@@ -123,7 +123,7 @@
int refreshIntervalInt = AutoRefresh.DEFAULT_INTERVAL;
int nmbIndexInt = AutoRefresh.DEFAULT_INDEX_NUMBER;
boolean loadOnTheFlyBoolean = false;
- boolean fetchNegativeBoolean = true;
+ boolean fetchNegativeBoolean = false;
boolean fetchCommentsBoolean = true;
try {
@@ -196,19 +196,23 @@
}
if (e.getSource() == editBlackList) {
- indexBrowser.getBlackList().displayPanel();
- configWindow.close();
- return;
+ indexBrowser.getBlackList().displayPanel();
+ configWindow.close();
+ return;
}
if (e.getSource() == fetchComments
|| e.getSource() == fetchNegative) {
+
+ /*
if (!fetchNegative.isSelected()
&& fetchComments.isSelected()) {
new WarningWindow(configWindow.getFrame(),
I18n.getMessage("thaw.plugin.index.warningNonNegative"));
}
- return;
+ */
+
+ return;
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-10-28 15:06:26 UTC (rev 15622)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-10-28 18:33:01 UTC (rev 15623)
@@ -811,12 +811,12 @@
unsignedStr = " AND frostKSKMessages.sigId IS NOT NULL
AND signatures.trustLevel >= ?";
String query = "SELECT count(frostKSKMessages.id) "+
- "FROM frostKSKMessages LEFT JOIN signatures "+
- " ON frostKSKMessages.sigId = signatures.id "+
- "WHERE frostKSKMessages.boardId = ? "+
- "AND frostKSKMessages.read = FALSE"+
- archivedStr+
- unsignedStr;
+ "FROM frostKSKMessages LEFT JOIN signatures "+
+ " ON frostKSKMessages.sigId = signatures.id "+
+ "WHERE frostKSKMessages.boardId = ? "+
+ "AND frostKSKMessages.read = FALSE"+
+ archivedStr+
+ unsignedStr;
try {
PreparedStatement subSt;
@@ -833,11 +833,7 @@
} catch(SQLException e) {
Logger.error(db, "Can't count the number of new message
on the board "+
"'"+boardName+"'because : "+e.toString());
-
- /* usually, this exception come from hsqldb itself (Out
of Memory exception)
- * so a stack trace may be interresting here
- */
- e.printStackTrace();
+ Logger.error(db, "The query was: "+query);
}
return count;
