cleaned, finals, Properties

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@859 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
borg-0300 20 years ago
parent 4191b21e73
commit 2a18e6486b

@ -1,81 +1,80 @@
//EditProfile_p.java
//-----------------------
//part of YACY
//(C) by Michael Peter Christen; mc@anomic.de
//first published on http://www.anomic.de
//Frankfurt, Germany, 2004, 2005
// EditProfile_p.java
// -----------------------
// part of YACY
// (C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de
// Frankfurt, Germany, 2004, 2005
//
//This File is contributed by Alexander Schier
//last change: 29.06.2005 by Marc Nause
// This File is contributed by Alexander Schier
//
//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.
// $LastChangedDate$
// $LastChangedRevision$
// $LastChangedBy$
//
//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.
// 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.
//
//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
// 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.
//
//Using this software in any meaning (reading, learning, copying, compiling,
//running) means that you agree that the Author(s) is (are) not responsible
//for cost, loss of data or any harm that may be caused directly or indirectly
//by usage of this softare or this documentation. The usage of this software
//is on your own risk. The installation and usage (starting/running) of this
//software may allow other people or application to access your computer and
//any attached devices and is highly dependent on the configuration of the
//software which must be done by the user of the software; the author(s) is
//(are) also not responsible for proper configuration and usage of the
//software, even if provoked by documentation provided together with
//the software.
// 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
//
//Any changes to this file according to the GPL as documented in the file
//gpl.txt aside this file in the shipment you received can be done to the
//lines that follows this copyright notice here, but changes must not be
//done inside the copyright notive above. A re-distribution must contain
//the intact and unchanged copyright notice.
//Contributions and changes to the program code must be marked as such.
// Using this software in any meaning (reading, learning, copying, compiling,
// running) means that you agree that the Author(s) is (are) not responsible
// for cost, loss of data or any harm that may be caused directly or indirectly
// by usage of this softare or this documentation. The usage of this software
// is on your own risk. The installation and usage (starting/running) of this
// software may allow other people or application to access your computer and
// any attached devices and is highly dependent on the configuration of the
// software which must be done by the user of the software; the author(s) is
// (are) also not responsible for proper configuration and usage of the
// software, even if provoked by documentation provided together with
// the software.
//
// Any changes to this file according to the GPL as documented in the file
// gpl.txt aside this file in the shipment you received can be done to the
// lines that follows this copyright notice here, but changes must not be
// done inside the copyright notive above. A re-distribution must contain
// the intact and unchanged copyright notice.
// Contributions and changes to the program code must be marked as such.
//You must compile this file with
//javac -classpath .:../Classes Blacklist_p.java
//if the shell's current path is HTROOT
// You must compile this file with
// javac -classpath .:../classes EditProfile_p.java
// if the shell's current path is HTROOT
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
import java.util.Map;
import java.util.HashMap;
import de.anomic.http.httpHeader;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
import de.anomic.yacy.yacyNewsRecord;
import de.anomic.yacy.yacyCore;
public class EditProfile_p {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
//listManager.switchboard = (plasmaSwitchboard) env;
serverObjects prop = new serverObjects();
Properties profile = new Properties();
final serverObjects prop = new serverObjects();
final Properties profile = new Properties();
FileInputStream fileIn = null;
try{
try {
fileIn = new FileInputStream(new File("DATA/SETTINGS/profile.txt"));
profile.load(fileIn);
} catch(IOException e){
} catch(IOException e) {
} finally {
if (fileIn != null) try { fileIn.close(); } catch (Exception e) {}
}
if(post != null && post.containsKey("set")){
if (post != null && post.containsKey("set")) {
profile.setProperty("name", (String)post.get("name"));
profile.setProperty("nickname", (String)post.get("nickname"));
profile.setProperty("homepage", (String)post.get("homepage"));
@ -90,14 +89,14 @@ public class EditProfile_p {
// write new values
FileOutputStream fileOut = null;
try{
try {
fileOut = new FileOutputStream(new File("DATA/SETTINGS/profile.txt"));
profile.store(fileOut , null );
// generate a news message
//HashMap map = new HashMap();
// HashMap map = new HashMap();
yacyCore.newsPool.publishMyNews(new yacyNewsRecord("prfleupd", profile));
}catch(IOException e){
} catch(IOException e) {
} finally {
if (fileOut != null) try { fileOut.close(); } catch (Exception e) {}
}

@ -4,7 +4,10 @@
// (C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de
// Frankfurt, Germany, 2004
// last major change: 12.07.2003
//
// $LastChangedDate$
// $LastChangedRevision$
// $LastChangedBy$
//
// 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
@ -38,8 +41,7 @@
// done inside the copyright notive above. A re-distribution must contain
// the intact and unchanged copyright notice.
// Contributions and changes to the program code must be marked as such.
//
// You must compile this file with
// javac -classpath .:../classes index.java
// if the shell's current path is HTROOT
@ -49,7 +51,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.TreeSet;
import de.anomic.htmlFilter.htmlFilterContentScraper;
import de.anomic.http.httpHeader;
import de.anomic.kelondro.kelondroMSetTools;
@ -64,24 +65,24 @@ import de.anomic.yacy.yacyCore;
public class index {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
plasmaSwitchboard sb = (plasmaSwitchboard) env;
final plasmaSwitchboard sb = (plasmaSwitchboard) env;
boolean global = (post == null) ? true : ((String) post.get("resource", "global")).equals("global");
boolean indexDistributeGranted = sb.getConfig("allowDistributeIndex", "true").equals("true");
boolean indexReceiveGranted = sb.getConfig("allowReceiveIndex", "true").equals("true");
if ((!indexDistributeGranted) || (!indexReceiveGranted)) global = false;
final boolean indexDistributeGranted = sb.getConfig("allowDistributeIndex", "true").equals("true");
final boolean indexReceiveGranted = sb.getConfig("allowReceiveIndex", "true").equals("true");
if (!indexDistributeGranted || !indexReceiveGranted) { global = false; }
// case if no values are requested
if ((post == null) || (env == null)) {
if (post == null || env == null) {
// save referrer
//System.out.println("HEADER=" + header.toString());
String referer = (String) header.get("Referer");
// System.out.println("HEADER=" + header.toString());
final String referer = (String) header.get("Referer");
if (referer != null) {
URL url;
try { url = new URL(referer); } catch (MalformedURLException e) { url = null; }
if ((url != null) && (serverCore.isNotLocal(url))) {
HashMap referrerprop = new HashMap();
final HashMap referrerprop = new HashMap();
referrerprop.put("count", "1");
referrerprop.put("clientip", header.get("CLIENTIP"));
referrerprop.put("useragent", header.get("User-Agent"));
@ -91,7 +92,7 @@ public class index {
}
// we create empty entries for template strings
serverObjects prop = new serverObjects();
final serverObjects prop = new serverObjects();
prop.put("promoteSearchPageGreeting", env.getConfig("promoteSearchPageGreeting", ""));
prop.put("former", "");
prop.put("num-results", 0);
@ -117,41 +118,41 @@ public class index {
return prop;
}
// SEARCH
// process search words
String querystring = (String) post.get("search", "");
final String querystring = (String) post.get("search", "");
if (sb.facilityDB != null) try { sb.facilityDB.update("zeitgeist", querystring, post); } catch (Exception e) {}
TreeSet query = cleanQuery(querystring);
final TreeSet query = cleanQuery(querystring);
// filter out stopwords
TreeSet filtered = kelondroMSetTools.joinConstructive(query, plasmaSwitchboard.stopwords);
if (filtered.size() > 0) kelondroMSetTools.excludeDestructive(query, plasmaSwitchboard.stopwords);
final TreeSet filtered = kelondroMSetTools.joinConstructive(query, plasmaSwitchboard.stopwords);
if (filtered.size() > 0) {
kelondroMSetTools.excludeDestructive(query, plasmaSwitchboard.stopwords);
}
// prepare search order
String order = (String) post.get("order", "");
int count = Integer.parseInt((String) post.get("count", "10"));
long searchtime = 1000 * Long.parseLong((String) post.get("time", "1"));
boolean yacyonline = ((yacyCore.seedDB != null) &&
final String order = (String) post.get("order", "");
final int count = Integer.parseInt((String) post.get("count", "10"));
final long searchtime = 1000 * Long.parseLong((String) post.get("time", "1"));
final boolean yacyonline = ((yacyCore.seedDB != null) &&
(yacyCore.seedDB.mySeed != null) &&
(yacyCore.seedDB.mySeed.getAddress() != null));
String order1 = (order.equals("Quality-Date")) ? "quality" : "date";
String order2 = (order.equals("Quality-Date")) ? "date" : "quality";
String urlmask="";
if(post.containsKey("urlmask") && post.get("urlmask").equals("no")){
urlmask=".*";
}else{
final String order1 = (order.equals("Quality-Date")) ? "quality" : "date";
final String order2 = (order.equals("Quality-Date")) ? "date" : "quality";
String urlmask = "";
if (post.containsKey("urlmask") && post.get("urlmask").equals("no")) {
urlmask = ".*";
} else {
urlmask = (post.containsKey("urlmaskfilter")) ? (String) post.get("urlmaskfilter") : ".*";
}
// do the search
serverObjects prop = ((plasmaSwitchboard) env).searchFromLocal(query, order1, order2, count,
final serverObjects prop = ((plasmaSwitchboard) env).searchFromLocal(query, order1, order2, count,
((global) && (yacyonline) && (!(env.getConfig("last-search","").equals(querystring)))),
searchtime, urlmask);
// remember the last search expression
env.setConfig("last-search", querystring);
// process result of search
prop.put("resultbottomline", 0);
if (filtered.size() > 0){
@ -160,28 +161,28 @@ public class index {
} else {
prop.put("excluded", 0);
}
if ((prop == null) || (prop.size() == 0)) {
if (((String) post.get("search", "")).length() < 3)
prop.put("num-results", 2);//no results - at least 3 chars
else
prop.put("num-results", 1);//no results
if (prop == null || prop.size() == 0) {
if (((String) post.get("search", "")).length() < 3) {
prop.put("num-results", 2); // no results - at least 3 chars
} else {
int linkcount = Integer.parseInt(prop.get("linkcount", "0"));
int orderedcount = Integer.parseInt(prop.get("orderedcount", "0"));
int totalcount = Integer.parseInt(prop.get("totalcount", "0"));
prop.put("num-results", 1);//no results
}
} else {
final int linkcount = Integer.parseInt(prop.get("linkcount", "0"));
final int orderedcount = Integer.parseInt(prop.get("orderedcount", "0"));
final int totalcount = Integer.parseInt(prop.get("totalcount", "0"));
if (totalcount > 10) {
Object[] references = (Object[]) prop.get("references", new String[0]);
final Object[] references = (Object[]) prop.get("references", new String[0]);
prop.put("num-results", 4);
prop.put("num-results_linkcount", linkcount);
prop.put("num-results_orderedcount", orderedcount);
prop.put("num-results_totalcount", totalcount);
int hintcount = references.length;
if (hintcount > 0) {
if (hintcount > 16) hintcount = 16;
if (hintcount > 16) { hintcount = 16; }
prop.put("combine", 1);
String word;
int p;
for (int i = 0; i < hintcount; i++) {
word = (String) references[i];
if (word != null) {
@ -196,9 +197,9 @@ public class index {
}
}
} else {
if (totalcount == 0)
if (totalcount == 0) {
prop.put("num-results", 3);//long
else {
} else {
prop.put("num-results", 4);
prop.put("num-results_linkcount", linkcount);
prop.put("num-results_orderedcount", orderedcount);
@ -207,7 +208,7 @@ public class index {
}
}
if(urlmask.equals(".*")){
if (urlmask.equals(".*")) {
prop.put("urlmaskoptions", 0);
} else {
prop.put("urlmaskoptions", 1);
@ -223,11 +224,12 @@ public class index {
prop.put("resultbottomline", 2);
}
} else {
if (global)
if (global) {
prop.put("resultbottomlien", 3);
else
} else {
prop.put("resultbottomline", 4);
}
}
prop.put("count-10", ((count == 10)) ? 1 : 0);
prop.put("count-50", ((count == 50)) ? 1 : 0);
@ -267,17 +269,18 @@ public class index {
words = htmlFilterContentScraper.convertUmlaute(new serverByteBuffer(words.getBytes())).toString();
// remove funny symbols
String seps = "' .,:/-&";
final String seps = "' .,:/-&";
words = words.toLowerCase().trim();
int c;
for (int i = 0; i < seps.length(); i++) {
if ((c = words.indexOf(seps.charAt(i))) >= 0) words = words.substring(0, c) + (((c + 1) < words.length()) ? (" " + words.substring(c + 1)) : "");
if ((c = words.indexOf(seps.charAt(i))) >= 0) { words = words.substring(0, c) + (((c + 1) < words.length()) ? (" " + words.substring(c + 1)) : ""); }
}
// the string is clean now, but we must generate a set out of it
String[] a = words.split(" ");
TreeSet query = new TreeSet(kelondroMSetTools.fastStringComparator);
for (int i = 0; i < a.length; i++) query.add(a[i]);
final String[] a = words.split(" ");
final TreeSet query = new TreeSet(kelondroMSetTools.fastStringComparator);
for (int i = 0; i < a.length; i++) { query.add(a[i]); }
return query;
}
}
Loading…
Cancel
Save