Changeset 26016
- Timestamp:
- 2012-07-24T14:39:35+12:00 (12 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer/cdm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java
r25779 r26016 349 349 350 350 } 351 351 static private void doGlobalFormat(Document to, Element from) 352 { 353 // look for a top level format element 354 Element fe = (Element) XMLTools.getChildByTagName(from, StaticStrings.FORMAT_STR); 355 to.getDocumentElement().appendChild(doFormat(to, fe, StaticStrings.GLOBAL_STR)); 356 } 352 357 static private void doDisplayFormat(Document to, Element from) 353 358 { … … 1387 1392 } 1388 1393 1394 // convert global format statement 1395 static private void convertGlobalFormat(Document from, Document to) 1396 { 1397 Element e = XMLTools.getNamedElement(from.getDocumentElement(), StaticStrings.FORMAT_STR, StaticStrings.NAME_ATTRIBUTE, StaticStrings.GLOBAL_STR); 1398 1399 to.getDocumentElement().appendChild(convertFormat(to, e)); 1400 1401 } 1402 1389 1403 // Convert plugins in the internal(i.e. Document from) to collectionconfig.xml (i.e. Document to) 1390 1404 static private void convertPlugin(Document from, Document to) … … 2361 2375 doSearchType(dOc, searchNode); 2362 2376 doSearchFormat(dOc, searchNode); 2377 doGlobalFormat(dOc, fromElement); 2363 2378 doDisplayFormat(dOc, fromElement); 2364 2379 doReplaceListRef(dOc, fromElement); … … 2433 2448 convertMetadataList(dOc, skeleton); 2434 2449 convertDisplayItemList(dOc, skeleton); 2450 convertGlobalFormat(dOc, skeleton); 2435 2451 convertBuildType(dOc, skeleton); 2436 2452 convertDatabaseType(dOc, skeleton); -
main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java
r25709 r26016 63 63 public class Format4gs3Manager implements SharedByTwoFormatManager 64 64 { 65 66 // The default global format 67 static final private String GLOBAL_FORMAT = ""; 68 static final private String GLOBAL = "global"; 65 69 //The default search format 66 70 static final private String SEARCH_FORMAT; … … 169 173 static final private String SEARCHTYPE_FORMAT = "plain,simpleform,advancedform"; 170 174 static final private String SEARCHTYPE = "searchType"; 171 static final private String[] FEATURE_NAME = {SEARCH, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE };172 static final private String[] FEATURE_FORMAT = {SEARCH_FORMAT, DISPLAY_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT };175 static final private String[] FEATURE_NAME = { GLOBAL, SEARCH, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE }; 176 static final private String[] FEATURE_FORMAT = { GLOBAL_FORMAT, SEARCH_FORMAT, DISPLAY_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT }; 173 177 174 178 static private HashMap default_format_map = null; … … 346 350 private String removeSurrondingTags(String xml) 347 351 { 348 return xml.replace("<ROOTELEMENT>\n", "").replace("<ROOTELEMENT>", "").replace("</ROOTELEMENT>","");352 return xml.replace("<ROOTELEMENT>\n", "").replace("<ROOTELEMENT>", "").replace("</ROOTELEMENT>", "").replace("<ROOTELEMENT/>",""); 349 353 } 350 354
Note:
See TracChangeset
for help on using the changeset viewer.