checked in results of packaged plugin and fix for ignored annotations

mbrevoort · Mar 26, 2010 · efd96b6 · efd96b6
1 parent b15fd89
commit efd96b6
Show file tree

Hide file tree

Showing 109 changed files with 8,098 additions and 203 deletions.
diff --git a/SolrGrailsPlugin.groovy b/SolrGrailsPlugin.groovy
@@ -252,34 +252,39 @@ open source search server through the SolrJ library.
           overrideMethod.invoke(delegateDomainOjbect, doc)
         } 
         else if(delegateDomainOjbect."${prop.name}" != null) {
-          def docKey = prefix + delegateDomainOjbect.solrFieldName(prop.name)                 
+          def fieldName = delegateDomainOjbect.solrFieldName(prop.name);
-          def docValue = delegateDomainOjbect.getProperty(prop.name) 
 
-          // Removed because of issues with stale indexing when composed index changes
+          // fieldName may be null if the ignore annotion is used, not the best way to handle but ok for now
-          // Recursive indexing of composition fields
+          if(fieldName) {
-          //if(GrailsClassUtils.getStaticPropertyValue(docValue.class, "enableSolrSearch") && depth < 3) {
+            def docKey = prefix + fieldName                
-          //  def innerDomainDesc = application.getArtefact(DomainClassArtefactHandler.TYPE, docValue.class.name)
+            def docValue = delegateDomainOjbect.getProperty(prop.name) 
-          //  indexDomain(application, docValue, doc, ++depth, "${docKey}.")
-          //} else {
-          //  doc.addField(docKey, docValue)                  
-          //}
 
-          // instead of the composition logic above, if the class is a domain class
+            // Removed because of issues with stale indexing when composed index changes
-          // then set the value to the Solr Id
+            // Recursive indexing of composition fields
-          // TODO - reconsider this indexing logic as a whole
+            //if(GrailsClassUtils.getStaticPropertyValue(docValue.class, "enableSolrSearch") && depth < 3) {
-          if(DomainClassArtefactHandler.isDomainClass(docValue.class))
+            //  def innerDomainDesc = application.getArtefact(DomainClassArtefactHandler.TYPE, docValue.class.name)
-            doc.addField(docKey, SolrUtil.getSolrId(docValue))
+            //  indexDomain(application, docValue, doc, ++depth, "${docKey}.")
-          else
+            //} else {
-            doc.addField(docKey, docValue)
+            //  doc.addField(docKey, docValue)                  
+            //}
+
+            // instead of the composition logic above, if the class is a domain class
+            // then set the value to the Solr Id
+            // TODO - reconsider this indexing logic as a whole
+            if(DomainClassArtefactHandler.isDomainClass(docValue.class))
+              doc.addField(docKey, SolrUtil.getSolrId(docValue))
+            else
+              doc.addField(docKey, docValue)
 
-          // if the annotation asTextAlso is true, then also index this field as a text type independant of how else it's
+            // if the annotation asTextAlso is true, then also index this field as a text type independant of how else it's
-          // indexed. The best way to handle the need to do this would be the properly configure the schema.xml file but
+            // indexed. The best way to handle the need to do this would be the properly configure the schema.xml file but
-          // for those not familiar with Solr this is an easy way to make sure the field is processed as text which should 
+            // for those not familiar with Solr this is an easy way to make sure the field is processed as text which should 
-          // be the default search and processed with a WordDelimiterFilter   
+            // be the default search and processed with a WordDelimiterFilter   
 
-          def clazzProp = clazz.declaredFields.find{ field -> field.name == prop.name}
+            def clazzProp = clazz.declaredFields.find{ field -> field.name == prop.name}
-          if(clazzProp.isAnnotationPresent(Solr) && clazzProp.getAnnotation(Solr).asTextAlso()) {
+            if(clazzProp.isAnnotationPresent(Solr) && clazzProp.getAnnotation(Solr).asTextAlso()) {
-            doc.addField("${prefix}${prop.name}_t", docValue)     
+              doc.addField("${prefix}${prop.name}_t", docValue)     
+            }
           }
 
           //println "Indexing: ${docKey} = ${docValue}"

diff --git a/docs/api/allclasses-frame.html b/docs/api/allclasses-frame.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 All Classes (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/allclasses-noframe.html b/docs/api/allclasses-noframe.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 All Classes (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/constant-values.html b/docs/api/constant-values.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Constant Field Values (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/deprecated-list.html b/docs/api/deprecated-list.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Deprecated List (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/help-doc.html b/docs/api/help-doc.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 API Help (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/index-all.html b/docs/api/index-all.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Index (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/index.html b/docs/api/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Mon Jan 04 22:28:51 MST 2010-->
+<!-- Generated by javadoc on Tue Mar 16 09:12:28 MDT 2010-->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 solr

diff --git a/docs/api/org/grails/solr/Solr.html b/docs/api/org/grails/solr/Solr.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Solr (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -119,6 +119,14 @@ <H2>
 <CODE>&nbsp;boolean</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../org/grails/solr/Solr.html#asText()">asText</A></B></CODE>
 
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/grails/solr/Solr.html#asTextAlso()">asTextAlso</A></B></CODE>
+
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
@@ -127,6 +135,14 @@ <H2>
 <CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../org/grails/solr/Solr.html#field()">field</A></B></CODE>
 
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/grails/solr/Solr.html#ignore()">ignore</A></B></CODE>
+
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
@@ -163,6 +179,38 @@ <H2>
 <DT><B>Default:</B><DD>false</DD>
 </DL>
 </DL>
+<HR>
+
+<A NAME="asTextAlso()"><!-- --></A><H3>
+asTextAlso</H3>
+<PRE>
+public abstract boolean <A HREF="../../../src-html/org/grails/solr/Solr.html#line.35"><B>asTextAlso</B></A></PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+<DL>
+<DT><B>Default:</B><DD>false</DD>
+</DL>
+</DL>
+<HR>
+
+<A NAME="ignore()"><!-- --></A><H3>
+ignore</H3>
+<PRE>
+public abstract boolean <A HREF="../../../src-html/org/grails/solr/Solr.html#line.36"><B>ignore</B></A></PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+<DL>
+<DT><B>Default:</B><DD>false</DD>
+</DL>
+</DL>
 <!-- ========= END OF CLASS DATA ========= -->
 <HR>
 

diff --git a/docs/api/org/grails/solr/class-use/Solr.html b/docs/api/org/grails/solr/class-use/Solr.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Uses of Class org.grails.solr.Solr (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/org/grails/solr/package-frame.html b/docs/api/org/grails/solr/package-frame.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 org.grails.solr (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/org/grails/solr/package-summary.html b/docs/api/org/grails/solr/package-summary.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 org.grails.solr (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/org/grails/solr/package-tree.html b/docs/api/org/grails/solr/package-tree.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 org.grails.solr Class Hierarchy (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/org/grails/solr/package-use.html b/docs/api/org/grails/solr/package-use.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Uses of Package org.grails.solr (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/overview-tree.html b/docs/api/overview-tree.html
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_15) on Mon Jan 04 22:28:51 MST 2010 -->
+<!-- Generated by javadoc (build 1.6.0_15) on Tue Mar 16 09:12:28 MDT 2010 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 Class Hierarchy (solr)
 </TITLE>
 
-<META NAME="date" CONTENT="2010-01-04">
+<META NAME="date" CONTENT="2010-03-16">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/docs/api/src-html/org/grails/solr/Solr.html b/docs/api/src-html/org/grails/solr/Solr.html
@@ -34,8 +34,10 @@
 <FONT color="green">031</FONT>    @Target(ElementType.FIELD)<a name="line.31"></a>
 <FONT color="green">032</FONT>    public @interface Solr {<a name="line.32"></a>
 <FONT color="green">033</FONT>        String field() default "";<a name="line.33"></a>
-<FONT color="green">034</FONT>                    boolean asText() default false;;<a name="line.34"></a>
+<FONT color="green">034</FONT>        boolean asText() default false;<a name="line.34"></a>
-<FONT color="green">035</FONT>    }<a name="line.35"></a>
+<FONT color="green">035</FONT>        boolean asTextAlso() default false; <a name="line.35"></a>
+<FONT color="green">036</FONT>        boolean ignore() default false;<a name="line.36"></a>
+<FONT color="green">037</FONT>    }<a name="line.37"></a>
 
 
 

diff --git a/docs/gapi/DefaultPackage/SolrGrailsPlugin.html b/docs/gapi/DefaultPackage/SolrGrailsPlugin.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Mon Jan 04 22:28:57 MST 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Mar 16 09:12:35 MDT 2010 -->
 <title>SolrGrailsPlugin (Groovy Documentation)</title>
-<meta name="date" content="2010-01-04">
+<meta name="date" content="2010-03-16">
 <link href="../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">