Debug log ausgaben wieder entfernt
git-svn-id: https://svn.libreccm.org/ccm/trunk@182 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
dc83059114
commit
e2b5a3d64e
|
|
@ -232,16 +232,6 @@ public class SectionTemplateMapping extends TemplateMapping {
|
||||||
DataCollection da = SessionManager.getSession().retrieve
|
DataCollection da = SessionManager.getSession().retrieve
|
||||||
(BASE_DATA_OBJECT_TYPE);
|
(BASE_DATA_OBJECT_TYPE);
|
||||||
SectionTemplateCollection c = new SectionTemplateCollection(da);
|
SectionTemplateCollection c = new SectionTemplateCollection(da);
|
||||||
//Debug code, inserted by jensp 2009-05-26
|
|
||||||
if (section == null) {
|
|
||||||
logger.error("WARNING: section is NULL at this point!");
|
|
||||||
}
|
|
||||||
if (section.ID == null) {
|
|
||||||
logger.error("WARNING: ACSObject.ID is NULL at this point!");
|
|
||||||
}
|
|
||||||
if (section.getID() == null) {
|
|
||||||
logger.error("WARNING: section.getID() returns NULL at this point!");
|
|
||||||
}
|
|
||||||
c.addEqualsFilter(SECTION + "." + ACSObject.ID, section.getID());
|
c.addEqualsFilter(SECTION + "." + ACSObject.ID, section.getID());
|
||||||
c.addOrder(CONTENT_TYPE + "." + ContentType.LABEL);
|
c.addOrder(CONTENT_TYPE + "." + ContentType.LABEL);
|
||||||
c.addOrder(USE_CONTEXT);
|
c.addOrder(USE_CONTEXT);
|
||||||
|
|
|
||||||
|
|
@ -246,8 +246,6 @@ public class CMSPage extends Page implements ResourceHandler {
|
||||||
RequestContext actx)
|
RequestContext actx)
|
||||||
throws IOException, ServletException {
|
throws IOException, ServletException {
|
||||||
|
|
||||||
s_log.error("Starting dispatch()...");
|
|
||||||
|
|
||||||
DeveloperSupport.startStage("CMSPage.dispatch: serve page");
|
DeveloperSupport.startStage("CMSPage.dispatch: serve page");
|
||||||
|
|
||||||
CMSExcursion excursion = new CMSExcursion() {
|
CMSExcursion excursion = new CMSExcursion() {
|
||||||
|
|
@ -257,14 +255,11 @@ public class CMSPage extends Page implements ResourceHandler {
|
||||||
|
|
||||||
if (app == null) {
|
if (app == null) {
|
||||||
// We're at the content center; do nothing.
|
// We're at the content center; do nothing.
|
||||||
s_log.info("dispatch: We're at the content center; do nothing.");
|
|
||||||
} else if (app instanceof ContentSection) {
|
} else if (app instanceof ContentSection) {
|
||||||
s_log.info("dispatch: Setting section = app");
|
|
||||||
section = (ContentSection) app;
|
section = (ContentSection) app;
|
||||||
} else {
|
} else {
|
||||||
// hack to deal with category browser mounted
|
// hack to deal with category browser mounted
|
||||||
// under section app.
|
// under section app.
|
||||||
s_log.info("dispatch: hack for category browser");
|
|
||||||
app = app.getParentApplication();
|
app = app.getParentApplication();
|
||||||
if (app instanceof ContentSection) {
|
if (app instanceof ContentSection) {
|
||||||
section = (ContentSection) app;
|
section = (ContentSection) app;
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,6 @@ public class ItemTemplatePatternGenerator implements PatternGenerator {
|
||||||
if (mapping == null) {
|
if (mapping == null) {
|
||||||
// there is no mapping so we try to get the default for the
|
// there is no mapping so we try to get the default for the
|
||||||
// content type
|
// content type
|
||||||
if (item.getContentSection() == null) {
|
|
||||||
logger.error("WARNING: item.getContentSection() returns NULL here!");
|
|
||||||
}
|
|
||||||
template =
|
template =
|
||||||
TemplateManagerFactory.getInstance().getDefaultTemplate
|
TemplateManagerFactory.getInstance().getDefaultTemplate
|
||||||
(item.getContentSection(), item.getContentType(),
|
(item.getContentSection(), item.getContentType(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue