0) ? 1 : 0);
+ prop.put(RESULTS + "useDHTPeers_DHTPeers", i);
+
+ return prop;
}
private static final String MILLISECONDS = "ms";
diff --git a/htroot/TestApplet.java b/htroot/TestApplet.java
index bc6b5a258..921af4bbd 100644
--- a/htroot/TestApplet.java
+++ b/htroot/TestApplet.java
@@ -18,16 +18,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import de.anomic.http.httpHeader;
-import de.anomic.http.httpTemplate;
import de.anomic.http.httpdFileHandler;
import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverByteBuffer;
@@ -56,19 +50,18 @@ public class TestApplet {
}
prop.put("mode", "1");
- File templatefile=filehandler.getOverlayedFile((String)post.get("url"));
+ //File templatefile=filehandler.getOverlayedFile((String)post.get("url"));
File classfile=filehandler.getOverlayedClass((String)post.get("url"));
httpHeader header2=new httpHeader();
header2.put("CLIENTIP", "127.0.0.1");
- header2.put("PATH", (String)post.get("url"));
+ header2.put("PATH", post.get("url"));
serverObjects tp=null;
try {
if(classfile==null || !classfile.exists()){
prop.put("mode_templates", "classfile does not exist");
return prop;
- }else{
- tp=(serverObjects)filehandler.invokeServlet(classfile, header2, args);
}
+ tp=(serverObjects)filehandler.invokeServlet(classfile, header2, args);
}
catch (IllegalArgumentException e) {}
catch (IllegalAccessException e) {}
@@ -87,22 +80,22 @@ public class TestApplet {
tmp.append(key).append("=").append(tp.get(key)).append("\n");
}
prop.put("mode_templates", tmp.toString());
- FileInputStream fis=null;
- try {
- fis=new FileInputStream(templatefile);
+ //FileInputStream fis=null;
+ //try {
+ //fis=new FileInputStream(templatefile);
serverByteBuffer o=new serverByteBuffer();
- byte[] structure=httpTemplate.writeTemplate(fis, (OutputStream)o, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
- prop.put("mode_structure", structure);
+ //byte[] structure=httpTemplate.writeTemplate(fis, o, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
+ //prop.put("mode_structure", structure);
prop.put("mode_text", o.toString());
return prop;
- }
- catch (FileNotFoundException e) {}
- catch (UnsupportedEncodingException e) {}
- catch (IOException e) {}
+ //}
+ //catch (FileNotFoundException e) {}
+ //catch (UnsupportedEncodingException e) {}
+ //catch (IOException e) {}
- prop.put("mode_text", "could not finish correctly"); //very informative errormessage
- return prop;
+ //prop.put("mode_text", "could not finish correctly"); //very informative errormessage
+ //return prop;
}
diff --git a/htroot/User.html b/htroot/User.html
index 82cd7332e..721aab277 100644
--- a/htroot/User.html
+++ b/htroot/User.html
@@ -4,10 +4,8 @@
YaCy '#[clientname]#': User Page
#%env/templates/metas.template%#
-
+
#%env/templates/header.template%#
-
-
User Page
#(logged-in)#
diff --git a/htroot/User_p.html b/htroot/User_p.html
index 973682341..188e79fdc 100644
--- a/htroot/User_p.html
+++ b/htroot/User_p.html
@@ -1,6 +1,11 @@
-
+
+
+
+ YaCy '#[clientname]#': User Page
+ #%env/templates/metas.template%#
+
+
+ #%env/templates/header.template%#
User Administration
@@ -70,3 +75,6 @@
+#%env/templates/footer.template%#
+
+
diff --git a/htroot/User_p.java b/htroot/User_p.java
index 1331a49a7..0cf854146 100644
--- a/htroot/User_p.java
+++ b/htroot/User_p.java
@@ -63,7 +63,6 @@ public class User_p {
serverObjects prop = new serverObjects();
plasmaSwitchboard sb = plasmaSwitchboard.getSwitchboard();
userDB.Entry entry=null;
- prop.put("SUPERTEMPLATE", "/env/page.html"); //user Supertemplates
//default values
prop.put("current_user", "newuser");
diff --git a/htroot/Wiki.java b/htroot/Wiki.java
index ea5b08047..8fb544ac9 100644
--- a/htroot/Wiki.java
+++ b/htroot/Wiki.java
@@ -53,7 +53,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
-import de.anomic.data.Diff;
+import de.anomic.data.diff;
import de.anomic.data.wikiBoard;
import de.anomic.http.httpHeader;
import de.anomic.plasma.plasmaSwitchboard;
@@ -244,10 +244,10 @@ public class Wiki {
if (nentry == null) nentry = entry;
if (post.containsKey("compare") && oentry != null && nentry != null) {
// TODO: split into paragraphs and compare them with the same diff-algo
- Diff diff = new Diff(
+ diff diff = new diff(
new String(oentry.page(), "UTF-8"),
new String(nentry.page(), "UTF-8"), 3);
- prop.putASIS("mode_versioning_diff", Diff.toHTML(new Diff[] { diff }));
+ prop.putASIS("mode_versioning_diff", de.anomic.data.diff.toHTML(new diff[] { diff }));
prop.put("mode_versioning", 1);
} else if (post.containsKey("viewold") && oentry != null) {
prop.put("mode_versioning", 2);
diff --git a/htroot/env/page.html b/htroot/env/page.html
deleted file mode 100644
index 7ea35076f..000000000
--- a/htroot/env/page.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- #[header]#
-
-
-
- #%env/templates/metas.template%#
-
-
- #%env/templates/header.template%#
- #[page]#
- #%env/templates/footer.template%#
-
-
diff --git a/htroot/env/page.java b/htroot/env/page.java
deleted file mode 100644
index f3a471040..000000000
--- a/htroot/env/page.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//page.java - super template, to allow a scripted layout.
-//----------------------------------------------------------
-//part of YaCy
-//
-// (C) 2006 by Alexander Schier
-//
-// last change: $LastChangedDate: $ by $LastChangedBy: $
-// $LastChangedRevision: $
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-//note: this isn't useful, yet.
-//this is only a basic demonstration, what can be done with the supertemplates.
-import de.anomic.http.httpHeader;
-import de.anomic.server.serverObjects;
-import de.anomic.server.serverSwitch;
-
-public class page {
- public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
- //plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
- serverObjects prop = new serverObjects();
- //prop.put("test1", "testit!");
- //prop.put("test2", 1);
-
- return prop;
- }
-
-}
\ No newline at end of file
diff --git a/htroot/ssitest.html b/htroot/ssitest.html
new file mode 100644
index 000000000..3656e977d
--- /dev/null
+++ b/htroot/ssitest.html
@@ -0,0 +1,11 @@
+
+
+
+
+Dynamisches HTML mit Server Side Includes
+
+
+Dynamisches HTML mit Server Side Includes
+
+
+
\ No newline at end of file
diff --git a/htroot/ssitest.inc b/htroot/ssitest.inc
new file mode 100644
index 000000000..531dc4aae
--- /dev/null
+++ b/htroot/ssitest.inc
@@ -0,0 +1,7 @@
+
+Auf einer Meierei,
+da lebte einst ein braves Huhn,
+das legte, wie die HŸhner tun,
+an jedem Tag ein Ei.
+Und kakelte, mirakelte, spektakelte,
+als obs ein Wunder sei.
\ No newline at end of file
diff --git a/source/dbtest.java b/source/dbtest.java
index 63e8514a6..2b3afded6 100644
--- a/source/dbtest.java
+++ b/source/dbtest.java
@@ -640,7 +640,7 @@ final class dbTable implements kelondroIndex {
throw new UnsupportedOperationException();
}
- public synchronized void addUnique(kelondroRow.Entry row, Date entryDate) throws IOException {
+ public synchronized void addUnique(kelondroRow.Entry row, Date entryDate) {
throw new UnsupportedOperationException();
}
diff --git a/source/de/anomic/data/bookmarksDB.java b/source/de/anomic/data/bookmarksDB.java
index 348b9c5c7..e5aaac0f4 100644
--- a/source/de/anomic/data/bookmarksDB.java
+++ b/source/de/anomic/data/bookmarksDB.java
@@ -783,9 +783,8 @@ public class bookmarksDB {
public String getOwner(){
if(entry.containsKey(BOOKMARK_OWNER)){
return (String) entry.get(BOOKMARK_OWNER);
- }else{
- return null; //null means admin
}
+ return null; //null means admin
}
public void setOwner(String owner){
entry.put(BOOKMARK_OWNER, owner);
@@ -793,16 +792,14 @@ public class bookmarksDB {
public boolean getPublic(){
if(entry.containsKey(BOOKMARK_PUBLIC)){
return ((String) entry.get(BOOKMARK_PUBLIC)).equals("public");
- }else{
- return false;
}
+ return false;
}
public boolean getFeed(){
if(entry.containsKey(BOOKMARK_IS_FEED)){
return ((String) entry.get(BOOKMARK_IS_FEED)).equals("true");
- }else{
- return false;
}
+ return false;
}
public void setPublic(boolean isPublic){
if(isPublic){
@@ -888,8 +885,8 @@ public class bookmarksDB {
public void remove() {
if (this.nextEntry != null) {
try {
- String tagHash = (String)this.nextEntry.getTagHash();
- if (tagHash != null) removeTag((String) tagHash);
+ String tagHash = this.nextEntry.getTagHash();
+ if (tagHash != null) removeTag(tagHash);
} catch (kelondroException e) {
//resetDatabase();
}
@@ -949,16 +946,11 @@ public class bookmarksDB {
if(bm1==null || bm2==null)
return 0; //XXX: i think this should not happen? maybe this needs further tracing of the bug
if(this.newestFirst){
- if(bm2.getTimeStamp() - bm1.getTimeStamp() >0)
- return 1;
- else
- return -1;
- }else{
- if(bm1.getTimeStamp() - bm2.getTimeStamp() >0)
- return 1;
- else
- return -1;
+ if(bm2.getTimeStamp() - bm1.getTimeStamp() >0) return 1;
+ return -1;
}
+ if(bm1.getTimeStamp() - bm2.getTimeStamp() >0) return 1;
+ return -1;
}
}
/**
diff --git a/source/de/anomic/data/Diff.java b/source/de/anomic/data/diff.java
similarity index 95%
rename from source/de/anomic/data/Diff.java
rename to source/de/anomic/data/diff.java
index a55255c15..bac74178a 100644
--- a/source/de/anomic/data/Diff.java
+++ b/source/de/anomic/data/diff.java
@@ -6,7 +6,7 @@
// Frankfurt, Germany, 2007
// Created 03.02.2007
//
-// This file is contributed by Franz Brauße
+// This file is contributed by Franz Brau§e
//
// $LastChangedDate: $
// $LastChangedRevision: $
@@ -52,7 +52,7 @@ import java.util.ArrayList;
/**
* This class provides a diff-functionality.
*/
-public class Diff {
+public class diff {
private final ArrayList /* of Part */ parts = new ArrayList();
private final Object[] o;
@@ -63,7 +63,7 @@ public class Diff {
* @param n the new String
* @throws NullPointerException if one of the arguments is null
*/
- public Diff(String o, String n) {
+ public diff(String o, String n) {
this(o, n, 1);
}
@@ -76,7 +76,7 @@ public class Diff {
* @throws NullPointerException if o or n is
* null
*/
- public Diff(String o, String n, int minConsecutive) {
+ public diff(String o, String n, int minConsecutive) {
if (o == null || n == null) throw new NullPointerException("neither o nor n must be null");
this.o = new Comparable[o.length()];
for (int i=0; i 0) ? minConsecutive : 1);
}
- public Diff(Object[] o, Object[] n, int minConsecutive) {
+ public diff(Object[] o, Object[] n, int minConsecutive) {
if (o == null || n == null) throw new NullPointerException("neither o nor n must be null");
this.o = o;
this.n = n;
@@ -237,10 +237,10 @@ public class Diff {
final StringBuffer sb = new StringBuffer(this.posNew - this.posOld);
if (this.action == ADDED) {
for (int i=this.posOld; i\n");
ps = diffs[i].getParts();
for (int j=0; j").append(htmlTools.replaceXMLEntities(ps[j].getString()).replaceAll("\n", "
"));
sb.append("");
@@ -279,4 +279,4 @@ public class Diff {
}
return new String(sb);
}
-}
+}
\ No newline at end of file
diff --git a/source/de/anomic/data/gettext.java b/source/de/anomic/data/gettext.java
deleted file mode 100644
index e6925a02b..000000000
--- a/source/de/anomic/data/gettext.java
+++ /dev/null
@@ -1,333 +0,0 @@
-//gettext.java - translations in a simplified gettext-format
-//----------------------------------------------------------
-//part of YaCy
-//
-// (C) 2006 by Alexander Schier
-//
-// last change: $LastChangedDate: $ by $LastChangedBy: $
-// $LastChangedRevision: $
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-package de.anomic.data;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import de.anomic.htmlFilter.htmlFilterContentTransformer;
-import de.anomic.server.logging.serverLog;
-
-public class gettext{
- public static ArrayList createGettextRecursive(File sourceDir, String extensions, String notdir, File oldgettextfile) throws FileNotFoundException{
- if(oldgettextfile==null)
- return createGettextRecursive(sourceDir, extensions, notdir, (Map)null); //no old file
- return createGettextRecursive(sourceDir, extensions, notdir, parseGettext(oldgettextfile));
- }
- public static ArrayList createGettextRecursive(File sourceDir, String extensions, String notdir, Map oldgettext){
- ArrayList list=new ArrayList();
- ArrayList exts=listManager.string2arraylist(extensions);
- Iterator it2;
- String filename;
- ArrayList filenames=new ArrayList();
-
- ArrayList dirList=listManager.getDirsRecursive(sourceDir, notdir);
- dirList.add(sourceDir);
- Iterator it=dirList.iterator();
- File dir=null;
- File[] files;
- //this looks a lot more complicated, than it is ...
- while(it.hasNext()){
- dir=(File)it.next();
- if(dir.isDirectory() && !dir.getName().equals(notdir)){
- files=dir.listFiles();
- for(int i=0;i\\n\"");
- list.add("\"X-Generator: YaCy\\n\"");
-
- list.add("\"Mime-Version: 1.0\\n\"");
- list.add("");
- return list;
- }
- public static ArrayList createGettext(ArrayList filenames, File oldgettextfile) throws FileNotFoundException{
- return createGettext(filenames, parseGettext(oldgettextfile));
- }
- /*
- * create a list of gettext file for some textfiles
- * @param filenames the ArrayList with the Filenames
- * @param oldgettextmap a map with the old translations.
- */
- public static ArrayList createGettext(ArrayList filenames, Map oldgettext){
- ArrayList list=new ArrayList();
- ArrayList tmp=null;
- String filename=null;
- Iterator it=filenames.iterator();
- list.addAll(getGettextHeader());
-
- while(it.hasNext()){
- try {
- filename=(String)it.next();
- //TODO: better possibility to switch the behaviour
- //tmp=getGettextSource(new File(filename), oldgettext);
- tmp=getGettextSourceFromHTML(new File(filename), oldgettext);
- serverLog.logFinest("Gettext", "Extracting Strings from: "+filename);
- } catch (FileNotFoundException e) {
- System.out.println("File \""+filename+"\" not found.");
- }
- if(tmp!=null)
- list.addAll(tmp);
- }
- return list;
- }
- public static ArrayList getGettextSource(File inputfile, File oldmapfile) throws FileNotFoundException{
- if(oldmapfile != null && oldmapfile.exists())
- return getGettextSource(inputfile, parseGettext(oldmapfile));
- return getGettextSource(inputfile);
- }
- public static ArrayList getGettextSource(File inputfile) throws FileNotFoundException{
- return getGettextSource(inputfile, new HashMap());
- }
- public static ArrayList getGettextSource(File inputfile, Map oldgettextmap) throws FileNotFoundException{
- ArrayList strings=getGettextItems(inputfile);
- return getGettextSource(inputfile, oldgettextmap, strings);
- }
- public static ArrayList getGettextSourceFromHTML(File inputfile, Map oldgettextmap) throws FileNotFoundException{
- htmlFilterContentTransformer transformer=new htmlFilterContentTransformer();
- BufferedReader br=new BufferedReader(new FileReader(inputfile));
- StringBuffer content=new StringBuffer();
- String line="";
- try {
- while((line=br.readLine())!=null){
- content.append(line).append("\n");
- }
- } catch (IOException e) {}
- ArrayList strings = transformer.getStrings(content.toString().getBytes());
- return getGettextSource(inputfile, oldgettextmap, strings);
- }
- public static ArrayList getGettextSource(File inputfile, Map oldgettextmap, ArrayList strings) {
- if(oldgettextmap==null)
- oldgettextmap=new HashMap();
-
-
- ArrayList list=new ArrayList();
- Iterator it=strings.iterator();
- if(strings.isEmpty())
- return null;
- list.add("#"+inputfile.getName());
- String key;
- while(it.hasNext()){
- key=((String)it.next()).replaceAll("\"", "\\\\\"").replaceAll("\n", "\\\\n");
- list.add("msgid \""+key+"\"");
- if(oldgettextmap.containsKey(key))
- list.add("msgstr \""+oldgettextmap.get(key)+"\"");
- else
- list.add("msgstr \"\"");
- list.add("");
- }
- return list;
- }
- /*
- * create a list of gettext Strings ( _() ) from a file
- * @param inputfile the file, which contains the raw Strings.
- */
- public static ArrayList getGettextItems(File inputfile) throws FileNotFoundException{
- ArrayList list=new ArrayList();
- int character;
- InputStreamReader reader;
- int state=0; //0=no gettext macro 1= _ found, 2= ( found and in the string 3=\ found
- String untranslatedString="";
-
- reader = new InputStreamReader(new FileInputStream(inputfile));
- try {
- character=reader.read();
- while(character >=0) {
- if(state==0 && (char)character=='_')
- state=1;
- else if(state==1){
- if((char)character=='('){
- state=2;
- untranslatedString="";
- }else{
- state=0;
- untranslatedString+=(char)character;
- }
- }else if(state==2){
- if((char)character=='\\')
- state=3;
- else if((char)character==')'){
- state=0;
- list.add(untranslatedString);
- }else{
- untranslatedString+=(char)character;
- }
- }else if(state==3){
- state=2;
- if((char)character==')')
- untranslatedString+=")";
- else
- untranslatedString+="\\"+(char)character;
- }else{
- untranslatedString+=(char)character;
- }
- character=reader.read();
- }
- } catch (IOException e) {}
- return list;
- }
- public static HashMap parseGettext(File gettextfile) throws FileNotFoundException{
- ArrayList gettext=new ArrayList();
- String line;
- BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(gettextfile)));
- try {
- line = br.readLine();
- while (line != null) {
- gettext.add(line);
- line = br.readLine();
- }
- } catch (IOException e) {}
- return parseGettext(gettext);
- }
- public static HashMap parseGettext(ArrayList gettext){
- HashMap map = new HashMap();
- int mode=0; //1= in msgid, 2= in msgstr
- String msgid = "", msgstr = "", tmp = "";
-
- Iterator it=gettext.iterator();
- while(it.hasNext()){
- tmp=(String) it.next();
- if(tmp.startsWith("msgid \"")){
- if(mode==2)
- map.put(msgid, msgstr);
- msgid=tmp.substring(7,tmp.length()-1).replaceAll("\\\"", "\"");
- msgstr="";
- mode=1;
- }else if(tmp.startsWith("msgstr \"")){
- mode=2;
- msgstr=tmp.substring(8,tmp.length()-1);
- }else if(tmp.startsWith("\"")){
- //multiline strings with "..." on each line
- if(mode==1){
- msgid+="\n"+tmp.substring(1,tmp.length()-1).replaceAll("\\\"", "\"");
- }else if(mode==2){
- msgstr+="\n"+tmp.substring(1,tmp.length()-1).replaceAll("\\\"", "\"");
- }
- }
- }
- map.put(msgid, msgstr); //the last one cannot be put, on the next msgid ;-)
- return map;
- }
- public static void main(String[] argv){
- if(argv.length < 2){
- System.out.println("Syntax: java de.anomic.data.gettext creategettext [inputfile] ... [inputfile]");
- System.out.println("Syntax: java de.anomic.data.gettext parsegettext [gettextfile]");
- System.out.println("Syntax: java de.anomic.data.gettext updategettext [gettextfile] [inputfile] ... [inputfile]");
- System.exit(1);
- }
- if(argv[0].equals("creategettext")){
- ArrayList filelist=new ArrayList();
- for(int i=1;i2){
- System.out.println("only one file allowed for parsegettext");
- System.exit(1);
- }
- try {
- HashMap translations=parseGettext(new File(argv[1]));
- Iterator it=translations.keySet().iterator();
- String key="";
- while(it.hasNext()){
- key=(String)it.next();
- System.out.println("key: "+key);
- System.out.println("value: "+translations.get(key));
- }
- } catch (FileNotFoundException e) {
- System.exit(1);
- }
- }else if(argv[0].equals("updategettext")){
- if(argv.length < 3){
- System.out.println("Too less arguments");
- System.exit(1);
- }
- ArrayList filelist=new ArrayList();
- for(int i=2;i 0) System.out.println(" TEXT: " + sbb.toString());
-// serverCharBuffer[] sbbs = httpTemplate.splitQuotations(sbb);
-// sbb = new serverCharBuffer();
-// for (int i = 0; i < sbbs.length; i++) {
-// if (sbbs[i].isWhitespace(true)) {
-// sbb.append(sbbs[i]);
-// } else if ((sbbs[i].byteAt(0) == httpTemplate.hash) ||
-// (sbbs[i].startsWith(httpTemplate.dpdpa))) {
-// // this is a template or a part of a template
-// sbb.append(sbbs[i]);
-// } else {
-// // this is a text fragment, generate gettext quotation
-// int ws = sbbs[i].whitespaceStart(true);
-// int we = sbbs[i].whitespaceEnd(true);
-// sbb.append(sbbs[i].getBytes(0, ws));
-// sbb.append('_');
-// sbb.append('(');
-// sbb.append(sbbs[i].getBytes(ws, we));
-// sbb.append(')');
-// sbb.append(sbbs[i].getBytes(we));
-// }
-// }
-// //if (sbb.length() > 0) System.out.println("GETTEXT: " + sbb.toString());
-// return sbb.getChars();
- }
if (bluelist != null) {
if (bluelistHit(text)) {
// System.out.println("FILTERHIT: " + text);
diff --git a/source/de/anomic/htmlFilter/htmlFilterWriter.java b/source/de/anomic/htmlFilter/htmlFilterWriter.java
index f3c0d05da..8d7175e4d 100644
--- a/source/de/anomic/htmlFilter/htmlFilterWriter.java
+++ b/source/de/anomic/htmlFilter/htmlFilterWriter.java
@@ -512,7 +512,6 @@ public final class htmlFilterWriter extends Writer {
htmlFilterTransformer transformer = new htmlFilterContentTransformer();
// TODO: this does not work at the moment
System.exit(0);
- transformer.init("gettext");
Reader is = new FileReader(args[0]);
FileOutputStream fos = new FileOutputStream(new File(args[0] + ".out"));
Writer os = new htmlFilterWriter(fos, "UTF-8",scraper, transformer, false);
diff --git a/source/de/anomic/http/httpChunkedOutputStream.java b/source/de/anomic/http/httpChunkedOutputStream.java
index be603d2d5..dd5591b34 100644
--- a/source/de/anomic/http/httpChunkedOutputStream.java
+++ b/source/de/anomic/http/httpChunkedOutputStream.java
@@ -45,12 +45,15 @@ package de.anomic.http;
import java.io.FilterOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
-public final class httpChunkedOutputStream extends FilterOutputStream
-{
- private boolean finished = false;
- private static final byte[] crlf = {(byte)13,(byte)10};
+import de.anomic.server.serverByteBuffer;
+import de.anomic.server.serverCore;
+import de.anomic.server.serverFileUtils;
+
+public final class httpChunkedOutputStream extends FilterOutputStream {
+ private boolean finished = false;
public httpChunkedOutputStream(OutputStream out) {
super(out);
@@ -63,7 +66,9 @@ public final class httpChunkedOutputStream extends FilterOutputStream
public void finish() throws IOException {
if (!this.finished) {
- this.out.write("0\r\n\r\n".getBytes());
+ this.out.write((byte) 48);
+ this.out.write(serverCore.crlf);
+ this.out.write(serverCore.crlf);
this.out.flush();
this.finished = true;
}
@@ -74,9 +79,9 @@ public final class httpChunkedOutputStream extends FilterOutputStream
if (b.length == 0) return;
this.out.write(Integer.toHexString(b.length).getBytes());
- this.out.write(crlf);
+ this.out.write(serverCore.crlf);
this.out.write(b);
- this.out.write(crlf);
+ this.out.write(serverCore.crlf);
this.out.flush();
}
@@ -85,9 +90,32 @@ public final class httpChunkedOutputStream extends FilterOutputStream
if (len == 0) return;
this.out.write(Integer.toHexString(len).getBytes());
- this.out.write(crlf);
+ this.out.write(serverCore.crlf);
this.out.write(b, off, len);
- this.out.write(crlf);
+ this.out.write(serverCore.crlf);
+ this.out.flush();
+ }
+
+ public void write(serverByteBuffer b, int off, int len) throws IOException {
+ if (this.finished) throw new IOException("ChunkedOutputStream already finalized.");
+ if (len == 0) return;
+
+ this.out.write(Integer.toHexString(len).getBytes());
+ this.out.write(serverCore.crlf);
+ this.out.write(b.getBytes(off, off + len));
+ this.out.write(serverCore.crlf);
+ this.out.flush();
+ }
+
+ public void write(InputStream b) throws IOException {
+ if (this.finished) throw new IOException("ChunkedOutputStream already finalized.");
+ int len = b.available();
+ if (len == 0) return;
+
+ this.out.write(Integer.toHexString(len).getBytes());
+ this.out.write(serverCore.crlf);
+ serverFileUtils.copy(b, out, len);
+ this.out.write(serverCore.crlf);
this.out.flush();
}
@@ -95,9 +123,9 @@ public final class httpChunkedOutputStream extends FilterOutputStream
if (this.finished) throw new IOException("ChunkedOutputStream already finalized.");
this.out.write("1".getBytes());
- this.out.write(crlf);
+ this.out.write(serverCore.crlf);
this.out.write(b);
- this.out.write(crlf);
+ this.out.write(serverCore.crlf);
this.out.flush();
}
}
diff --git a/source/de/anomic/http/httpHeader.java b/source/de/anomic/http/httpHeader.java
index 06f011e9c..5b24a08eb 100644
--- a/source/de/anomic/http/httpHeader.java
+++ b/source/de/anomic/http/httpHeader.java
@@ -491,6 +491,10 @@ public final class httpHeader extends TreeMap implements Map {
return null;
}
+ public String userAgent() {
+ return (String) get(USER_AGENT);
+ }
+
public long age() {
Date lm = lastModified();
Date sd = date();
diff --git a/source/de/anomic/http/httpSSI.java b/source/de/anomic/http/httpSSI.java
new file mode 100644
index 000000000..6ad4778ec
--- /dev/null
+++ b/source/de/anomic/http/httpSSI.java
@@ -0,0 +1,76 @@
+// httpSSI.java
+// -----------------------------
+// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
+// first published 26.06.2007 on http://yacy.net
+//
+// This is a part of YaCy, a peer-to-peer based web search engine
+//
+// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
+// $LastChangedRevision: 1986 $
+// $LastChangedBy: orbiter $
+//
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package de.anomic.http;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import de.anomic.server.serverByteBuffer;
+
+public class httpSSI {
+
+ public static void writeSSI(File referenceFile, serverByteBuffer in, httpChunkedOutputStream out) throws IOException {
+ writeSSI(referenceFile, in, 0, out);
+ }
+
+ public static void writeSSI(File referenceFile, serverByteBuffer in, int start, httpChunkedOutputStream out) throws IOException {
+ int p = in.indexOf("".getBytes(), start + 10);
+ assert q >= 0;
+ parseSSI(referenceFile, in, start, q + 3 - start, out);
+ writeSSI(referenceFile, in, start + q + 3, out);
+ } else if (p > 0) {
+ int q = in.indexOf("-->".getBytes(), start + 10);
+ out.write(in, start, p - start);
+ parseSSI(referenceFile, in, start + p, q + 3 - start - p, out);
+ writeSSI(referenceFile, in, start + q + 3, out);
+ } else /* p < 0 */ {
+ out.write(in, start, in.length() - start);
+ }
+ }
+
+ private static void parseSSI(File referenceFile, serverByteBuffer in, int start, int length, httpChunkedOutputStream out) {
+ if (in.startsWith("")){
- inheader=false;
- }else{
- header.append(line);
- }
- }
- }
-
- //tp is from the servlet, fis is the content-only from the servlet
- //this resolvs templates in both header and content
- o = new serverByteBuffer();
- fis=new ByteArrayInputStream((new String(content)).getBytes());
- httpTemplate.writeTemplate(fis, o, tp, "-UNRESOLVED_PATTERN-".getBytes());
- content_s=o.toString();
- o = new serverByteBuffer();
- fis=new ByteArrayInputStream(header.toString().getBytes());
- httpTemplate.writeTemplate(fis, o, tp, "-UNRESOLVED_PATTERN-".getBytes());
- header_s=o.toString();
-
- //further processing of page.html (via page.class)?
- if (pageClass != null && pageClass.exists()){
- Object tmp = invokeServlet(pageClass, requestHeader, args);
- if(tmp instanceof serverObjects){
- tp=new servletProperties((serverObjects)tmp);
- }else{
- tp=(servletProperties)tmp;
- }
- }else
- tp = new servletProperties();
- tp.putASIS("header", header_s);
- tp.putASIS("page", content_s);
- fis=new BufferedInputStream(new FileInputStream(pageFile));
-
- }
- }
-
- o = new serverByteBuffer();
- if (zipContent) zippedOut = new GZIPOutputStream(o);
- httpTemplate.writeTemplate(fis, (zipContent) ? (OutputStream)zippedOut: (OutputStream)o, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
+ } else {
+ fis = new BufferedInputStream(new FileInputStream(targetFile));
+ }
+
+ // write the array to the client
+ // we can do that either in standard mode (whole thing completely) or in chunked mode
+ // since yacy clients do not understand chunked mode, we use this only for communication with the administrator
+ boolean yacyClient = requestHeader.userAgent().startsWith("yacy");
+ boolean chunked = !method.equals(httpHeader.METHOD_HEAD) && !yacyClient;
+ if (chunked) {
+ // send page in chunks and parse SSIs
+ serverByteBuffer o = new serverByteBuffer();
+ // apply templates
+ httpTemplate.writeTemplate(fis, o, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
+ httpd.sendRespondHeader(this.connectionProperties, out,
+ httpVersion, 200, null, mimeType, -1,
+ targetDate, null, tp.getOutgoingHeader(),
+ null, "chunked", nocache);
+ // send the content in chunked parts, see RFC 2616 section 3.6.1
+ //byte[] result = o.toByteArray(); // this interrupts streaming (bad idea!)
+ httpChunkedOutputStream chos = new httpChunkedOutputStream(out);
+ httpSSI.writeSSI(targetFile, o, chos);
+ //chos.write(result);
+ chos.finish();
+ } else {
+ // send page as whole thing, SSIs are not possible
+ String contentEncoding = (zipContent) ? "gzip" : null;
+ // apply templates
+ serverByteBuffer o = new serverByteBuffer();
if (zipContent) {
+ GZIPOutputStream zippedOut = new GZIPOutputStream(o);
+ httpTemplate.writeTemplate(fis, zippedOut, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
zippedOut.finish();
zippedOut.flush();
zippedOut.close();
zippedOut = null;
+ } else {
+ httpTemplate.writeTemplate(fis, o, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
}
-
- result = o.toByteArray();
-
- if (this.md5Digest != null) {
- this.md5Digest.reset();
- this.md5Digest.update(result);
- byte[] digest = this.md5Digest.digest();
- StringBuffer digestString = new StringBuffer();
- for ( int i = 0; i < digest.length; i++ )
- digestString.append(Integer.toHexString( digest[i]&0xff));
-
- }
- } finally {
- if (zippedOut != null) try {zippedOut.close();} catch(Exception e) {}
- if (o != null) try {o.close(); o = null;} catch(Exception e) {}
- if (fis != null) try {fis.close(); fis=null;} catch(Exception e) {}
+ if (method.equals(httpHeader.METHOD_HEAD)) {
+ httpd.sendRespondHeader(this.connectionProperties, out,
+ httpVersion, 200, null, mimeType, o.length(),
+ targetDate, null, tp.getOutgoingHeader(),
+ contentEncoding, null, nocache);
+ } else {
+ byte[] result = o.toByteArray(); // this interrupts streaming (bad idea!)
+ httpd.sendRespondHeader(this.connectionProperties, out,
+ httpVersion, 200, null, mimeType, result.length,
+ targetDate, null, tp.getOutgoingHeader(),
+ contentEncoding, null, nocache);
+ serverFileUtils.write(result, out);
+ }
}
-
- // write the array to the client
- long contentLength = result.length;
- String contentEncoding = (zipContent)?"gzip":null;
- httpd.sendRespondHeader(this.connectionProperties, out, httpVersion, 200, null, mimeType, contentLength, targetDate, null, tp.getOutgoingHeader(), contentEncoding, null, nocache);
- if (! method.equals(httpHeader.METHOD_HEAD)) {
- //Thread.sleep(200); // this solved the message problem (!!)
- serverFileUtils.write(result, out);
- }
-
} else { // no html
int statusCode = 200;
diff --git a/source/de/anomic/icap/icapHeader.java b/source/de/anomic/icap/icapHeader.java
index 70e9d091b..1e1bb57ca 100644
--- a/source/de/anomic/icap/icapHeader.java
+++ b/source/de/anomic/icap/icapHeader.java
@@ -147,7 +147,8 @@ public class icapHeader extends TreeMap implements Map {
// to make the occurrence of multiple keys possible, we add them using a counter
public Object add(Object key, Object value) {
int c = keyCount((String) key);
- if (c == 0) return put(key, value); else return put("*" + key + "-" + c, value);
+ if (c == 0) return put(key, value);
+ return put("*" + key + "-" + c, value);
}
public int keyCount(String key) {
@@ -160,7 +161,8 @@ public class icapHeader extends TreeMap implements Map {
// a convenience method to access the map with fail-over defaults
public Object get(Object key, Object dflt) {
Object result = get(key);
- if (result == null) return dflt; else return result;
+ if (result == null) return dflt;
+ return result;
}
// return multiple results
diff --git a/source/de/anomic/index/indexCollectionRI.java b/source/de/anomic/index/indexCollectionRI.java
index 0209e14e2..ed83e4b39 100644
--- a/source/de/anomic/index/indexCollectionRI.java
+++ b/source/de/anomic/index/indexCollectionRI.java
@@ -68,12 +68,7 @@ public class indexCollectionRI implements indexRI {
}
public int size() {
- try {
- return collectionIndex.size();
- } catch (IOException e) {
- e.printStackTrace();
- return 0;
- }
+ return collectionIndex.size();
}
public synchronized int indexSize(String wordHash) {
@@ -196,11 +191,7 @@ public class indexCollectionRI implements indexRI {
}
public synchronized void close() {
- try {
- collectionIndex.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ collectionIndex.close();
}
}
diff --git a/source/de/anomic/index/indexURLEntry.java b/source/de/anomic/index/indexURLEntry.java
index 505c0e3f0..1a6124c44 100644
--- a/source/de/anomic/index/indexURLEntry.java
+++ b/source/de/anomic/index/indexURLEntry.java
@@ -27,7 +27,6 @@
package de.anomic.index;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.text.ParseException;
import java.util.ArrayList;
@@ -285,7 +284,7 @@ public class indexURLEntry {
}
}
- public kelondroRow.Entry toRowEntry() throws IOException {
+ public kelondroRow.Entry toRowEntry() {
return this.entry;
}
diff --git a/source/de/anomic/kelondro/kelondroBytesIntMap.java b/source/de/anomic/kelondro/kelondroBytesIntMap.java
index 45945f134..0ee0bbc8a 100644
--- a/source/de/anomic/kelondro/kelondroBytesIntMap.java
+++ b/source/de/anomic/kelondro/kelondroBytesIntMap.java
@@ -32,7 +32,7 @@ public class kelondroBytesIntMap {
private kelondroRow rowdef;
private kelondroIndex index0, index1;
- public kelondroBytesIntMap(kelondroIndex ki) throws IOException {
+ public kelondroBytesIntMap(kelondroIndex ki) {
assert (ki.row().columns() == 2); // must be a key/index relation
assert (ki.row().width(1) == 4); // the value must be a b256-encoded int, 4 bytes long
this.index0 = null; // not used
@@ -46,7 +46,7 @@ public class kelondroBytesIntMap {
this.index1 = null; // to show that this is the initialization phase
}
- public kelondroRow row() throws IOException {
+ public kelondroRow row() {
return index0.row();
}
diff --git a/source/de/anomic/kelondro/kelondroCollectionIndex.java b/source/de/anomic/kelondro/kelondroCollectionIndex.java
index f3b485705..6a2a7598e 100644
--- a/source/de/anomic/kelondro/kelondroCollectionIndex.java
+++ b/source/de/anomic/kelondro/kelondroCollectionIndex.java
@@ -264,7 +264,7 @@ public class kelondroCollectionIndex {
}
}
- public int size() throws IOException {
+ public int size() {
return index.size();
}
@@ -1000,7 +1000,7 @@ public class kelondroCollectionIndex {
}
- public synchronized void close() throws IOException {
+ public synchronized void close() {
this.index.close();
Iterator i = arrays.values().iterator();
while (i.hasNext()) {
diff --git a/source/de/anomic/kelondro/kelondroDyn.java b/source/de/anomic/kelondro/kelondroDyn.java
index 0f004bff6..618ee22f0 100644
--- a/source/de/anomic/kelondro/kelondroDyn.java
+++ b/source/de/anomic/kelondro/kelondroDyn.java
@@ -123,7 +123,7 @@ public class kelondroDyn {
return this.rowdef;
}
- public synchronized int sizeDyn() throws IOException {
+ public synchronized int sizeDyn() {
//this.segmentCount = 0;
//Iterator i = keys(true); while (i.hasNext()) segmentCount++;
//return segmentCount;
diff --git a/source/de/anomic/kelondro/kelondroDynTree.java b/source/de/anomic/kelondro/kelondroDynTree.java
index 2d782d5b3..d7de8c604 100644
--- a/source/de/anomic/kelondro/kelondroDynTree.java
+++ b/source/de/anomic/kelondro/kelondroDynTree.java
@@ -68,7 +68,7 @@ public class kelondroDynTree {
private Hashtable buffer, cache;
private long cycleBuffer;
- public kelondroDynTree(File file, long preloadTime, int keylength, int nodesize, kelondroRow rowdef, char fillChar, boolean resetOnFail) throws IOException {
+ public kelondroDynTree(File file, long preloadTime, int keylength, int nodesize, kelondroRow rowdef, char fillChar, boolean resetOnFail) {
// creates or opens a DynTree
this.file = file;
this.preloadTime = preloadTime;
diff --git a/source/de/anomic/kelondro/kelondroFlexSplitTable.java b/source/de/anomic/kelondro/kelondroFlexSplitTable.java
index 3699f1653..73f60d258 100644
--- a/source/de/anomic/kelondro/kelondroFlexSplitTable.java
+++ b/source/de/anomic/kelondro/kelondroFlexSplitTable.java
@@ -46,14 +46,14 @@ public class kelondroFlexSplitTable implements kelondroIndex {
private File path;
private String tablename;
- public kelondroFlexSplitTable(File path, String tablename, long preloadTime, kelondroRow rowdef, boolean resetOnFail) throws IOException {
+ public kelondroFlexSplitTable(File path, String tablename, long preloadTime, kelondroRow rowdef, boolean resetOnFail) {
this.path = path;
this.tablename = tablename;
this.rowdef = rowdef;
init(preloadTime, resetOnFail);
}
- public void init(long preloadTime, boolean resetOnFail) throws IOException {
+ public void init(long preloadTime, boolean resetOnFail) {
// initialized tables map
this.tables = new HashMap();
diff --git a/source/de/anomic/kelondro/kelondroFlexTable.java b/source/de/anomic/kelondro/kelondroFlexTable.java
index a076d0373..80bff0f28 100644
--- a/source/de/anomic/kelondro/kelondroFlexTable.java
+++ b/source/de/anomic/kelondro/kelondroFlexTable.java
@@ -423,12 +423,9 @@ public class kelondroFlexTable extends kelondroFlexWidthArray implements kelondr
private final Map memoryStats() {
// returns statistical data about this object
HashMap map = new HashMap();
- try {
- map.put("tableIndexChunkSize", (!RAMIndex) ? "0" : Integer.toString(index.row().objectsize));
- map.put("tableIndexCount", (!RAMIndex) ? "0" : Integer.toString(index.size()));
- map.put("tableIndexMem", (!RAMIndex) ? "0" : Integer.toString((int) (index.row().objectsize * index.size() * kelondroRowCollection.growfactor)));
- } catch (IOException e) {
- }
+ map.put("tableIndexChunkSize", (!RAMIndex) ? "0" : Integer.toString(index.row().objectsize));
+ map.put("tableIndexCount", (!RAMIndex) ? "0" : Integer.toString(index.size()));
+ map.put("tableIndexMem", (!RAMIndex) ? "0" : Integer.toString((int) (index.row().objectsize * index.size() * kelondroRowCollection.growfactor)));
return map;
}
diff --git a/source/de/anomic/kelondro/kelondroIntBytesMap.java b/source/de/anomic/kelondro/kelondroIntBytesMap.java
index 3e63b4072..614c3e7ce 100644
--- a/source/de/anomic/kelondro/kelondroIntBytesMap.java
+++ b/source/de/anomic/kelondro/kelondroIntBytesMap.java
@@ -24,7 +24,6 @@
package de.anomic.kelondro;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -55,7 +54,7 @@ public class kelondroIntBytesMap {
return index1.memoryNeededForGrow();
}
- public kelondroRow row() throws IOException {
+ public kelondroRow row() {
return index0.row();
}
diff --git a/source/de/anomic/kelondro/kelondroMapTable.java b/source/de/anomic/kelondro/kelondroMapTable.java
index 0b609eb8f..dba49ea11 100644
--- a/source/de/anomic/kelondro/kelondroMapTable.java
+++ b/source/de/anomic/kelondro/kelondroMapTable.java
@@ -63,20 +63,20 @@ public class kelondroMapTable {
public void declareMaps(
String tablename, int keysize, kelondroOrder objectOrder, int nodesize, int cacheslots,
- char fillChar, boolean resetOnFail) throws IOException {
+ char fillChar, boolean resetOnFail) {
declareMaps(tablename, keysize, objectOrder, nodesize, cacheslots, null, null, null, fillChar, resetOnFail);
}
public void declareMaps(
String tablename, int keysize, kelondroOrder objectOrder, int nodesize, int cacheslots,
- String[] sortfields, String[] longaccfields, String[] doubleaccfields, char fillChar, boolean resetOnFail) throws IOException {
+ String[] sortfields, String[] longaccfields, String[] doubleaccfields, char fillChar, boolean resetOnFail) {
declareMaps(tablename, keysize, objectOrder, nodesize, cacheslots, sortfields, longaccfields, doubleaccfields, fillChar, 0, resetOnFail);
}
public void declareMaps(
String tablename, int keysize, kelondroOrder objectOrder, int nodesize, int cacheslots,
String[] sortfields, String[] longaccfields, String[] doubleaccfields, char fillChar,
- long preloadTime, boolean resetOnFail) throws IOException {
+ long preloadTime, boolean resetOnFail) {
if (mTables.containsKey(tablename)) throw new RuntimeException("kelondroTables.declareMap: table '" + tablename + "' declared twice.");
if (tTables.containsKey(tablename)) throw new RuntimeException("kelondroTables.declareMap: table '" + tablename + "' declared already in other context.");
File tablefile = new File(tablesPath, "table." + tablename + ".mdb");
@@ -87,7 +87,7 @@ public class kelondroMapTable {
mTables.put(tablename, map);
}
- public void declareTree(String tablename, kelondroRow rowdef, long buffersize /*bytes*/, long preloadTime) throws IOException {
+ public void declareTree(String tablename, kelondroRow rowdef, long buffersize /*bytes*/, long preloadTime) {
if (mTables.containsKey(tablename)) throw new RuntimeException("kelondroTables.declareTree: table '" + tablename + "' declared already in other context.");
if (tTables.containsKey(tablename)) throw new RuntimeException("kelondroTables.declareTree: table '" + tablename + "' declared twice.");
File tablefile = new File(tablesPath, "table." + tablename + ".tdb");
@@ -110,7 +110,7 @@ public class kelondroMapTable {
tTables.put(tablename, tree);
}
- public synchronized Map selectMap(String tablename, String key) throws IOException {
+ public synchronized Map selectMap(String tablename, String key) {
kelondroMapObjects table = (kelondroMapObjects) mTables.get(tablename);
if (table == null) throw new RuntimeException("kelondroTables.selectMap: map table '" + tablename + "' does not exist.");
if (key.length() > table.keySize()) key = key.substring(0, table.keySize());
diff --git a/source/de/anomic/kelondro/kelondroObjects.java b/source/de/anomic/kelondro/kelondroObjects.java
index 5ddcfbb5e..45204562c 100644
--- a/source/de/anomic/kelondro/kelondroObjects.java
+++ b/source/de/anomic/kelondro/kelondroObjects.java
@@ -149,11 +149,7 @@ public class kelondroObjects {
}
public synchronized int size() {
- try {
- return dyn.sizeDyn();
- } catch (IOException e) {
- return 0;
- }
+ return dyn.sizeDyn();
}
public void close() {
diff --git a/source/de/anomic/kelondro/kelondroRowCollection.java b/source/de/anomic/kelondro/kelondroRowCollection.java
index 3f4208483..d71ed2604 100644
--- a/source/de/anomic/kelondro/kelondroRowCollection.java
+++ b/source/de/anomic/kelondro/kelondroRowCollection.java
@@ -301,7 +301,7 @@ public class kelondroRowCollection {
addUnique(r, 0, r.length);
}
- public synchronized void addUniqueMultiple(List rows) throws IOException {
+ public synchronized void addUniqueMultiple(List rows) {
assert this.sortBound == 0 : "sortBound = " + this.sortBound + ", chunkcount = " + this.chunkcount;
Iterator i = rows.iterator();
while (i.hasNext()) addUnique((kelondroRow.Entry) i.next());
diff --git a/source/de/anomic/kelondro/kelondroSplittedTree.java b/source/de/anomic/kelondro/kelondroSplittedTree.java
index 548e976ce..5d7e96adb 100644
--- a/source/de/anomic/kelondro/kelondroSplittedTree.java
+++ b/source/de/anomic/kelondro/kelondroSplittedTree.java
@@ -138,7 +138,7 @@ public class kelondroSplittedTree implements kelondroIndex {
throw new UnsupportedOperationException();
}
- public synchronized void addUnique(kelondroRow.Entry row, Date entryDate) throws IOException {
+ public synchronized void addUnique(kelondroRow.Entry row, Date entryDate) {
throw new UnsupportedOperationException();
}
diff --git a/source/de/anomic/plasma/parser/sevenzip/sevenzipParser.java b/source/de/anomic/plasma/parser/sevenzip/sevenzipParser.java
index ec9e0d40a..9032a9603 100644
--- a/source/de/anomic/plasma/parser/sevenzip/sevenzipParser.java
+++ b/source/de/anomic/plasma/parser/sevenzip/sevenzipParser.java
@@ -76,7 +76,7 @@ public class sevenzipParser extends AbstractParser implements Parser {
*/
private static final String[] LIBX_DEPENDENCIES = new String[] { "J7Zip-modified.jar" };
- public sevenzipParser() throws IOException {
+ public sevenzipParser() {
super(LIBX_DEPENDENCIES);
super.parserName = "7zip Archive Parser";
}
diff --git a/source/de/anomic/plasma/plasmaCrawlLURL.java b/source/de/anomic/plasma/plasmaCrawlLURL.java
index cdb36a851..39f44eec2 100644
--- a/source/de/anomic/plasma/plasmaCrawlLURL.java
+++ b/source/de/anomic/plasma/plasmaCrawlLURL.java
@@ -95,12 +95,7 @@ public final class plasmaCrawlLURL {
public plasmaCrawlLURL(File indexPath, long preloadTime) {
super();
- try {
- urlIndexFile = new kelondroFlexSplitTable(new File(indexPath, "PUBLIC/TEXT"), "urls", preloadTime, indexURLEntry.rowdef, false);
- } catch (IOException e) {
- e.printStackTrace();
- System.exit(-1);
- }
+ urlIndexFile = new kelondroFlexSplitTable(new File(indexPath, "PUBLIC/TEXT"), "urls", preloadTime, indexURLEntry.rowdef, false);
// init result stacks
externResultStack = new LinkedList();
diff --git a/source/de/anomic/plasma/plasmaCrawlStacker.java b/source/de/anomic/plasma/plasmaCrawlStacker.java
index 5dee78f64..c65471b0f 100644
--- a/source/de/anomic/plasma/plasmaCrawlStacker.java
+++ b/source/de/anomic/plasma/plasmaCrawlStacker.java
@@ -143,13 +143,9 @@ public final class plasmaCrawlStacker {
this.log.logSevere("Unable to shutdown all remaining stackCrawl threads", e1);
}
- try {
- this.log.logFine("Shutdown. Closing stackCrawl queue.");
- if (this.queue != null) this.queue.close();
- this.queue = null;
- } catch (IOException e) {
- this.log.logSevere("DB could not be closed properly.", e);
- }
+ this.log.logFine("Shutdown. Closing stackCrawl queue.");
+ if (this.queue != null) this.queue.close();
+ this.queue = null;
}
public int getNumActiveWorker() {
@@ -540,7 +536,7 @@ public final class plasmaCrawlStacker {
}
}
- public void close() throws IOException {
+ public void close() {
// closing the db
this.urlEntryCache.close();
diff --git a/source/de/anomic/plasma/plasmaHTCache.java b/source/de/anomic/plasma/plasmaHTCache.java
index 87ff83c97..a4156703d 100644
--- a/source/de/anomic/plasma/plasmaHTCache.java
+++ b/source/de/anomic/plasma/plasmaHTCache.java
@@ -1076,7 +1076,7 @@ public final class plasmaHTCache {
return this.resInfo;
}
- public boolean writeResourceInfo() throws IOException {
+ public boolean writeResourceInfo() {
assert(this.nomalizedURLHash != null) : "URL Hash is null";
if (this.resInfo == null) return false;
try {
diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java
index 86c4b7814..40a789ac7 100644
--- a/source/de/anomic/plasma/plasmaSwitchboard.java
+++ b/source/de/anomic/plasma/plasmaSwitchboard.java
@@ -1609,14 +1609,14 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
return cacheManager;
}
- synchronized public void htEntryStoreEnqueued(plasmaHTCache.Entry entry) throws IOException {
+ synchronized public void htEntryStoreEnqueued(plasmaHTCache.Entry entry) {
if (cacheManager.full())
htEntryStoreProcess(entry);
else
cacheManager.push(entry);
}
- synchronized public boolean htEntryStoreProcess(plasmaHTCache.Entry entry) throws IOException {
+ synchronized public boolean htEntryStoreProcess(plasmaHTCache.Entry entry) {
if (entry == null) return false;
@@ -1721,11 +1721,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
public boolean htEntryStoreJob() {
if (cacheManager.empty()) return false;
- try {
- return htEntryStoreProcess(cacheManager.pop());
- } catch (IOException e) {
- return false;
- }
+ return htEntryStoreProcess(cacheManager.pop());
}
public int htEntrySize() {
diff --git a/source/de/anomic/plasma/plasmaSwitchboardQueue.java b/source/de/anomic/plasma/plasmaSwitchboardQueue.java
index d2adb157e..80a6c5e58 100644
--- a/source/de/anomic/plasma/plasmaSwitchboardQueue.java
+++ b/source/de/anomic/plasma/plasmaSwitchboardQueue.java
@@ -155,7 +155,7 @@ public class plasmaSwitchboardQueue {
}
}
- public void clear() throws IOException {
+ public void clear() {
sbQueueStack = kelondroStack.reset(sbQueueStack);
}
diff --git a/source/de/anomic/plasma/plasmaWordConnotation.java b/source/de/anomic/plasma/plasmaWordConnotation.java
index 66e16c7d5..0f12a7d40 100644
--- a/source/de/anomic/plasma/plasmaWordConnotation.java
+++ b/source/de/anomic/plasma/plasmaWordConnotation.java
@@ -59,7 +59,7 @@ public class plasmaWordConnotation {
private static final int nodesize = 4048;
private kelondroDynTree refDB;
- public plasmaWordConnotation(File refDBfile, long preloadTime, char fillChar) throws IOException {
+ public plasmaWordConnotation(File refDBfile, long preloadTime, char fillChar) {
refDB = new kelondroDynTree(refDBfile, preloadTime, wordlength, nodesize, new kelondroRow("byte[] word-" + wordlength + ", Cardinal count-" + countlength, kelondroNaturalOrder.naturalOrder, 0), fillChar, true);
}
diff --git a/source/de/anomic/server/serverByteBuffer.java b/source/de/anomic/server/serverByteBuffer.java
index aee8715b6..04ecb4066 100644
--- a/source/de/anomic/server/serverByteBuffer.java
+++ b/source/de/anomic/server/serverByteBuffer.java
@@ -277,9 +277,13 @@ public final class serverByteBuffer extends OutputStream {
}
public boolean startsWith(byte[] bs) {
- if (length < bs.length) return false;
+ return startsWith(bs, 0);
+ }
+
+ public boolean startsWith(byte[] bs, int start) {
+ if (length - start < bs.length) return false;
for (int i = 0; i < bs.length; i++) {
- if (buffer[offset + i] != bs[i]) return false;
+ if (buffer[offset + i + start] != bs[i]) return false;
}
return true;
}
diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java
index 1f3d62106..f5e282731 100644
--- a/source/de/anomic/yacy/yacyClient.java
+++ b/source/de/anomic/yacy/yacyClient.java
@@ -126,6 +126,7 @@ public final class yacyClient {
obj.put("mytime", yacyCore.universalDateShortString(new Date()));
obj.put("myUTC", System.currentTimeMillis());
obj.put("seed", yacyCore.seedDB.mySeed.genSeedStr(key));
+ obj.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
// sending request
result = nxTools.table(
@@ -272,7 +273,8 @@ public final class yacyClient {
"&youare=" + target.hash +
"&key=" + key +
"&object=seed" +
- "&env=" + seedHash
+ "&env=" + seedHash +
+ "&network.unit.name=" + plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT)
),
target.getHexHash() + ".yacyh",
8000,
@@ -309,7 +311,8 @@ public final class yacyClient {
"&key=" +
"&object=rwicount" +
"&env=" + wordHash +
- "&ttl=0"
+ "&ttl=0" +
+ "&network.unit.name=" + plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT)
),
target.getHexHash() + ".yacyh",
10000,
@@ -345,7 +348,8 @@ public final class yacyClient {
"&key=" +
"&object=lurlcount" +
"&env=" +
- "&ttl=0";
+ "&ttl=0" +
+ "&network.unit.name=" + plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT);
// seinding request
try {
@@ -452,6 +456,7 @@ public final class yacyClient {
obj.put("profile", crypt.simpleEncode(rankingProfile.toExternalString()));
obj.put("constraint", constraint.exportB64());
obj.put("mytime", yacyCore.universalDateShortString(new Date()));
+ obj.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
if (abstractCache != null) obj.put("abstracts", "auto");
//yacyCore.log.logDebug("yacyClient.search url=" + url);
@@ -622,6 +627,7 @@ public final class yacyClient {
post.put("iam", yacyCore.seedDB.mySeed.hash);
post.put("youare", targetHash);
post.put("mytime", yacyCore.universalDateShortString(new Date()));
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
// get target address
String address = targetAddress(targetHash);
@@ -664,6 +670,7 @@ public final class yacyClient {
post.put("youare", targetHash);
post.put("subject", subject);
post.put("mytime", yacyCore.universalDateShortString(new Date()));
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
try {
post.put("message", new String(message, "UTF-8"));
} catch (UnsupportedEncodingException e) {
@@ -722,6 +729,7 @@ public final class yacyClient {
post.put("filename", filename);
post.put("filesize", Long.toString(filesize));
post.put("can-send-protocol", "http");
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
// send request
try {
@@ -763,6 +771,7 @@ public final class yacyClient {
post.put("filesize", Long.toString(file.length));
post.put("md5", serverCodings.encodeMD5Hex(file));
post.put("access", access);
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
HashMap files = new HashMap();
files.put("filename", file);
@@ -845,7 +854,8 @@ public final class yacyClient {
}
post.put("depth", "0");
post.put("ttl", "0");
-
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
+
// determining target address
final String address = targetSeed.getClusterAddress();
if (address == null) { return null; }
@@ -928,7 +938,8 @@ public final class yacyClient {
"&result=" + result +
"&reason=" + reason +
"&wordh=" + wordhashes +
- "&lurlEntry=" + ((entry == null) ? "" : crypt.simpleEncode(entry.toString(), key))
+ "&lurlEntry=" + ((entry == null) ? "" : crypt.simpleEncode(entry.toString(), key)) +
+ "&network.unit.name=" + plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT)
),
targetSeed.getHexHash() + ".yacyh",
60000,
@@ -1055,7 +1066,7 @@ public final class yacyClient {
post.put("iam", yacyCore.seedDB.mySeed.hash);
post.put("youare", targetSeed.hash);
post.put("wordc", Integer.toString(indexes.length));
-
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
int indexcount = 0;
final StringBuffer entrypost = new StringBuffer(indexes.length*73);
@@ -1131,6 +1142,8 @@ public final class yacyClient {
post.put("key", key);
post.put("iam", yacyCore.seedDB.mySeed.hash);
post.put("youare", targetSeed.hash);
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
+
String resource = "";
int urlc = 0;
int urlPayloadSize = 0;
@@ -1183,6 +1196,8 @@ public final class yacyClient {
final serverObjects post = new serverObjects(2);
post.put("iam", yacyCore.seedDB.mySeed.hash);
post.put("youare", targetSeed.hash);
+ post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
+
String address = targetSeed.getClusterAddress();
if (address == null) { address = "localhost:8080"; }
try {
@@ -1226,7 +1241,8 @@ public final class yacyClient {
"&myseed=" + yacyCore.seedDB.mySeed.genSeedStr(null) +
"&count=10" +
"&resource=global" +
- "&query=" + wordhashe),
+ "&query=" + wordhashe +
+ "&network.unit.name=" + plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT)),
target.getHexHash() + ".yacyh",
5000,
null,
diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java
index 13566f1ca..853157e2c 100644
--- a/source/de/anomic/yacy/yacyCore.java
+++ b/source/de/anomic/yacy/yacyCore.java
@@ -204,12 +204,7 @@ public class yacyCore {
// create or init news database
long memNews_time = Long.parseLong(switchboard.getConfig("ramCacheNews_time", "1000"));
- try {
- newsPool = new yacyNewsPool(yacyDBPath, memNews_time);
- } catch (IOException e) {
- e.printStackTrace();
- System.exit(-1);
- }
+ newsPool = new yacyNewsPool(yacyDBPath, memNews_time);
loadSeedUploadMethods();
diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java
index 8d10f74f1..c70ee26ef 100644
--- a/source/de/anomic/yacy/yacyNewsDB.java
+++ b/source/de/anomic/yacy/yacyNewsDB.java
@@ -64,13 +64,13 @@ public class yacyNewsDB {
private long preloadTime;
protected kelondroIndex news;
- public yacyNewsDB(File path, long preloadTime) throws IOException {
+ public yacyNewsDB(File path, long preloadTime) {
this.path = path;
this.preloadTime = preloadTime;
this.news = new kelondroCache(kelondroTree.open(path, true, preloadTime, yacyNewsRecord.rowdef), true, false);
}
- private void resetDB() throws IOException {
+ private void resetDB() {
try {close();} catch (Exception e) {}
if (path.exists()) path.delete();
this.news = new kelondroCache(kelondroTree.open(path, true, preloadTime, yacyNewsRecord.rowdef), true, false);
@@ -85,7 +85,7 @@ public class yacyNewsDB {
close();
}
- public int size() throws IOException {
+ public int size() {
return news.size();
}
@@ -148,7 +148,7 @@ public class yacyNewsDB {
);
}
- protected final kelondroRow.Entry r2b(yacyNewsRecord r) throws IOException {
+ protected final kelondroRow.Entry r2b(yacyNewsRecord r) {
try {
if (r == null) return null;
String attributes = r.attributes().toString();
diff --git a/source/de/anomic/yacy/yacyNewsPool.java b/source/de/anomic/yacy/yacyNewsPool.java
index f0b258521..13b49c933 100644
--- a/source/de/anomic/yacy/yacyNewsPool.java
+++ b/source/de/anomic/yacy/yacyNewsPool.java
@@ -265,7 +265,7 @@ public class yacyNewsPool {
private int maxDistribution;
- public yacyNewsPool(File yacyDBPath, long preloadTime) throws IOException {
+ public yacyNewsPool(File yacyDBPath, long preloadTime) {
newsDB = new yacyNewsDB(new File(yacyDBPath, "news1.db"), preloadTime);
outgoingNews = new yacyNewsQueue(new File(yacyDBPath, "newsOut1.stack"), newsDB);
publishedNews = new yacyNewsQueue(new File(yacyDBPath, "newsPublished1.stack"), newsDB);
@@ -283,12 +283,7 @@ public class yacyNewsPool {
}
public int dbSize() {
- try {
- return newsDB.size();
- } catch (IOException e) {
- e.printStackTrace();
- return 0;
- }
+ return newsDB.size();
}
public void publishMyNews(yacyNewsRecord record) {
diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java
index 2c24e27f8..fb43d42db 100644
--- a/source/de/anomic/yacy/yacySeed.java
+++ b/source/de/anomic/yacy/yacySeed.java
@@ -168,6 +168,9 @@ public class yacySeed {
/** zero-value */
public static final String ZERO = "0";
+ public static final String DFLT_NETWORK_UNIT = "freeworld";
+ public static final String DFLT_NETWORK_GROUP = "";
+
// class variables
/** the peer-hash */
public String hash;
diff --git a/yacy.init b/yacy.init
index 59ee10e40..7bc7284fd 100644
--- a/yacy.init
+++ b/yacy.init
@@ -750,12 +750,6 @@ CRDist1Target = kaskelix.de:8080,yacy.dyndns.org:8000,suma-lab.de:8080
# Hash of the peer, you would like to store to the data your installation collected.
storagePeerHash =
-#use /env/page.html (and if it exists page.class) as super template,
-# which includes the generated page in #[page]#.
-#This option is for developers only, because it may be integrated by default, or not,
-#but its not useful to mix configurations with and without this supertemplate.
-usePageTemplate = false
-
# Search sequence settings
# collection:
# time = time to get a RWI out of RAM cache, assortments and WORDS files