Changeset 13994
- Timestamp:
- 2007-03-28T16:16:49+12:00 (17 years ago)
- Location:
- trunk/gsdl3/src/java/org/greenstone/gsdl3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/Collection.java
r13860 r13994 48 48 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.collection.Collection.class.getName()); 49 49 50 /** is this collection being tidied */ 51 protected boolean useBook = false; 50 52 /** is this collection public or private */ 51 53 protected boolean is_public = true; … … 96 98 } 97 99 100 public boolean useBook() { 101 return useBook; 102 } 103 98 104 public boolean isPublic() { 99 105 return is_public; … … 161 167 } 162 168 169 //check whether the html are tidy or not 170 Element import_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.IMPORT_ELEM); 171 if (import_list != null) { 172 Element plugin_list = (Element)GSXML.getChildByTagName(import_list, GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER); 173 addPlugins(plugin_list); 174 if (plugin_list != null){ 175 Element plugin_elem = (Element)GSXML.getNamedElement(plugin_list, GSXML.PLUGIN_ELEM, GSXML.NAME_ATT, "HTMLPlug"); 176 if (plugin_elem != null) { 177 //get the option 178 Element option_elem = (Element)GSXML.getNamedElement(plugin_elem, GSXML.PARAM_OPTION_ELEM, GSXML.NAME_ATT, "-tidy_html"); 179 if (option_elem != null) { 180 useBook = true; 181 } 182 } 183 } 184 } 185 meta_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER); 186 if (useBook == true) 187 GSXML.addMetadata(this.doc, meta_list, "tidyoption", "tidy"); 188 else 189 GSXML.addMetadata(this.doc, meta_list, "tidyoption", "untidy"); 190 addMetadata(meta_list); 191 163 192 // check whether we are public or not 164 193 if (meta_list != null) { … … 210 239 } 211 240 212 if (subset.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER) || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER) ) {241 if (subset.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER) || subset.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER) || subset.equals(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER)) { 213 242 return findAndLoadInfo(coll_config_elem, build_config_elem); 214 243 -
trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java
r13947 r13994 88 88 protected Element description = null; 89 89 90 /** list of plugin */ 91 protected Element plugin_item_list = null; 92 90 93 public void setSiteHome(String home) { 91 94 this.site_home = home; … … 120 123 this.display_item_list = this.doc.createElement(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER); 121 124 this.metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 125 this.plugin_item_list = this.doc.createElement(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER); 122 126 } 123 127 … … 185 189 } 186 190 187 191 //get the plugin info 192 Element import_list = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.IMPORT_ELEM); 193 if (import_list != null) 194 { 195 Element plugin_list = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER); 196 if (plugin_list !=null) { 197 if (!addPlugins(plugin_list)) { 198 199 logger.error("couldn't configure the plugins"); 200 } 201 } 202 } 203 188 204 // do the service racks 189 205 Element service_rack_list = (Element)GSXML.getChildByTagName(service_cluster_info, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER); … … 238 254 239 255 this_item.appendChild(this.doc.importNode(d, true)); 240 241 242 } 256 } 257 } 258 259 return true; 260 } 261 262 protected boolean addPlugins(Element plugin_list) { 263 if (plugin_list == null) return false; 264 NodeList pluginNodes = plugin_list.getElementsByTagName(GSXML.PLUGIN_ELEM); 265 if (pluginNodes.getLength() > 0) { 266 for (int k = 0; k < pluginNodes.getLength(); k++) 267 { 268 this.plugin_item_list.appendChild(this.doc.importNode(pluginNodes.item(k), true)); 269 } 243 270 } 244 271 … … 448 475 description.appendChild(this.service_list); 449 476 description.appendChild(this.metadata_list); 477 description.appendChild(this.plugin_item_list); 450 478 return response; 451 479 } … … 465 493 } else if (info.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) { 466 494 addAllDisplayInfo(description, lang); 467 495 } else if (info.equals(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER)) { 496 description.appendChild(plugin_item_list); 468 497 } 469 498 } … … 578 607 Element metadata_list = (Element)GSXML.getChildByTagName(cluster_config_elem, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 579 608 return addMetadata(metadata_list); 609 } else if (subset.equals(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER)) { 610 this.plugin_item_list = this.doc.createElement(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER); 611 Element import_list = (Element)GSXML.getChildByTagName(cluster_config_elem,GSXML.IMPORT_ELEM); 612 if (import_list != null) 613 { 614 Element plugin_item_list = (Element)GSXML.getChildByTagName(cluster_config_elem,GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER); 615 return addPlugins(plugin_item_list); 616 } 617 else 618 return false; 580 619 } else { 581 620 logger.error("cannot process system request, configure "+subset); -
trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java
r13270 r13994 46 46 } 47 47 48 //plugin stuff 49 Element import_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.IMPORT_ELEM); 50 if (import_list != null) 51 { 52 Element plugin_list = (Element)GSXML.getChildByTagName(import_list, GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER); 53 addPlugins(plugin_list); 54 } 55 48 56 Element config_doc_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER); 49 57 if (config_doc_list != null) { … … 79 87 description.appendChild(this.service_list); 80 88 description.appendChild(this.metadata_list); 89 description.appendChild(this.plugin_item_list); 81 90 description.appendChild(this.document_list); 82 91 return response; … … 100 109 } else if (info.equals(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER)) { 101 110 description.appendChild(this.document_list); 111 } else if (info.equals(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER)) { 112 description.appendChild(this.plugin_item_list); 102 113 } 103 114 -
trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java
r13989 r13994 189 189 // some system wide param names 190 190 public static final String SUBSET_PARAM = "subset"; 191 191 192 //for plugin 193 public static final String PLUGIN_ELEM = "plugin"; 194 public static final String IMPORT_ELEM = "import"; 195 196 192 197 /** takes a list of elements, and returns an array of strings 193 198 * of the values of attribute att_name */
Note:
See TracChangeset
for help on using the changeset viewer.