Changeset 22314

Show
Ignore:
Timestamp:
28.06.2010 14:13:17 (9 years ago)
Author:
kjdon
Message:

we are now extracted some metadata with ex. there, eg File.FileType? from EmbeddedMetadataPlugin?. Store this as ex.File.FileType? so that GLI can pick it up as extracted metadata. Modified routines so that we look for no namespace and ex. namespace when getting extracted metadata

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

    r17095 r22314  
    117117 
    118118        // If the metadata has a namespace it isn't extracted metadata, so we're not interested 
     119        // Actually, if it is ex. then we are interested  
    119120        String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full); 
    120         if (!metadata_set_namespace.equals("")) { 
     121         
     122        if (!metadata_set_namespace.equals("") && !metadata_set_namespace.equals("ex")) { 
    121123            continue; 
    122124        } 
    123125 
    124126        // Extracted metadata! 
    125         String metadata_element_name = metadata_element_name_full; 
     127        // do it like this just in case we have ex. 
     128        String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full); 
    126129 
    127130        // We completely ignore bibliographic data 
     
    218221        // If the metadata has a namespace it isn't extracted metadata, so we're not interested 
    219222        String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full); 
    220         if (!metadata_set_namespace.equals("")) { 
    221             continue; 
    222         } 
    223  
    224         // Extracted metadata! 
    225         String metadata_element_name = metadata_element_name_full; 
    226  
     223        if (!metadata_set_namespace.equals("") && !metadata_set_namespace.equals("ex")) { 
     224            continue; 
     225        } 
     226 
     227        // Extracted metadata! May have ex. so make sure we remove that 
     228        String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full); 
    227229        // Note which file this is for 
    228230        if (metadata_element_name.equals("gsdlsourcefilename")) {