LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XML Cache für Content Items. Noch nicht fertig gestellt, kann aber bereits zu Testzwecken aktiviert werden. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2140 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-04-23 15:19:25 +00:00
parent d022360355
commit 9a41854aa3
1 changed files with 155 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java
View File

@ -43,10 +43,8 @@ import com.arsdigita.persistence.metadata.Property;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -135,6 +133,7 @@ public class SimpleXMLGenerator implements XMLGenerator {
* @param parent The parent DOM element * @param parent The parent DOM element
* @param useContext The use context * @param useContext The use context
*/ */
@Override
public void generateXML(final PageState state, final Element parent, final String useContext) { public void generateXML(final PageState state, final Element parent, final String useContext) {
//final long start = System.nanoTime(); //final long start = System.nanoTime();
@ -199,8 +198,24 @@ public class SimpleXMLGenerator implements XMLGenerator {
//final Element content = startElement(useContext, parent); //final Element content = startElement(useContext, parent);
final Element content; final Element content;
if (CMSConfig.getInstance().getEnableXmlCache() && (CACHE.get(item.getOID().toString()) != null)) { if (CMSConfig.getInstance().getEnableXmlCache() && (CACHE.get(item.getOID().toString()) != null)) {
content = (Element) CACHE.get(item.getOID().toString()); s_log.debug("Item found in cache, using cached XML");
final Element cached = (Element) CACHE.get(item.getOID().toString());
//parent.importElement(content);
cached.syncDocs();
content = startElement(useContext);
final Iterator entries = cached.getAttributes().entrySet().iterator();
Map.Entry entry;
while(entries.hasNext()) {
entry = (Map.Entry) entries.next();
content.addAttribute((String) entry.getKey(), (String) entry.getValue());
}
final Iterator childs = cached.getChildren().iterator();
while(childs.hasNext()) {
copyElement(content, (Element) childs.next());
}
} else { } else {
s_log.debug("Item is not in cache, generating item.");
content = startElement(useContext); content = startElement(useContext);
@ -221,22 +236,32 @@ public class SimpleXMLGenerator implements XMLGenerator {
//parent.addContent(content); //parent.addContent(content);
//Only cache published items //Only published items
// if (item.isLiveVersion()) { //Only the XML of the item itself, no extra XML
// final Element cachedElem = startElement(useContext); if (item.isLiveVersion()) {
// final Iterator entries = content.getAttributes().entrySet().iterator(); s_log.debug("Putting item item into the cache.");
// Map.Entry entry; final Element cachedElem = startCachedElement(useContext);
// while (entries.hasNext()) { final Iterator entries = content.getAttributes().entrySet().iterator();
// entry = (Map.Entry) entries.next(); Map.Entry entry;
// cachedElem.addAttribute((String) entry.getKey(), (String) entry.getValue()); while (entries.hasNext()) {
// } entry = (Map.Entry) entries.next();
// final Iterator childs = content.getChildren().iterator(); cachedElem.addAttribute((String) entry.getKey(), (String) entry.getValue());
// while (childs.hasNext()) { }
final Iterator childs = content.getChildren().iterator();
while (childs.hasNext()) {
//cachedElem.newChildElement((Element) childs.next()); //cachedElem.newChildElement((Element) childs.next());
// } copyElement(cachedElem, (Element) childs.next());
// CACHE.put(item.getOID().toString(), cachedElem); }
// } CACHE.put(item.getOID().toString(), cachedElem);
//} }
}
//Only item XML Cache End
// s_log.debug("Content elem content: ");
// logElementTree(content);
// s_log.debug("Content elem content end -- ");
/* /*
* 2011-08-27 jensp: Introduced to remove the annoying special templates * 2011-08-27 jensp: Introduced to remove the annoying special templates
* for MultiPartArticle, SiteProxy and others. The method called * for MultiPartArticle, SiteProxy and others. The method called
@ -256,21 +281,23 @@ public class SimpleXMLGenerator implements XMLGenerator {
// printf("Rendered ExtraXML in %d ms\n", (System.nanoTime() - extraXMLStart) / 1000000); // printf("Rendered ExtraXML in %d ms\n", (System.nanoTime() - extraXMLStart) / 1000000);
// System.out.printf(" -----\n"); // System.out.printf(" -----\n");
if (CMSConfig.getInstance().getEnableXmlCache() && item.isLiveVersion()) { //Complete cache begin
final Element cachedElem = startElement(useContext); // if (CMSConfig.getInstance().getEnableXmlCache() && item.isLiveVersion()) {
final Iterator entries = content.getAttributes().entrySet().iterator(); // final Element cachedElem = startElement(useContext);
Map.Entry entry; // final Iterator entries = content.getAttributes().entrySet().iterator();
while (entries.hasNext()) { // Map.Entry entry;
entry = (Map.Entry) entries.next(); // while (entries.hasNext()) {
cachedElem.addAttribute((String) entry.getKey(), (String) entry.getValue()); // entry = (Map.Entry) entries.next();
} // cachedElem.addAttribute((String) entry.getKey(), (String) entry.getValue());
final Iterator childs = content.getChildren().iterator(); // }
while (childs.hasNext()) { // final Iterator childs = content.getChildren().iterator();
cachedElem.newChildElement((Element) childs.next()); // while (childs.hasNext()) {
} // cachedElem.newChildElement((Element) childs.next());
CACHE.put(item.getOID().toString(), cachedElem); // }
} // CACHE.put(item.getOID().toString(), cachedElem);
} // }
// }
//complete cache end
if (PermissionService.checkPermission(edit)) { if (PermissionService.checkPermission(edit)) {
final ItemResolver resolver = item.getContentSection().getItemResolver(); final ItemResolver resolver = item.getContentSection().getItemResolver();
@ -373,6 +400,62 @@ public class SimpleXMLGenerator implements XMLGenerator {
return element; return element;
} }
private Element startCachedElement(final String useContext) {
final Element element = new Element(itemElemName, itemElemNs) {
@Override
public Element newChildElement(Element copyFrom) {
s_log.debug("Copy of element added to cached elem.");
return super.newChildElement(copyFrom);
}
@Override
public Element newChildElement(String name, Element copyFrom) {
s_log.debug("Copy of element added to cached elem.");
return super.newChildElement(name, copyFrom);
}
@Override
public Element addContent(final Element newContent) {
s_log.debug("Content added to cached element");
return super.addContent(newContent);
}
};
if (useContext != null) {
element.addAttribute("useContext", useContext);
}
for (Map.Entry<String, String> attr : itemAttributes.entrySet()) {
element.addAttribute(attr.getKey(), attr.getValue());
}
return element;
}
private void copyElement(final Element parent, final Element element) {
final Element copy = parent.newChildElement(element.getName());
final Iterator attrs = element.getAttributes().entrySet().iterator();
Map.Entry attr;
while (attrs.hasNext()) {
attr = (Map.Entry) attrs.next();
copy.addAttribute((String) attr.getKey(), (String) attr.getValue());
}
final Iterator childs = element.getChildren().iterator();
while (childs.hasNext()) {
copyElement(copy, (Element) childs.next());
}
if (element.getText() != null) {
copy.setText(element.getText());
}
if (element.getCDATASection() != null) {
copy.setCDATASection(element.getCDATASection());
}
}
private Element UDItemElement(final String useContext) { private Element UDItemElement(final String useContext) {
final Element element = new Element("cms:UDItemAttributes", CMS.CMS_XML_NS); final Element element = new Element("cms:UDItemAttributes", CMS.CMS_XML_NS);
/* /*
@ -390,4 +473,27 @@ public class SimpleXMLGenerator implements XMLGenerator {
return element; return element;
} }
private void logElementTree(final Element element) {
s_log.debug("Tree of element" + element.getName() + ":\n");
s_log.debug("\n" + logElementTree(element, new StringBuilder(), 0));
}
private String logElementTree(final Element element, final StringBuilder builder, final int depth) {
for(int i = 0; i < depth; i++) {
builder.append('\t');
}
builder.append('<').append(element.getName()).append(">\n");
for(Object childObj : element.getChildren()) {
final Element child = (Element) childObj;
logElementTree(child, builder, depth + 1);
}
for(int i = 0; i < depth; i++) {
builder.append('\t');
}
builder.append("</").append(element.getName()).append(">\n");
return builder.toString();
}
} }