svn commit: samba-web r733 - in trunk/news/js: .

[deryck at samba.org]

Author: deryck
Date: 2005-07-02 04:50:04 +0000 (Sat, 02 Jul 2005)
New Revision: 733

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=733

Log:
Search result excerpts should be 20 words long.  If there
aren't 20 words, just use whatever is available.

deryck

Modified:
   trunk/news/js/searchEngine.js


Changeset:
Modified: trunk/news/js/searchEngine.js
===================================================================
--- trunk/news/js/searchEngine.js	2005-07-02 03:55:24 UTC (rev 732)
+++ trunk/news/js/searchEngine.js	2005-07-02 04:50:04 UTC (rev 733)
@@ -222,25 +222,17 @@
 	// Also handle text excerpt here
 	var excerpt = stripHTML(requests[n].responseText.split(firstP)[1]);
 	excerpt = excerpt.split(space)
-	briefExc = excerpt[0] + ' ' + 
-		excerpt[1] + ' ' +
-		excerpt[2] + ' ' +
-		excerpt[3] + ' ' +
-		excerpt[4] + ' ' +
-		excerpt[5] + ' ' +
-		excerpt[6] + ' ' +
-		excerpt[7] + ' ' +
-		excerpt[8] + ' ' +
-		excerpt[9] + ' ' +
-		excerpt[10] + ' ' +
-		excerpt[11] + ' ' +
-		excerpt[12] + ' ' +
-		excerpt[14] + ' ' +
-		excerpt[15] + ' ' +
-		excerpt[16] + ' ' +
-		excerpt[17] + ' ' +
-		excerpt[18] + ' ' +
-		excerpt[19] + ' ' + ' ... '
+	var briefExc = excerpt[0];
+	if (excerpt.length > 20) {
+		for (i=1; i<=19; i++) {
+			briefExc += ' ' + excerpt[i];
+		}
+	} else {
+		for (i=1; i<=excerpt.length - 1; i++) {
+			briefExc += ' ' + excerpt[i];
+		}
+	}
+	briefExc += ' ... ';
 
 	var resultElements = [relLink, storyTitle, briefExc]
 	return resultElements;