adopted search page to new detailed search (to be commited later)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1550 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/index.html

@@ -19,7 +19,6 @@ picMinus.src = "/env/grafics/minus.gif";
   <center><h2><font size="2" face="Helvetica, Arial" color="#212942"><img src="/env/grafics/kaskelix.png" align="middle" alt="YaCy logo Kaskelix"><br>P2P WEB SEARCH</font></h2></center><br>
   <center>#[promoteSearchPageGreeting]#</center><br>
 
- <!-- <form action="yacy/search.html" method="get"> -->
   <form action="index.html" method="get">
   <center>
   

htroot/index.java

@@ -181,7 +181,7 @@ public class index {
         }
 
         // do the search
-        plasmaSearchQuery thisSearch = new plasmaSearchQuery(query, maxDistance, count, searchtime, urlmask, referer,
+        plasmaSearchQuery thisSearch = new plasmaSearchQuery(query, maxDistance, count, searchtime, urlmask,
                                                              ((global) && (yacyonline) && (!(env.getConfig("last-search","").equals(querystring)))) ? plasmaSearchQuery.SEARCHDOM_GLOBALDHT : plasmaSearchQuery.SEARCHDOM_LOCAL,
                                                              "", 20);
         plasmaSearchRankingProfile ranking = new plasmaSearchRankingProfile(new String[]{order1, order2, order3});

htroot/websearch.html

@@ -16,8 +16,6 @@ picMinus.src = "/env/grafics/minus.gif";
   </SCRIPT>
 
 
-
- <!-- <form action="yacy/search.html" method="get"> -->
   <form action="websearch.html" method="get">
   <center>
   <p>

source/de/anomic/plasma/plasmaSearchQuery.java

@@ -60,7 +60,6 @@ public final class plasmaSearchQuery {
     
     public Set queryWords;
     public Set queryHashes;
-    public String referrer;
     public int wantedResults;
     public long maximumTime;
     public String urlMask;
@@ -70,7 +69,7 @@ public final class plasmaSearchQuery {
     public int maxDistance;
 
     public plasmaSearchQuery(Set queryWords, int maxDistance,
-                             int wantedResults, long maximumTime, String urlMask, String referrer,
+                             int wantedResults, long maximumTime, String urlMask,
                              int domType, String domGroupName, int domMaxTargets) {
         this.queryWords = queryWords;
         this.maxDistance = maxDistance;
@@ -78,7 +77,6 @@ public final class plasmaSearchQuery {
         this.wantedResults = wantedResults;
         this.maximumTime = maximumTime;
         this.urlMask = urlMask;
-        this.referrer = referrer;
         this.domType = domType;
         this.domGroupName = domGroupName;
         this.domMaxTargets = domMaxTargets;

source/de/anomic/plasma/plasmaSearchRankingProfile.java

@@ -43,6 +43,7 @@ package de.anomic.plasma;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 public class plasmaSearchRankingProfile {
@@ -97,6 +98,16 @@ public class plasmaSearchRankingProfile {
         coeff.put(DESCRCOMPINTOPLIST, new Integer(11));
     }
     
+    public plasmaSearchRankingProfile(String profile) {
+        this(); // set defaults
+        //parse external form
+        String[] elts = profile.substring(1, profile.length() - 1).split(",");
+        int p;
+        for (int i = 0; i < elts.length; i++) {
+            coeff.put(elts[i].substring(0, (p = elts[i].indexOf("="))), elts[i].substring(p + 1));
+        }
+    }
+    
     public plasmaSearchRankingProfile(String[] order) {
         this(); // set defaults
         this.order = order;
@@ -112,6 +123,14 @@ public class plasmaSearchRankingProfile {
         return order[0] + "-" + order[1] + "-" + order[2];
     }
 
+    public String toExternalForm() {
+        return coeff.toString();
+    }
+    
+    public Map coeff() {
+        return this.coeff;
+    }
+    
     public long preRanking(plasmaWordIndexEntry normalizedEntry) {
         long ranking = 0;