Changeset 29047

Show
Ignore:
Timestamp:
01/15/08 12:10:32 (11 months ago)
Author:
ddupraz
Message:

code improvement for NXP-1722 forwarded to the trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/trunk/nuxeo-core/src/main/java/org/nuxeo/ecm/core/api/DocumentModelFactory.java

    r28462 r29047  
    9696    } 
    9797 
    98     public static Map<String, Serializable> updatePrefetch( 
    99             DocumentModel docModel, DocumentType type) { 
     98    public static Map<String, Serializable> updatePrefetch(DocumentModel docModel) { 
    10099        Map<String, Serializable> prefetchMap = new HashMap<String, Serializable>(); 
    101100 
    102         Schema[] prefetchSchemas = null; 
    103         PrefetchInfo prefetchInfo = type.getPrefetchInfo(); 
     101        PrefetchInfo prefetchInfo = docModel.getDocumentType() 
     102                .getPrefetchInfo(); 
    104103        if (prefetchInfo != null) { 
    105             prefetchSchemas = prefetchInfo.getSchemas(); 
     104 
    106105            Field[] prefetchFields = prefetchInfo.getFields(); 
    107106            for (Field field : prefetchFields) { 
    108107 
    109                 String fieldName = field.getDeclaringType().getName() + "." 
    110                         + field.getName().getLocalName(); 
    111                 Object value = docModel.getProperty(field.getDeclaringType() 
    112                         .getName(), field.getName().getLocalName()); 
     108                String typeName = field.getDeclaringType().getName(); 
     109                String typeLocalName = field.getName().getLocalName(); 
     110                String fieldName = typeName + "." + typeLocalName; 
     111                Object value = docModel.getProperty(typeName, typeLocalName); 
    113112                prefetchMap.put(fieldName, (Serializable) value); 
    114113            } 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-search-core-listener/src/main/java/org/nuxeo/ecm/platform/search/core/listener/IndexingDocumentModelPrefetchedListener.java

    r28479 r29047  
    151151                || IndexingEventConf.RE_INDEX.equals(action)) { 
    152152 
    153             Map<String, Serializable> prefetch = DocumentModelFactory.updatePrefetch(dm, dm.getDocumentType()); 
     153            Map<String, Serializable> prefetch = DocumentModelFactory.updatePrefetch(dm); 
    154154 
    155155            // Check if the dm is indexable.