diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java
index 771a4b2ee..39782c651 100644
--- a/htroot/SettingsAck_p.java
+++ b/htroot/SettingsAck_p.java
@@ -372,8 +372,8 @@ public class SettingsAck_p {
* ==================================================================== */
env.setConfig("remoteProxyHost", remoteProxyHost);
env.setConfig("remoteProxyPort", Integer.toString(remoteProxyPort));
- env.getConfig("remoteProxyUser", remoteProxyUser);
- env.getConfig("remoteProxyPwd", remoteProxyPwd);
+ env.setConfig("remoteProxyUser", remoteProxyUser);
+ env.setConfig("remoteProxyPwd", remoteProxyPwd);
env.setConfig("remoteProxyNoProxy", remoteProxyNoProxyStr);
env.setConfig("remoteProxyUse", (useRemoteProxy) ? "true" : "false");
env.setConfig("remoteProxyUse4Yacy", (useRemoteProxy4Yacy) ? "true" : "false");
diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html
index 7214847c6..af86a6480 100644
--- a/htroot/Settings_p.html
+++ b/htroot/Settings_p.html
@@ -194,7 +194,7 @@ All traffic is routed throug one single port, for both proxy and server.
| Remote proxy user: |
- |
+ |
|
diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc
index f03d29e8e..4b561818b 100644
--- a/htroot/Status_p.inc
+++ b/htroot/Status_p.inc
@@ -70,7 +70,7 @@
| Loader Queue |
- #[loaderQueueSize]# | #[loaderQueueMax]# #(loaderPaused)#::(paused)#(/loaderPaused)# #stop.gif::start.gif#(/loaderPaused)#) |
+ #[loaderQueueSize]# | #[loaderQueueMax]# #(loaderPaused)#::(paused)#(/loaderPaused)# |
[Details] |
diff --git a/source/dbtest.java b/source/dbtest.java
index 6ca9046a1..ee84a448e 100644
--- a/source/dbtest.java
+++ b/source/dbtest.java
@@ -4,6 +4,10 @@
import java.io.File;
import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.util.Random;
import de.anomic.server.serverCodings;
@@ -48,7 +52,11 @@ public class dbtest {
}
if (dbe.equals("mysql")) {
- //...
+ table = new dbTable("mysql");
+ }
+
+ if (dbe.equals("pgsql")) {
+ table = new dbTable("pgsql");
}
long afterinit = System.currentTimeMillis();
@@ -66,6 +74,9 @@ public class dbtest {
Random random = new Random(randomstart);
for (int i = 0; i < count; i++) {
table.put(new byte[][]{randomHash(random), dummyvalue});
+ if (i % 500 == 0) {
+ System.out.println(i + " entries processed so far.");
+ }
}
}
@@ -73,13 +84,121 @@ public class dbtest {
// finally close the database/table
if (table instanceof kelondroTree) ((kelondroTree) table).close();
+ if (table instanceof dbTable) ((dbTable)table).closeDatabaseConnection();
long afterclose = System.currentTimeMillis();
System.out.println("Execution time: open=" + (afterinit - startup) + ", command=" + (aftercommand - afterinit) + ", close=" + (afterclose - aftercommand) + ", total=" + (afterclose - startup));
- } catch (IOException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
+}
+
+/*
+ * Commands to create a database using mysql:
+ *
+ * CREATE database yacy;
+ * USE yacy;
+ * CREATE TABLE hash CHAR(12) not null primary key, value BLOB);
+ * insert into user (Host, User, Password) values ('%','yacy',password('yacy'));
+ * insert into db (User, Db, Select_priv, Insert_priv, Update_priv, Delete_priv) values ('yacy@%','yacy','Y','Y','Y','Y')
+ * grant ALL on yacy.* to yacy;
+ */
+final class dbTable implements kelondroIndex {
+
+
+
+ private final String db_driver_str_mysql = "org.gjt.mm.mysql.Driver";
+ private final String db_driver_str_pgsql = "org.postgresql.Driver";
+
+ private final String db_conn_str_mysql = "jdbc:mysql://192.168.0.2:3306/yacy";
+ private final String db_conn_str_pgsql = "jdbc:postgresql://192.168.0.2:5432";
+
+ private final String db_usr_str = "yacy";
+ private final String db_pwd_str = "yacy";
+
+ private Connection theDBConnection = null;
+ private PreparedStatement sqlStatement;
+ private int commandCount = 0;
+ private int batchlimit = 1;
+
+ public dbTable(String dbType) throws Exception {
+ openDatabaseConnection(dbType);
+ }
+
+ private void openDatabaseConnection(String dbType) throws Exception{
+ try {
+ if (dbType == null) throw new IllegalArgumentException();
+
+ String dbDriverStr = null, dbConnStr = null;
+ if (dbType.equalsIgnoreCase("mysql")) {
+ dbDriverStr = db_driver_str_mysql;
+ dbConnStr = db_conn_str_mysql;
+ } else if (dbType.equalsIgnoreCase("pgsql")) {
+ dbDriverStr = db_driver_str_pgsql;
+ dbConnStr = db_conn_str_pgsql;
+ }
+
+ Class.forName(dbDriverStr).newInstance();
+
+ this.theDBConnection = DriverManager.getConnection (dbConnStr,this.db_usr_str,this.db_pwd_str);
+
+ String sqlQuery = new String
+ (
+ "INSERT INTO test (" +
+ "hash, " +
+ "value) " +
+ "VALUES (?,?)"
+ );
+
+ this.sqlStatement = this.theDBConnection.prepareStatement(sqlQuery);
+
+ } catch (Exception e) {
+ throw new Exception ("Unable to establish a database connection.");
+ }
+
+ }
+
+ public void closeDatabaseConnection() throws Exception {
+ try {
+ if (commandCount != 0) {
+ sqlStatement.executeBatch();
+ }
+
+ sqlStatement.close();
+
+ this.theDBConnection.close();
+ } catch (Exception e) {
+ throw new Exception ("Unable to close the database connection.");
+ }
+ }
+
+
+ public byte[][] get(byte[] key) throws IOException {
+ return null;
+ }
+
+ public byte[][] put(byte[][] row) throws IOException {
+ try {
+ this.sqlStatement.setString(1,new String(row[0]));
+ sqlStatement.setBytes(2,row[1]);
+ sqlStatement.addBatch();
+ commandCount++;
+
+ if (commandCount >= batchlimit) {
+ sqlStatement.executeBatch();
+ }
+
+ return row;
+ } catch (Exception e) {
+ throw new IOException(e.getMessage());
+ }
+ }
+
+ public byte[][] remove(byte[] key) throws IOException {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/source/de/anomic/http/httpc.java b/source/de/anomic/http/httpc.java
index 45a13b72a..026219b74 100644
--- a/source/de/anomic/http/httpc.java
+++ b/source/de/anomic/http/httpc.java
@@ -660,7 +660,7 @@ public final class httpc {
String remoteProxyUser = this.remoteProxyConfig.getProxyUser();
String remoteProxyPwd = this.remoteProxyConfig.getProxyPwd();
if ((remoteProxyUser!=null)&&(remoteProxyUser.length()>0)) {
- header.put(httpHeader.PROXY_AUTHORIZATION,serverCodings.standardCoder.encodeBase64String(remoteProxyUser + ":" + remoteProxyPwd));
+ header.put(httpHeader.PROXY_AUTHORIZATION,"Basic " + serverCodings.standardCoder.encodeBase64String(remoteProxyUser + ":" + remoteProxyPwd));
}
}
diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java
index 2e1af9294..e512a3b46 100644
--- a/source/de/anomic/plasma/plasmaSwitchboard.java
+++ b/source/de/anomic/plasma/plasmaSwitchboard.java
@@ -772,6 +772,9 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
return false; // nothing to do
}
+ // if we were interrupted we should return now
+ if (Thread.currentThread().isInterrupted()) return false;
+
// do one processing step
log.logFine("DEQUEUE: sbQueueSize=" + sbQueue.size() +
", coreStackSize=" + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE) +
@@ -781,16 +784,16 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
try {
nextentry = sbQueue.pop();
if (nextentry == null) return false;
-
- synchronized (this.indexingTasksInProcess) {
- this.indexingTasksInProcess.put(nextentry.urlHash(),nextentry);
- }
-
} catch (IOException e) {
log.logSevere("IOError in plasmaSwitchboard.deQueue: " + e.getMessage(), e);
return false;
}
}
+
+ synchronized (this.indexingTasksInProcess) {
+ this.indexingTasksInProcess.put(nextentry.urlHash(),nextentry);
+ }
+
processResourceStack(nextentry);
return true;
}