Changeset 676

Show
Ignore:
Timestamp:
03/08/07 01:50:58 (2 years ago)
Author:
thomase
Message:

Integration of ATVM-managed VDEX vocabularies for Name.nameLanguage and PlacefulAssociation?.placeType. Vocabs are loaded from PleiadesEntity/data. Tests. Closes the following tickets: #223, #271 and #272.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • PleiadesEntity/trunk/Extensions/Install.py

    r665 r676  
    7676    from Products.ATVocabularyManager.config import TOOL_NAME as ATVOCABULARYTOOL 
    7777    atvm = getToolByName(self, ATVOCABULARYTOOL) 
    78     vocabmap = {'AWMCPlaceTypes.xml': ('SimpleVocabulary', 'SimpleVocabularyTerm'), 
     78    vocabmap = {'AWMCAncientNameLanguages': ('VdexVocabulary', 'VdexTerm'), 
     79         'AWMCPlaceTypes': ('VdexVocabulary', 'VdexTerm'), 
    7980        } 
    8081    for vocabname in vocabmap.keys(): 
  • PleiadesEntity/trunk/content/Name.py

    r647 r676  
    3131from AccessControl import ClassSecurityInfo 
    3232from Products.Archetypes.atapi import * 
     33from Products.ATVocabularyManager.namedvocabulary import NamedVocabulary 
    3334from Products.PleiadesEntity.config import * 
    3435 
     
    6970            i18n_domain='PleiadesEntity', 
    7071        ), 
    71         enforceVocabulary=1
    72         vocabulary=['grc', 'grc-Latn', 'la', 'la-Grek'] 
     72        vocabulary=NamedVocabulary("""AWMCAncientNameLanguages""")
     73        enforceVocabulary=1 
    7374    ), 
    7475 
  • PleiadesEntity/trunk/content/PlacefulAssociation.py

    r665 r676  
    4242        name='placeType', 
    4343        index="KeywordIndex", 
     44        vocabulary=NamedVocabulary("""AWMCPlaceTypes"""), 
     45        default="unknown", 
     46        enforceVocabulary=1, 
    4447        widget=SelectionWidget( 
    4548            label="Place Type", 
    4649            label_msgid='PleiadesEntity_label_placeType', 
    4750            i18n_domain='PleiadesEntity', 
    48         ), 
    49         vocabulary=NamedVocabulary("""AWMCPlaceTypes.xml"""), 
    50         default="unknown", 
    51         enforceVocabulary=1 
     51        ) 
    5252    ), 
    5353 
  • PleiadesEntity/trunk/version.txt

    r665 r676  
    1 0.1 build 240 
     10.1 build 244