diff --git a/htroot/DemoServlet.java b/htroot/DemoServlet.java index 98d6ce3e3..42cc2b491 100644 --- a/htroot/DemoServlet.java +++ b/htroot/DemoServlet.java @@ -1,11 +1,6 @@ -import java.util.Iterator; - import net.yacy.yacy; import net.yacy.cora.protocol.RequestHeader; 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.serverSwitch; @@ -13,17 +8,15 @@ public final class DemoServlet { public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { - + // return variable that accumulates replacements final serverObjects prop = new serverObjects(); - - final Switchboard sb = Switchboard.getSwitchboard(); - + prop.put("temperature", "-10°C"); - + // Display currently logged on user prop.put("username", Interaction.GetLoggedOnUser(header)); - + //Generate Userlist int numUsers = 0; for (String user : Interaction.GetUsers()) { @@ -31,36 +24,36 @@ public final class DemoServlet { numUsers++; } prop.put("users", numUsers); - - - + + + if (post != null) { - + if (post.containsKey("submit")) { - + prop.put("temperature", post.get("textthing")); - + String filename= post.get("textthing"); - + int counter = 0; - + while (counter < 10) { - + prop.put("localimg_"+counter+"_path","/"+filename); - + prop.put("localimg_"+counter+"_checked", "2"); counter++; } - + prop.put("localimg", counter); - - - + + + prop.put("temperature", yacy.homedir+"/DATA/HTDOCS/"+filename); } - + } - + // return rewrite properties return prop; } diff --git a/htroot/DemoServletInteraction.java b/htroot/DemoServletInteraction.java index 2e974e421..f8d34a4b0 100644 --- a/htroot/DemoServletInteraction.java +++ b/htroot/DemoServletInteraction.java @@ -1,5 +1,4 @@ import net.yacy.cora.protocol.RequestHeader; -import de.anomic.data.BookmarkHelper; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; @@ -9,9 +8,9 @@ public final class DemoServletInteraction { final serverObjects post, final serverSwitch env) { // return variable that accumulates replacements final serverObjects prop = new serverObjects(); - + prop.put("temperature", "-10°C"); - + // return rewrite properties return prop; } diff --git a/htroot/DemoServletRDF.java b/htroot/DemoServletRDF.java index 593d6bcbe..25d2143d1 100644 --- a/htroot/DemoServletRDF.java +++ b/htroot/DemoServletRDF.java @@ -1,6 +1,4 @@ -import net.yacy.yacy; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.data.BookmarkHelper; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; @@ -10,37 +8,37 @@ public final class DemoServletRDF { final serverObjects post, final serverSwitch env) { // return variable that accumulates replacements final serverObjects prop = new serverObjects(); - + // prop.put("temperature", "-10°C"); - + if (post != null) { - + if (post.containsKey("submit")) { prop.put("temperature", post.get("textthing")); - + String filename= post.get("textthing"); - + // prop.put("imglink", filename+".jpg"); - + int counter = 0; - + while (counter < 10) { - + prop.put("localimg_"+counter+"_path","/"+filename); - + prop.put("localimg_"+counter+"_checked", "2"); counter++; } - + prop.put("localimg", counter); - - - + + + // prop.put("temperature",yacy.homedir+"/DATA/HTDOCS/"+filename); } - + } - + // return rewrite properties return prop; } diff --git a/htroot/api/yacydoc.java b/htroot/api/yacydoc.java index a49d5d2bd..5fbf31794 100644 --- a/htroot/api/yacydoc.java +++ b/htroot/api/yacydoc.java @@ -25,24 +25,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import java.io.ByteArrayOutputStream; 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.document.ASCII; -import net.yacy.cora.document.UTF8; 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.sorting.ConcurrentScoreMap; -import net.yacy.cora.sorting.ScoreMap; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; 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_inbound", entry.llocal()); prop.put("yacy_outbound", entry.lother()); - + // extract the submodel from the triplestore prop.putXML("triples", JenaTripleStore.getMetadataByURLHash(entry.hash())); diff --git a/htroot/interaction/Triple.java b/htroot/interaction/Triple.java index 92f92c841..95c1e23f6 100644 --- a/htroot/interaction/Triple.java +++ b/htroot/interaction/Triple.java @@ -32,7 +32,6 @@ package interaction; import net.yacy.cora.lod.JenaTripleStore; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; -import net.yacy.interaction.Interaction; import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.server.serverObjects; @@ -107,7 +106,7 @@ public class Triple { if(post.containsKey("s")){ s = post.get("s"); } - + if(post.containsKey("sp")){ s = post.get("sp") + "#" + s; } @@ -115,7 +114,7 @@ public class Triple { if(post.containsKey("p")){ p = post.get("p"); } - + if(post.containsKey("pp")){ p = post.get("pp") + "#" + p; } @@ -131,14 +130,14 @@ public class Triple { if (post.containsKey("load")) { if (global) { - o = JenaTripleStore.getObject(s, p); + o = JenaTripleStore.getObject(s, p); } else { o = JenaTripleStore.getPrivateObject(s, p, username); } } else { - + if (global) { JenaTripleStore.addTriple(s, p, o); } else { diff --git a/htroot/interaction_elements/OverlayInteraction.java b/htroot/interaction_elements/OverlayInteraction.java index 34072e410..237cdf8d3 100644 --- a/htroot/interaction_elements/OverlayInteraction.java +++ b/htroot/interaction_elements/OverlayInteraction.java @@ -1,24 +1,21 @@ package interaction_elements; import net.yacy.cora.protocol.RequestHeader; -import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; public class OverlayInteraction { - + public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { - - final Switchboard sb = (Switchboard) env; - + final serverObjects prop = new serverObjects(); prop.put("enabled", env.getConfigBool("interaction.overlayinteraction.enabled", false) ? "1" : "0"); - + prop.put("enabled_url", post.get("url", "")); - - prop.put("enabled_urlhash", post.get("urlhash", "")); - + + prop.put("enabled_urlhash", post.get("urlhash", "")); + return prop; } } diff --git a/htroot/interaction_elements/Tag_part.java b/htroot/interaction_elements/Tag_part.java index fd4154eb5..36f17ab9b 100644 --- a/htroot/interaction_elements/Tag_part.java +++ b/htroot/interaction_elements/Tag_part.java @@ -4,36 +4,31 @@ package interaction_elements; import java.util.Collection; import net.yacy.cora.lod.vocabulary.Tagging; -import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.LibraryProvider; -import net.yacy.search.Switchboard; -import de.anomic.data.UserDB; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; public class Tag_part { - + public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { - - final Switchboard sb = (Switchboard) env; - + final serverObjects prop = new serverObjects(); - + prop.put("hash", post.get("hash", "")); - + String vocabularies = ""; - + Collection vocs = LibraryProvider.autotagging.getVocabularies(); - + for (Tagging v: vocs) { vocabularies += v.getName()+","; } - + vocabularies += "manual"; - + prop.put("vocabularies", vocabularies); - + return prop; } } diff --git a/source/net/yacy/document/geolocation/OpenGeoDBLocation.java b/source/net/yacy/document/geolocation/OpenGeoDBLocation.java index 4b2608341..0c09b8ab4 100644 --- a/source/net/yacy/document/geolocation/OpenGeoDBLocation.java +++ b/source/net/yacy/document/geolocation/OpenGeoDBLocation.java @@ -138,8 +138,8 @@ public class OpenGeoDBLocation implements Locations } else if ( v[1].equals("400300000") ) { // Ortstyp id = Integer.parseInt(v[0]); h = removeQuotes(v[2]); - final Integer hc = h.hashCode(); /* + final Integer hc = h.hashCode(); final byte[] tb = this.locTypeHash2locType.get(hc); if ( tb == null ) { this.locTypeHash2locType.put(hc, UTF8.getBytes(h)); diff --git a/source/net/yacy/interaction/AugmentHtmlStream.java b/source/net/yacy/interaction/AugmentHtmlStream.java index a9605488d..396dcbfe6 100644 --- a/source/net/yacy/interaction/AugmentHtmlStream.java +++ b/source/net/yacy/interaction/AugmentHtmlStream.java @@ -23,7 +23,6 @@ import net.yacy.search.Switchboard; import org.htmlparser.Tag; import org.htmlparser.Text; -import org.htmlparser.tags.LinkTag; import org.htmlparser.util.NodeList; import org.htmlparser.visitors.NodeVisitor; @@ -58,7 +57,7 @@ public class AugmentHtmlStream { // Link Log.logInfo("AUGMENTATION", tag.getAttribute("href")); - LinkTag lt = (LinkTag)tag; + //LinkTag lt = (LinkTag)tag; } @@ -90,7 +89,7 @@ public class AugmentHtmlStream { private int counter; public VisitorText() { - this.setCounter(0); + this.counter = 0; } @Override @@ -377,7 +376,7 @@ public class AugmentHtmlStream { .nextNode()); 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))); bt.setChildren(bodychildren); diff --git a/source/net/yacy/interaction/Interaction.java b/source/net/yacy/interaction/Interaction.java index ad3089986..b10bf0b86 100644 --- a/source/net/yacy/interaction/Interaction.java +++ b/source/net/yacy/interaction/Interaction.java @@ -9,7 +9,6 @@ import java.util.Map; import java.util.Set; import net.yacy.cora.document.UTF8; -import net.yacy.cora.lod.JenaTripleStore; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; 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 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; @@ -36,7 +31,7 @@ public class Interaction { UserDB.Entry entry = null; - String result = "anonymous"; + //String result = "anonymous"; entry = Switchboard.getSwitchboard().userDB.proxyAuth((requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx"))); if(entry != null){ @@ -126,8 +121,8 @@ public class Interaction { } - - + + public static String GetTableentry(String url, String type, String username, String peer) {