boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

removed warnings/unused entities

Browse Source
pull/1/head
Michael Peter Christen 13 years ago
parent 7028e8f6b9
commit b2d1c25ebb
10 changed files with 64 additions and 101 deletions
Show Stats Download Patch File Download Diff File

47
htroot/DemoServlet.java
Unescape View File

@ -1,11 +1,6 @@
import java.util.Iterator;
import net.yacy.yacy; import net.yacy.yacy;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.interaction.Interaction; import net.yacy.interaction.Interaction;
import net.yacy.search.Switchboard;
import de.anomic.data.BookmarkHelper;
import de.anomic.data.UserDB;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -13,17 +8,15 @@ public final class DemoServlet {
public static serverObjects respond(final RequestHeader header, public static serverObjects respond(final RequestHeader header,
final serverObjects post, final serverSwitch env) { final serverObjects post, final serverSwitch env) {
// return variable that accumulates replacements // return variable that accumulates replacements
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
final Switchboard sb = Switchboard.getSwitchboard();
prop.put("temperature", "-10°C"); prop.put("temperature", "-10°C");
// Display currently logged on user // Display currently logged on user
prop.put("username", Interaction.GetLoggedOnUser(header)); prop.put("username", Interaction.GetLoggedOnUser(header));
//Generate Userlist //Generate Userlist
int numUsers = 0; int numUsers = 0;
for (String user : Interaction.GetUsers()) { for (String user : Interaction.GetUsers()) {
@ -31,36 +24,36 @@ public final class DemoServlet {
numUsers++; numUsers++;
} }
prop.put("users", numUsers); prop.put("users", numUsers);
if (post != null) { if (post != null) {
if (post.containsKey("submit")) { if (post.containsKey("submit")) {
prop.put("temperature", post.get("textthing")); prop.put("temperature", post.get("textthing"));
String filename= post.get("textthing"); String filename= post.get("textthing");
int counter = 0; int counter = 0;
while (counter < 10) { while (counter < 10) {
prop.put("localimg_"+counter+"_path","/"+filename); prop.put("localimg_"+counter+"_path","/"+filename);
prop.put("localimg_"+counter+"_checked", "2"); prop.put("localimg_"+counter+"_checked", "2");
counter++; counter++;
} }
prop.put("localimg", counter); prop.put("localimg", counter);
prop.put("temperature", yacy.homedir+"/DATA/HTDOCS/"+filename); prop.put("temperature", yacy.homedir+"/DATA/HTDOCS/"+filename);
} }
} }
// return rewrite properties // return rewrite properties
return prop; return prop;
} }

5
htroot/DemoServletInteraction.java
Unescape View File

@ -1,5 +1,4 @@
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.BookmarkHelper;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -9,9 +8,9 @@ public final class DemoServletInteraction {
final serverObjects post, final serverSwitch env) { final serverObjects post, final serverSwitch env) {
// return variable that accumulates replacements // return variable that accumulates replacements
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
prop.put("temperature", "-10°C"); prop.put("temperature", "-10°C");
// return rewrite properties // return rewrite properties
return prop; return prop;
} }

32
htroot/DemoServletRDF.java
Unescape View File

@ -1,6 +1,4 @@
import net.yacy.yacy;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import de.anomic.data.BookmarkHelper;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
@ -10,37 +8,37 @@ public final class DemoServletRDF {
final serverObjects post, final serverSwitch env) { final serverObjects post, final serverSwitch env) {
// return variable that accumulates replacements // return variable that accumulates replacements
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
// prop.put("temperature", "-10°C"); // prop.put("temperature", "-10°C");
if (post != null) { if (post != null) {
if (post.containsKey("submit")) { if (post.containsKey("submit")) {
prop.put("temperature", post.get("textthing")); prop.put("temperature", post.get("textthing"));
String filename= post.get("textthing"); String filename= post.get("textthing");
// prop.put("imglink", filename+".jpg"); // prop.put("imglink", filename+".jpg");
int counter = 0; int counter = 0;
while (counter < 10) { while (counter < 10) {
prop.put("localimg_"+counter+"_path","/"+filename); prop.put("localimg_"+counter+"_path","/"+filename);
prop.put("localimg_"+counter+"_checked", "2"); prop.put("localimg_"+counter+"_checked", "2");
counter++; counter++;
} }
prop.put("localimg", counter); prop.put("localimg", counter);
// prop.put("temperature",yacy.homedir+"/DATA/HTDOCS/"+filename); // prop.put("temperature",yacy.homedir+"/DATA/HTDOCS/"+filename);
} }
} }
// return rewrite properties // return rewrite properties
return prop; return prop;
} }

14
htroot/api/yacydoc.java
Unescape View File

@ -25,24 +25,12 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import java.io.ByteArrayOutputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.util.Iterator;
import java.util.Map;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import net.yacy.cora.date.ISO8601Formatter; import net.yacy.cora.date.ISO8601Formatter;
import net.yacy.cora.document.ASCII; import net.yacy.cora.document.ASCII;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.lod.JenaTripleStore; import net.yacy.cora.lod.JenaTripleStore;
import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.lod.vocabulary.YaCyMetadata;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.sorting.ConcurrentScoreMap;
import net.yacy.cora.sorting.ScoreMap;
import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.data.meta.URIMetadataRow;
import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.data.word.Word;
@ -139,7 +127,7 @@ public class yacydoc {
prop.put("yacy_citations", sb.indexSegments.segment(Segments.Process.PUBLIC).urlCitation().count(entry.hash())); prop.put("yacy_citations", sb.indexSegments.segment(Segments.Process.PUBLIC).urlCitation().count(entry.hash()));
prop.put("yacy_inbound", entry.llocal()); prop.put("yacy_inbound", entry.llocal());
prop.put("yacy_outbound", entry.lother()); prop.put("yacy_outbound", entry.lother());
// extract the submodel from the triplestore // extract the submodel from the triplestore
prop.putXML("triples", JenaTripleStore.getMetadataByURLHash(entry.hash())); prop.putXML("triples", JenaTripleStore.getMetadataByURLHash(entry.hash()));

9
htroot/interaction/Triple.java
Unescape View File

@ -32,7 +32,6 @@ package interaction;
import net.yacy.cora.lod.JenaTripleStore; import net.yacy.cora.lod.JenaTripleStore;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.interaction.Interaction;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
import de.anomic.data.UserDB; import de.anomic.data.UserDB;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
@ -107,7 +106,7 @@ public class Triple {
if(post.containsKey("s")){ if(post.containsKey("s")){
s = post.get("s"); s = post.get("s");
} }
if(post.containsKey("sp")){ if(post.containsKey("sp")){
s = post.get("sp") + "#" + s; s = post.get("sp") + "#" + s;
} }
@ -115,7 +114,7 @@ public class Triple {
if(post.containsKey("p")){ if(post.containsKey("p")){
p = post.get("p"); p = post.get("p");
} }
if(post.containsKey("pp")){ if(post.containsKey("pp")){
p = post.get("pp") + "#" + p; p = post.get("pp") + "#" + p;
} }
@ -131,14 +130,14 @@ public class Triple {
if (post.containsKey("load")) { if (post.containsKey("load")) {
if (global) { if (global) {
o = JenaTripleStore.getObject(s, p); o = JenaTripleStore.getObject(s, p);
} else { } else {
o = JenaTripleStore.getPrivateObject(s, p, username); o = JenaTripleStore.getPrivateObject(s, p, username);
} }
} else { } else {
if (global) { if (global) {
JenaTripleStore.addTriple(s, p, o); JenaTripleStore.addTriple(s, p, o);
} else { } else {

15
htroot/interaction_elements/OverlayInteraction.java
Unescape View File

@ -1,24 +1,21 @@
package interaction_elements; package interaction_elements;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.search.Switchboard;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
public class OverlayInteraction { public class OverlayInteraction {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
prop.put("enabled", env.getConfigBool("interaction.overlayinteraction.enabled", false) ? "1" : "0"); prop.put("enabled", env.getConfigBool("interaction.overlayinteraction.enabled", false) ? "1" : "0");
prop.put("enabled_url", post.get("url", "")); prop.put("enabled_url", post.get("url", ""));
prop.put("enabled_urlhash", post.get("urlhash", "")); prop.put("enabled_urlhash", post.get("urlhash", ""));
return prop; return prop;
} }
} }

23
htroot/interaction_elements/Tag_part.java
Unescape View File

@ -4,36 +4,31 @@ package interaction_elements;
import java.util.Collection; import java.util.Collection;
import net.yacy.cora.lod.vocabulary.Tagging; import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.document.LibraryProvider; import net.yacy.document.LibraryProvider;
import net.yacy.search.Switchboard;
import de.anomic.data.UserDB;
import de.anomic.server.serverObjects; import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch; import de.anomic.server.serverSwitch;
public class Tag_part { public class Tag_part {
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects(); final serverObjects prop = new serverObjects();
prop.put("hash", post.get("hash", "")); prop.put("hash", post.get("hash", ""));
String vocabularies = ""; String vocabularies = "";
Collection<Tagging> vocs = LibraryProvider.autotagging.getVocabularies(); Collection<Tagging> vocs = LibraryProvider.autotagging.getVocabularies();
for (Tagging v: vocs) { for (Tagging v: vocs) {
vocabularies += v.getName()+","; vocabularies += v.getName()+",";
} }
vocabularies += "manual"; vocabularies += "manual";
prop.put("vocabularies", vocabularies); prop.put("vocabularies", vocabularies);
return prop; return prop;
} }
} }

2
source/net/yacy/document/geolocation/OpenGeoDBLocation.java
Unescape View File

@ -138,8 +138,8 @@ public class OpenGeoDBLocation implements Locations
} else if ( v[1].equals("400300000") ) { // Ortstyp } else if ( v[1].equals("400300000") ) { // Ortstyp
id = Integer.parseInt(v[0]); id = Integer.parseInt(v[0]);
h = removeQuotes(v[2]); h = removeQuotes(v[2]);
final Integer hc = h.hashCode();
/* /*
final Integer hc = h.hashCode();
final byte[] tb = this.locTypeHash2locType.get(hc); final byte[] tb = this.locTypeHash2locType.get(hc);
if ( tb == null ) { if ( tb == null ) {
this.locTypeHash2locType.put(hc, UTF8.getBytes(h)); this.locTypeHash2locType.put(hc, UTF8.getBytes(h));

7
source/net/yacy/interaction/AugmentHtmlStream.java
Unescape View File

@ -23,7 +23,6 @@ import net.yacy.search.Switchboard;
import org.htmlparser.Tag; import org.htmlparser.Tag;
import org.htmlparser.Text; import org.htmlparser.Text;
import org.htmlparser.tags.LinkTag;
import org.htmlparser.util.NodeList; import org.htmlparser.util.NodeList;
import org.htmlparser.visitors.NodeVisitor; import org.htmlparser.visitors.NodeVisitor;
@ -58,7 +57,7 @@ public class AugmentHtmlStream {
// Link // Link
Log.logInfo("AUGMENTATION", tag.getAttribute("href")); Log.logInfo("AUGMENTATION", tag.getAttribute("href"));
LinkTag lt = (LinkTag)tag; //LinkTag lt = (LinkTag)tag;
} }
@ -90,7 +89,7 @@ public class AugmentHtmlStream {
private int counter; private int counter;
public VisitorText() { public VisitorText() {
this.setCounter(0); this.counter = 0;
} }
@Override @Override
@ -377,7 +376,7 @@ public class AugmentHtmlStream {
.nextNode()); .nextNode());
NodeList bodychildren = bt.getChildren(); NodeList bodychildren = bt.getChildren();
bodychildren.add(new org.htmlparser.nodes.TextNode(loadInternal("interaction_elements/OverlayInteraction.html?urlhash="+ ASCII.String(url.hash()) +"&url="+url.toNormalform(false, true), requestHeader))); bodychildren.add(new org.htmlparser.nodes.TextNode(loadInternal("interaction_elements/OverlayInteraction.html?urlhash="+ ASCII.String(url.hash()) +"&url="+url.toNormalform(false, true), requestHeader)));
bt.setChildren(bodychildren); bt.setChildren(bodychildren);

11
source/net/yacy/interaction/Interaction.java
Unescape View File

@ -9,7 +9,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import net.yacy.cora.document.UTF8; import net.yacy.cora.document.UTF8;
import net.yacy.cora.lod.JenaTripleStore;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.HTTPClient;
@ -22,10 +21,6 @@ import net.yacy.search.Switchboard;
import org.apache.http.entity.mime.content.ContentBody; import org.apache.http.entity.mime.content.ContentBody;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.StmtIterator;
import de.anomic.data.UserDB; import de.anomic.data.UserDB;
@ -36,7 +31,7 @@ public class Interaction {
UserDB.Entry entry = null; UserDB.Entry entry = null;
String result = "anonymous"; //String result = "anonymous";
entry = Switchboard.getSwitchboard().userDB.proxyAuth((requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx"))); entry = Switchboard.getSwitchboard().userDB.proxyAuth((requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx")));
if(entry != null){ if(entry != null){
@ -126,8 +121,8 @@ public class Interaction {
} }
public static String GetTableentry(String url, String type, String username, String peer) { public static String GetTableentry(String url, String type, String username, String peer) {

Write Preview
Loading…
Cancel
Save