Updated higlighting result/version number

Jim Leether · Jim Leether · commit b11b2be98bb7 · 2013-01-09T10:02:58.000-05:00
Updated version number in examples.  Updated highlighting result to
accept field name as an argument.
diff --git a/autoSuggestExample.cfm b/autoSuggestExample.cfm
@@ -1,12 +1,21 @@
-<script src="js/jquery-1.7.2.js"></script>
-<script src="js/jqueryui/jqueryui-1.8.22.js"></script>
-<link rel="stylesheet" href="css/jqueryui/jqueryui-1.8.22.css" type="text/css" />
-<script type="text/javascript">
-$(function() {
-    $("#keyword").autocomplete({
-        source: "components/cfsolrlib.cfc?method=getAutoSuggestResults&returnformat=json"
-    });
-});
-</script>
-    
-Keyword: <input id="keyword" />
+<script src="js/jquery-1.7.2.js"></script>
+<script src="js/jqueryui/jqueryui-1.8.22.js"></script>
+<link rel="stylesheet" href="css/jqueryui/jqueryui-1.8.22.css" type="text/css" />
+<script type="text/javascript">
+$(function() {
+    $("#keyword").autocomplete({
+        source: "components/cfsolrlib.cfc?method=getAutoSuggestResults&returnformat=json"
+    });
+});
+</script>
+
+<html>
+	<head>
+		<title>CFSolrLib 3.0 | Auto-Suggest example</title>
+	</head>
+	<body>
+    
+		Keyword: <input id="keyword" />
+        
+    </body>
+</html>
diff --git a/components/cfsolrlib.cfc b/components/cfsolrlib.cfc
@@ -53,6 +53,7 @@
 	<cfargument name="q" type="string" required="true" hint="Your query string" />
 	<cfargument name="start" type="numeric" required="false" default="0" hint="Offset for results, starting with 0" />
 	<cfargument name="rows" type="numeric" required="false" default="20" hint="Number of rows you want returned" />
+    <cfargument name="highlightingField" type="string" required="false" hint="Name of the field used for the highlighting result" />
 	<cfargument name="params" type="struct" required="false" default="#structNew()#" hint="A struct of data to add as params. The struct key will be used as the param name, and the value as the param's value. If you need to pass in multiple values, make the value an array of values." />
 	<cfset var thisQuery = THIS.javaLoaderInstance.create("org.apache.solr.client.solrj.SolrQuery").init(ARGUMENTS.q).setStart(ARGUMENTS.start).setRows(ARGUMENTS.rows) />
 	<cfset var thisParam = "" />
@@ -100,10 +101,9 @@
 	</cfif>
     
 	<!--- Highlighting Response --->
-	<cfif NOT isNull(response.getHighlighting())>
+	<cfif NOT isNull(response.getHighlighting()) AND structKeyExists(ARGUMENTS,"highlightingField")>
     	<cfloop array="#ret.results#" index="currentResult">
-        	<!--- ***"title" is used for the highlighting example.  Change "title" to the field your highlighting result will be in for your use.--->
-        	<cfset currentResult.highlightingResult = response.getHighlighting().get("#currentResult.get('id')#").get("title") />
+        	<cfset currentResult.highlightingResult = response.getHighlighting().get("#currentResult.get('id')#").get("#ARGUMENTS.highlightingField#") />
         </cfloop>
     </cfif>
     <cfreturn duplicate(ret) /> <!--- duplicate clears out the case-sensitive structure --->
diff --git a/index.cfm b/index.cfm
@@ -1,15 +1,15 @@
 <cfset sampleSolrInstance = createObject("component","components.cfsolrlib").init(APPLICATION.javaloader,"localhost","8983","/solr") />
 <html>
 	<head>
-		<title>CFSolrLib 2.0</title>
+		<title>CFSolrLib 3.0</title>
 	</head>
 	<body>
 		<h2>Welcome to CFSolrLib</h2>
 		<p>CFSolrLib is a library that lets you interact directly with a Solr server, using the native java client library.</p>
 		
 		<h2>Requirements</h2>
 		<p>
-			You need a few basic things to use CFSolrLib 2:<br/>
+			You need a few basic things to use CFSolrLib 3:<br/>
 			<ul>
 				<li>A Solr server, version 4.0 or greater. This was built &amp; tested with Solr 4.0. This library will not work with earlier versions of Solr.</li>
 				<li><a href="http://wiki.apache.org/solr/Solrj">SolrJ</a> - The Solr java client library and supporting java libraries.</li>
diff --git a/indexExample.cfm b/indexExample.cfm
@@ -44,7 +44,7 @@ FROM art
 
 <html>
 	<head>
-		<title>CFSolrLib 2.0 | Indexing example</title>
+		<title>CFSolrLib 3.0 | Indexing example</title>
 	</head>
 	<body>
 		<h2>Indexing</h2>
diff --git a/searchExample.cfm b/searchExample.cfm
@@ -11,15 +11,15 @@
 	<cfset local.params["hl.fragmentsBuilder"] = "colored">
 	<cfset local.params["hl.boundaryScanner"] = "default">
 	<cfset local.params["hl.usePhraseHighlighter"] = true>
-    <cfset searchResponse = sampleSolrInstance.search(URL.q,0,100,local.params) />
+    <cfset searchResponse = sampleSolrInstance.search(URL.q,0,100,local.params,,"title") />
 <cfelse>
     <cfset searchResponse = sampleSolrInstance.search(URL.q,0,100) />
 </cfif>
 
 <cfoutput>
 <html>
 	<head>
-		<title>CFSolrLib 2.0 | Search Example</title>
+		<title>CFSolrLib 3.0 | Search Example</title>
 	</head>
 	<body>
 		<h2>Search Example</h2>
