[Zope-CVS] CVS: Products/ZCTextIndex/dtml - manageLexicon.dtml:1.1 addLexicon.dtml:1.6 addZCTextIndex.dtml:1.4

[Casey Duncan]

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

Modified Files:
	addLexicon.dtml addZCTextIndex.dtml 
Added Files:
	manageLexicon.dtml 
Log Message:
Improved Zope integration

  * A pipeline factory registry now allows registration of possible
    pipeline elements for use by Zope lexicons.

  * ZMI constructor form for lexicon uses pipeline registry to generate form
    fields

  * ZMI constructor form for ZCTextindex allows you to choose between
    Okapi and Cosine relevance algorithms


=== Added File Products/ZCTextIndex/dtml/manageLexicon.dtml ===
<dtml-var manage_page_header>
<dtml-var manage_tabs>

<p class="form-help">
  The lexicon processes and stores the words found in objects indexed by one 
  or more ZCTextIndexes.
</p>

<p class="section-bar">
  <span class="form-label">Input Pipeline Stages</span>
</p>

<p>
  Text indexed through this lexicon is processed by the following pipeline 
  stages
</p>

<ol>
  <dtml-in name="getPipelineNames">
    <li>&dtml-sequence-item;</li>
  </dtml-in>
</ol>

<dtml-var manage_page_footer>


=== Products/ZCTextIndex/dtml/addLexicon.dtml 1.5 => 1.6 ===
 
 <dtml-var "manage_form_title(this(), _,
-           form_title='Add Lexicon',
+           form_title='Add ZCTextIndex Lexicon',
 	   )">
+     
+<p class="form-help">
+  A ZCTextIndex Lexicon processes and stores the words of documents indexed
+  with a ZCTextIndex. Multiple ZCTextIndexes can share the same lexicon.
+</p>
 
-<FORM ACTION="manage_addLexicon" METHOD="POST">
+<form action="manage_addLexicon" method="POST">
 <table cellspacing="0" cellpadding="2" border="0">
   <tr>
     <td align="left" valign="top">
@@ -16,6 +21,7 @@
     <input type="text" name="id" size="40" />
     </td>
   </tr>
+  
   <tr>
     <td align="left" valign="top">
     <div class="form-optional">
@@ -29,33 +35,28 @@
 
   <tr>
     <td align="left" valign="top">
-    <div class="form-label">
-    splitter?
-    </td>
-    <td align="left" valign="top">
-    <input type="checkbox" name="splitter" checked />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
-    case normalizer?
+      <div class="form-label">Word Splitter</div>
     </td>
     <td align="left" valign="top">
-    <input type="checkbox" name="normalizer" checked />
+      <select name="splitter_name">
+        <dtml-in name="getSplitterNames">
+          <option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
+        </dtml-in>
+      </select>
     </td>
   </tr>
 
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
-    remove stop words?
-    </td>
-    <td align="left" valign="top">
-    <input type="checkbox" name="stopwords" checked />
-    </td>
-  </tr>
+  <dtml-in name="getElementNames">
+    <tr>
+      <td align="left" valign="top">
+        <div class="form-label">&dtml-sequence-item;</div>
+      </td>
+      <td align="left" valign="top">
+      <input type="checkbox" name="element_names:list" 
+             value="&dtml-sequence-item;" checked />
+      </td>
+    </tr>
+  </dtml-in>
 
   <tr>
     <td align="left" valign="top">


=== Products/ZCTextIndex/dtml/addZCTextIndex.dtml 1.3 => 1.4 ===
 
   <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Ranking Strategy
+    </div>
+    </td>
+    <td align="left" valign="top">
+      <select name="extra.index_type:record">
+        <dtml-in name="getIndexTypes">
+          <option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
+        </dtml-in>
+      </select>        
+    </td>
+  </tr>
+
+  <tr>
     <td align="left" valign"top">
     <div class="form-label">
     Lexicon
@@ -48,7 +63,7 @@
         <select name="extra.lexicon_id:record">
       </dtml-if>
       <option value="&dtml-id;">
-        &dtml-id; <dtml-var title fmt="(%s)" missing>
+        &dtml-id; <dtml-var name="title" fmt="(%s)" null>
       </option>
       <dtml-if sequence-end>
         </select>
@@ -58,18 +73,6 @@
     </dtml-in>
     </td> 
   </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-optional">
-    Type
-    </div>
-    </td>
-    <td align="left" valign="top">
-    ZCTextIndex
-    </td>
-  </tr>
-
 
   <tr>
     <td align="left" valign="top">