Changeset 7624


Ignore:
Timestamp:
2004-06-21T09:56:20+12:00 (20 years ago)
Author:
mdewsnip
Message:

Fixed quite a few places where the GLI was looking for "ex" instead of "ex." to determine if a piece of metadata was extracted.

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

    r7604 r7624  
    306306    static private CollectionConfiguration self;
    307307
    308     static final private String EXTRACTED_PREFIX = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP;
    309308    /** Gives the preferred ordering of commands */
    310309    static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT, /* StaticStrings.COLLECTIONMETADATA_BETA_ELEMENT, */ StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT};
    … …  
    543542            while (string_tokenizer.hasMoreElements()) {
    544543            String token = (String) string_tokenizer.nextElement();
    545             if (token.startsWith(EXTRACTED_PREFIX)) {
    546                 token = token.substring(EXTRACTED_PREFIX.length());
     544            if (token.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     545                token = token.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    547546            }
    548547
    … …  
    672671        Element content_element = (Element) content_elements.item(k);
    673672        String name_str = content_element.getAttribute(NAME_ATTRIBUTE);
    674         if(!show_extracted_namespace && name_str.startsWith(EXTRACTED_PREFIX)) {
    675             name_str = name_str.substring(EXTRACTED_PREFIX.length());
     673        if(!show_extracted_namespace && name_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     674            name_str = name_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    676675        }
    677676        text.append(name_str);
    … …  
    706705        Element content_element = (Element) content_elements.item(j);
    707706        String name_str = content_element.getAttribute(NAME_ATTRIBUTE);
    708         if(!show_extracted_namespace && name_str.startsWith(EXTRACTED_PREFIX)) {
    709         name_str = name_str.substring(EXTRACTED_PREFIX.length());
     707        if(!show_extracted_namespace && name_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     708        name_str = name_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    710709        }
    711710        text.append(name_str);
    … …  
    11391138                String token = (String) string_tokenizer.nextElement();
    11401139                if (token.indexOf(MSMUtils.NS_SEP) == -1) {
    1141                 token = EXTRACTED_PREFIX + token;
     1140                token = StaticStrings.EXTRACTED_NAMESPACE + token;
    11421141                }
    11431142
    … …  
    12491248            }
    12501249            else {
    1251                 content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + content_str;
     1250                content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str;
    12521251            }
    12531252            }
    … …  
    14741473                // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.
    14751474                if(value.indexOf(MSMUtils.NS_SEP) == -1) {
    1476                 value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
     1475                value = StaticStrings.EXTRACTED_NAMESPACE + value;
    14771476                }
    14781477            }
    … …  
    15571556            // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
    15581557            if(!content_str.equals(StaticStrings.FILENAME_STR) && content_str.indexOf(MSMUtils.NS_SEP) == -1) {
    1559             content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + content_str;
     1558            content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str;
    15601559            }
    15611560            command_element.setAttribute(CONTENT_ATTRIBUTE, content_str);
    … …  
    16701669            text.append(option_element.getAttribute(NAME_ATTRIBUTE));
    16711670            String value_str = MSMUtils.getValue(option_element);
    1672             if(!show_extracted_namespace && value_str.startsWith(EXTRACTED_PREFIX)) {
    1673                 value_str = value_str.substring(EXTRACTED_PREFIX.length());
     1671            if(!show_extracted_namespace && value_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     1672                value_str = value_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    16741673            }
    16751674            if(value_str.length() > 0) {
    … …  
    17261725    }
    17271726    String content_str = command_element.getAttribute(CONTENT_ATTRIBUTE);
    1728     if(!show_extracted_namespace && content_str.startsWith(EXTRACTED_PREFIX)) {
    1729         content_str = content_str.substring(EXTRACTED_PREFIX.length());
     1727    if(!show_extracted_namespace && content_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     1728        content_str = content_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    17301729    }
    17311730    text.append(content_str);

  • trunk/gli/src/org/greenstone/gatherer/cdm/Index.java

    r6770 r7624  
    172172        if(source_object instanceof ElementWrapper) {
    173173            String full_element_name = ((ElementWrapper)source_object).getName();
    174             if(full_element_name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
    175                id_buffer.append(full_element_name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1));
     174            if(full_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     175               id_buffer.append(full_element_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()));
    176176            }
    177177            else {

  • trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

    r7151 r7624  
    4545import org.greenstone.gatherer.msm.MSMUtils;
    4646import org.greenstone.gatherer.util.ExclusiveListSelectionListener;
     47import org.greenstone.gatherer.util.StaticStrings;
    4748import org.greenstone.gatherer.util.Utility;
    4849import org.w3c.dom.*;
    … …  
    12631264            // Determine the metadatum value
    12641265            String name = source.toString();
    1265             if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
    1266                 name = name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
     1266            if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     1267                name = name.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    12671268            }
    12681269            // Create new metadatum
    … …  
    13931394            id = selected_object.toString();
    13941395            }
    1395             if(id.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
    1396             id = id.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
     1396            if(id.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
     1397            id = id.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    13971398            }
    13981399            Index index = getIndex(id);

  • trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.java

    r6389 r7624  
    411411            source = element_wrapper.getName();
    412412            if(source.indexOf(MSMUtils.NS_SEP) == -1) {
    413             source = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + source;
     413            source = StaticStrings.EXTRACTED_NAMESPACE + source;
    414414            }
    415415        }
    … …  
    497497            source = element_wrapper.getName();
    498498            if(source.indexOf(MSMUtils.NS_SEP) == -1) {
    499                 source = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + source;
     499                source = StaticStrings.EXTRACTED_NAMESPACE + source;
    500500            }
    501501            }
    … …  
    538538                String e_name = e.getName();
    539539                if(e_name.indexOf(MSMUtils.NS_SEP) == -1) {
    540                 e_name = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + e_name;
     540                e_name = StaticStrings.EXTRACTED_NAMESPACE + e_name;
    541541                }
    542542                //ystem.err.print("Compare to: " + e_name);

  • trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFile.java

    r7313 r7624  
    128128        // If this is extracted metadata, we use a special element name that won't be recognized by greenstone
    129129        String current_metadata_type = StaticStrings.METADATA_ELEMENT;
    130         if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
     130        if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
    131131        current_metadata_type = StaticStrings.EXTRACTED_METADATA_ELEMENT;
    132         name = name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
     132        name = name.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    133133        }
    134134       
    … …  
    540540        // If this is extracted metadata, we use a special element name that won't be recognized by greenstone
    541541        String current_metadata_type = StaticStrings.METADATA_ELEMENT;
    542         if(removing_metadata_name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
     542        if(removing_metadata_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
    543543        current_metadata_type = StaticStrings.EXTRACTED_METADATA_ELEMENT;
    544         removing_metadata_name = removing_metadata_name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
     544        removing_metadata_name = removing_metadata_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
    545545        }
    546546
Note: See TracChangeset for help on using the changeset viewer.