added RECENT command for search query:

add RECENT (in uppercase letters) to the search words and results will be ordered by date (recent first) git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4825 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · May 18, 2008 · 53dfe9f · 53dfe9f
1 parent a7dadf7
commit 53dfe9f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/htroot/yacy/ui/result.java b/htroot/yacy/ui/result.java
@@ -163,16 +163,17 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
 
         if ((!block) && (post.get("cat", "href").equals("href"))) {
 
+            plasmaSearchRankingProfile ranking = sb.getRanking();
             final TreeSet<String>[] query = plasmaSearchQuery.cleanQuery(querystring); // converts also umlaute
-            boolean near = (query[0].contains("near")) && (querystring.indexOf("NEAR") >= 0);
-            if (near) {
-            	query[0].remove("near");
+            if ((query[0].contains("near")) && (querystring.indexOf("NEAR") >= 0)) {
+                query[0].remove("near");
+                ranking.coeff_worddistance = plasmaSearchRankingProfile.COEFF_MAX;
             }
-            plasmaSearchRankingProfile ranking = sb.getRanking();
-            if (near) {
-            	ranking.coeff_worddistance = plasmaSearchRankingProfile.COEFF_MAX;
+            if ((query[0].contains("recent")) && (querystring.indexOf("RECENT") >= 0)) {
+                query[0].remove("recent");
+                ranking.coeff_date = plasmaSearchRankingProfile.COEFF_MAX;
             }
-            	
+
             // filter out stopwords
             final TreeSet<String> filtered = kelondroMSetTools.joinConstructive(query[0], plasmaSwitchboard.stopwords);
             if (filtered.size() > 0) {

diff --git a/htroot/yacy/user/ysearch.java b/htroot/yacy/user/ysearch.java
@@ -163,16 +163,17 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
 
         if ((!block) && (post.get("cat", "href").equals("href"))) {
 
+            plasmaSearchRankingProfile ranking = sb.getRanking();
             final TreeSet<String>[] query = plasmaSearchQuery.cleanQuery(querystring); // converts also umlaute
-            boolean near = (query[0].contains("near")) && (querystring.indexOf("NEAR") >= 0);
-            if (near) {
-            	query[0].remove("near");
+            if ((query[0].contains("near")) && (querystring.indexOf("NEAR") >= 0)) {
+                query[0].remove("near");
+                ranking.coeff_worddistance = plasmaSearchRankingProfile.COEFF_MAX;
             }
-            plasmaSearchRankingProfile ranking = sb.getRanking();
-            if (near) {
-            	ranking.coeff_worddistance = plasmaSearchRankingProfile.COEFF_MAX;
+            if ((query[0].contains("recent")) && (querystring.indexOf("RECENT") >= 0)) {
+                query[0].remove("recent");
+                ranking.coeff_date = plasmaSearchRankingProfile.COEFF_MAX;
             }
-            	
+
             // filter out stopwords
             final TreeSet<String> filtered = kelondroMSetTools.joinConstructive(query[0], plasmaSwitchboard.stopwords);
             if (filtered.size() > 0) {

diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
@@ -192,16 +192,17 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
         } catch (InterruptedException e) { e.printStackTrace(); }
 
         if ((!block) && (post.get("cat", "href").equals("href"))) {
-
+
+            plasmaSearchRankingProfile ranking = sb.getRanking();
             final TreeSet<String>[] query = plasmaSearchQuery.cleanQuery(querystring); // converts also umlaute
-            boolean near = (query[0].contains("near")) && (querystring.indexOf("NEAR") >= 0);
-            if (near) {
+            if ((query[0].contains("near")) && (querystring.indexOf("NEAR") >= 0)) {
             	query[0].remove("near");
-            }
-            plasmaSearchRankingProfile ranking = sb.getRanking();
-            if (near) {
             	ranking.coeff_worddistance = plasmaSearchRankingProfile.COEFF_MAX;
             }
+            if ((query[0].contains("recent")) && (querystring.indexOf("RECENT") >= 0)) {
+                query[0].remove("recent");
+                ranking.coeff_date = plasmaSearchRankingProfile.COEFF_MAX;
+            }
 
             // filter out stopwords
             final TreeSet<String> filtered = kelondroMSetTools.joinConstructive(query[0], plasmaSwitchboard.stopwords);