From 9f02d2c47b4d4bb802f8f84a5bc2dd7a4826abb4 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sun, 16 Mar 2014 22:11:19 +0100
Subject: [PATCH] fix: remove link to triplestore in Vocabulary_p (triplestore
 does not longer exist) - should be investigated in more detail to look for
 additional implications Remove "yacyaction" from proxyservlet as it was only
 needed for removed interaction routines.

---
 htroot/Vocabulary_p.html                            |  2 +-
 source/net/yacy/http/servlets/YaCyProxyServlet.java | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/htroot/Vocabulary_p.html b/htroot/Vocabulary_p.html
index d3ac606b3..5b1c7b019 100644
--- a/htroot/Vocabulary_p.html
+++ b/htroot/Vocabulary_p.html
@@ -134,7 +134,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
         <dt>Prefix</dt><dd>#[prefix]#</dd>
         <dt>Objectspace</dt><dd>#(editable)##[objectspace]#::<input type="text" name="objectspace" value="#[objectspace]#" size="78" maxlength="128" /><br/>if set, uses the predicate <a href="#[objectspacepredicate]#" target="_blank">#[objectspacepredicate]#</a> for generated objects. Hint: use 'http://dbpedia.org/resource/' as default.#(/editable)#</dd>
       </dl>
-      <p>This produces the following triples in the <a href="interaction/GetRDF.xml?global=">triplestore</a> if a term or synonym matches in a document:</p>
+      <p>This produces the following triples in the triplestore if a term or synonym matches in a document:</p>
       <dl>
         <dt>Triple #1</dt><dd>#[triple1]#</dd>
         <dt>Triple #2</dt><dd>#[triple2]#</dd>
diff --git a/source/net/yacy/http/servlets/YaCyProxyServlet.java b/source/net/yacy/http/servlets/YaCyProxyServlet.java
index c0ae0a786..b1c93f00f 100644
--- a/source/net/yacy/http/servlets/YaCyProxyServlet.java
+++ b/source/net/yacy/http/servlets/YaCyProxyServlet.java
@@ -93,7 +93,6 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
         if ("CONNECT".equalsIgnoreCase(request.getMethod())) {
             handleConnect(request, response);
         } else {
-            String action = null;
 
             final Continuation continuation = ContinuationSupport.getContinuation(request);
 
@@ -108,11 +107,6 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
                 return;
             }
 
-            if (strARGS.startsWith("action=")) {
-                int detectnextargument = strARGS.indexOf("&");
-                action = strARGS.substring(7, detectnextargument);
-                strARGS = strARGS.substring(detectnextargument + 1);
-            }
             if (strARGS.startsWith("url=")) {
                 final String strUrl = strARGS.substring(4); // strip "url="
 
@@ -144,8 +138,6 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
             prop.put(HeaderFramework.CONNECTION_PROP_CLIENTIP, Domains.LOCALHOST);
 
             yacyRequestHeader.put(HeaderFramework.HOST, hostwithport );
-            // temporarily add argument to header to pass it on to augmented browsing
-            if (action != null) yacyRequestHeader.put("YACYACTION", action);
 
             final ByteArrayOutputStream tmpproxyout = new ByteArrayOutputStream();
             HTTPDProxyHandler.doGet(prop, yacyRequestHeader, tmpproxyout, ClientIdentification.yacyProxyAgent);
@@ -177,11 +169,10 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
             if (response.getHeader(HeaderFramework.LOCATION) != null) {
                 // rewrite location header
                 String location = response.getHeader(HeaderFramework.LOCATION);
-                final String actioncmdstr = (action != null) ? "?action=" + action + "&" : "?";
                 if (location.startsWith("http")) {
-                    location = request.getServletPath() + actioncmdstr + "url=" + location;
+                    location = request.getServletPath() + "?url=" + location;
                 } else {
-                    location = request.getServletPath() + actioncmdstr + "url=http://" + hostwithport + "/" + location;
+                    location = request.getServletPath() + "?url=http://" + hostwithport + "/" + location;
                 }
                 response.addHeader(HeaderFramework.LOCATION, location);
             }