[Zope-CVS] CVS: Products/ZCTextIndex/dtml - addLexicon.dtml:1.3 addZCTextIndex.dtml:1.3

[Casey Duncan]

Update of /cvs-repository/Products/ZCTextIndex/dtml
In directory cvs.zope.org:/tmp/cvs-serv5974/dtml

Modified Files:
	addLexicon.dtml addZCTextIndex.dtml 
Log Message:
Integration with Zope complete. ZCTextIndex is now a bonafide Plug-in index.

Some additional plug-in index APIs were added to ZCTextIndex and support APIs added to Index and Lexicon.

_apply_index does not use NBest since ZCatalog has an incompatible strategy for finding the top results. NBest might be abstracted from this product for general consumption in application code.


=== Products/ZCTextIndex/dtml/addLexicon.dtml 1.2 => 1.3 ===
     </td>
     <td align="left" valign="top">
-    <input type="checkbox" name="splitter" />
+    <input type="checkbox" name="splitter" checked />
     </td>
   </tr>
 
@@ -43,7 +43,7 @@
     case normalizer?
     </td>
     <td align="left" valign="top">
-    <input type="checkbox" name="normalizer" />
+    <input type="checkbox" name="normalizer" checked />
     </td>
   </tr>
 
@@ -53,7 +53,7 @@
     remove stop words?
     </td>
     <td align="left" valign="top">
-    <input type="checkbox" name="stopword" />
+    <input type="checkbox" name="stopwords" checked />
     </td>
   </tr>
 


=== Products/ZCTextIndex/dtml/addZCTextIndex.dtml 1.2 => 1.3 ===
     <td align="left" valign="top">
     <div class="form-label">
-    Vocabulary
-    </div>
-    </td>
-    <td>
-
-    <select name="extra.vocabulary:record">  
-      <dtml-in "this().aq_parent.objectItems('Vocabulary')">
-        <option value="&dtml-sequence-key;">&dtml-sequence-key; (<dtml-var "_['sequence-item'].title">)
-      </dtml-in>
-    </select>
-    
-    </td> 
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
     Field name
     </div></td>
     <td align="left" valign="top">
@@ -60,12 +43,19 @@
     Lexicon
     </div></td>
     <td>
-    <select name="extra.lexicon_id:record">  
-      <dtml-in "this().aq_parent.objectItems('Lexicon')">
-        <option value="&dtml-sequence-key;">&dtml-sequence-key; (<dtml-var "_['sequence-item'].title">)
-      </dtml-in>
-    </select>
-    
+    <dtml-in expr="superValues('ZCTextIndex Lexicon')">
+      <dtml-if sequence-start>
+        <select name="extra.lexicon_id:record">
+      </dtml-if>
+      <option value="&dtml-id;">
+        &dtml-id; <dtml-var title fmt="(%s)" missing>
+      </option>
+      <dtml-if sequence-end>
+        </select>
+      </dtml-if>
+    <dtml-else>
+      <em>You must create a ZCTextIndex Lexicon first.</em>
+    </dtml-in>
     </td> 
   </tr>