[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/dtml - addZCatalog.dtml:1.3 catalogSchema.dtml:1.3 manageIndex.dtml:1.10

[Casey Duncan]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/dtml
In directory cvs.zope.org:/tmp/cvs-serv28876/lib/python/Products/ZCatalog/dtml

Modified Files:
	addZCatalog.dtml catalogSchema.dtml manageIndex.dtml 
Log Message:
Removed vocabulary management from catalog/ZCatalog. They now have no awareness of vocabularies.
The only API change was the removal of the getVocabulary method from ZCatalog.
Old-style TextIndexes can now acquire a Vocabulary from anywhere.
No Indexes, metadata or vocabulary objects are created automatically by ZCatalog.


=== Zope/lib/python/Products/ZCatalog/dtml/addZCatalog.dtml 1.2 => 1.3 ===
   <tr>
     <td align="left" valign="top">
-    <div class="form-optional">
-    Vocabulary
-    </div>
-    </td>
-    <td align="left" valign="top">
-    <div class="form-element">
-  <select name="vocab_id">
-      <option value="create_default_catalog_">Create one for me</option>
-    <dtml-in "superValues('Vocabulary')">
-      <option value="<dtml-var id html_quote>"><dtml-var id></option>
-    </dtml-in>
-  </select>
-    </div>
-    </td>
-  </tr>
-  <tr>
-    <td align="left" valign="top">
     </td>
     <td align="left" valign="top">
     <div class="form-element">


=== Zope/lib/python/Products/ZCatalog/dtml/catalogSchema.dtml 1.2 => 1.3 ===
     </td>
   </tr>
-</dtml-in>
+  <dtml-if sequence-end>
+    <tr>
+      <td align="left" valign="top">
+      </td>
+      <td align="left" valign="top">
+      <div class="form-element">
+      <input class="form-element" type="submit" name="manage_delColumn:method" 
+       value="Delete" /> 
+      </div>
+      </td>
+    </tr>
+  </dtml-if>
+<dtml-else>
   <tr>
-    <td align="left" valign="top">
-    </td>
-    <td align="left" valign="top">
-    <div class="form-element">
-    <input class="form-element" type="submit" name="manage_delColumns:method" 
-     value="Delete" /> 
-    </div>
-    </td>
+    <td></td>
+    <td><em class="std-text">There are currently no metadata elements.</em></td>
   </tr>
+</dtml-in>
 </table>
 
 <br />


=== Zope/lib/python/Products/ZCatalog/dtml/manageIndex.dtml 1.9 => 1.10 ===
 <p class="form-help"> 
 This list defines what indexes the Catalog will contain.  When objects 
-get cataloged, the values of any attributes they may have which match 
-an index in this list will get indexed.  Indexes come in four flavors, 
-Text Indexes, Field Indexes, Keyword Indexes and Path Indexes.
+get cataloged, the values of any attributes which match 
+an index in this list will get indexed.
 </p>
 
-<p class="form-help">
-<strong>Text Indexes</strong> break text up into individual words, and 
-are often referred to as full-text indexes. Text indexes 
-sort results by score meaning they return hits in order 
-from the most relevant to the lest relevant.
-</p>
-
-<p class="form-help">
-<strong>Field Indexes</strong> treat the value of an objects attributes 
-atomically, and can be used, for example, to track only a certain subset 
-of object values, such as 'meta_type'.
-</p>
-
-<p class="form-help">
-<strong>Keyword Indexes</strong> index a sequence of objects that act as 
-'keywords' for an object.  A Keyword Index will return any objects 
-that have one or more keywords specified in a search query.
-</p>
-
-<p class="form-help">
-<strong>Path Indexes</strong> index the physical path of a sequence
-of objects. A Path Index will return all objects that match 
-a partital path specified in a search query.
-</p>
-
-
 <script type="text/javascript">
 <!-- 
 
@@ -224,21 +197,9 @@
 <tr>
 <td>
 <div class="std-text">
-There are currently no items in <em>&dtml-title_or_id;</em>
+<em>There are currently no indexes</em>
 <br /><br />
 </div>
-<dtml-unless dontAllowCopyAndPaste>
-<dtml-if cb_dataValid>
-<div class="form-element">
-<input class="form-element" type="submit" name="manage_pasteObjects:method" 
- value="Paste" />
-</div>
-</dtml-if>
-</dtml-unless>
-<dtml-if "_.SecurityCheckPermission('Import/Export objects', this())">
-<input class="form-element" type="submit"
-  name="manage_importExportForm:method" value="Import/Export" />
-</dtml-if>
 </td>
 </tr>
 </table>