xlawrence 2005/04/26 11:26:27 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/blogs/actions AbstractAction.java
EditPostAction.java
NewPostAction.java
Log:
Corrected activation problem when post contains ping urls
Revision Changes Path
1.1.2.9 +9 -3
jahia/src/java/org/jahia/blogs/actions/AbstractAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/AbstractAction.java.diff?r1=1.1.2.8&r2=1.1.2.9&f=h
1.1.2.10 +34 -6
jahia/src/java/org/jahia/blogs/actions/EditPostAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/EditPostAction.java.diff?r1=1.1.2.9&r2=1.1.2.10&f=h
1.1.2.13 +6 -11 jahia/src/java/org/jahia/blogs/actions/NewPostAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/NewPostAction.java.diff?r1=1.1.2.12&r2=1.1.2.13&f=h
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/AbstractAction.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractAction.java 25 Apr 2005 14:45:55 -0000 1.1.2.8
+++ AbstractAction.java 26 Apr 2005 09:26:27 -0000 1.1.2.9
@@ -356,9 +356,12 @@
field.activate(languageCodes, saveVersion.getVersionID(),
jParams, smc);
}
+
+ ActivationTestResults res =
containerService.activateStagedContainer(languageCodes, containerID,
+ user, saveVersion, jParams, smc);
- return containerService.activateStagedContainer(languageCodes,
containerID,
- user, saveVersion, jParams, smc);
+ log.debug(res);
+ return res;
}
/**
@@ -385,8 +388,11 @@
new ContentContainerListKey(containerListID), languageCodes);
smc.setDescendingInSubPages(false);
- return containerService.activateStagedContainerLists(languageCodes,
+ ActivationTestResults res =
containerService.activateStagedContainerLists(languageCodes,
pageID, user, saveVersion, smc);
+
+ log.debug(res);
+ return res;
}
/**
Index: EditPostAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/EditPostAction.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- EditPostAction.java 25 Apr 2005 13:09:21 -0000 1.1.2.9
+++ EditPostAction.java 26 Apr 2005 09:26:27 -0000 1.1.2.10
@@ -189,6 +189,9 @@
field = postContainer.getField(fieldName);
field.setValue(userName);
+ // Used to publish all the ping tb containers
+ boolean publishPingContainers = false;
+
// check if extra Movable Type are present in the struct
if (struct != null) {
@@ -240,10 +243,13 @@
if (url.length() < 7) continue;
// url is allready stored, don't add it again
- if (existingPings.contains(url)) continue;
+ if (existingPings.contains(url)) {
+ publishPingContainers = true;
+ continue;
+ }
- // load the containerlist after each newly added
container
- if (i > 0) {
+ // load the containerlist after the 1st added container
+ if (i == 1) {
pingURLs = containerService.loadContainerList(
listID, LoadFlags.ALL, jParams);
}
@@ -291,20 +297,29 @@
super.activateContainerList(pingURLContainer.getListID(),
user, pingURLContainer.getPageID());
}
-
+
if (publish) {
+ // publish the trackBack ping url container
super.activateContainer(pingURLContainer.getID(),
user);
}
-
+
pingURLContainer = null;
url = null;
- }
+ }
}
}
containerService.saveContainer(postContainer, 0, jParams);
if (publish) {
+ if (publishPingContainers) {
+ JahiaContainerList pingURLs = postContainer.getContainerList(
+
containerNames.getValue(containerNames.BLOG_TB_PING_LIST));
+ if (pingURLs != null && pingURLs.getID() > 0) {
+ activatePingContainers(pingURLs, user);
+ }
+ }
+
super.activateContainer(postContainer.getID(), user);
}
@@ -335,4 +350,17 @@
}
return result;
}
+
+ /**
+ *
+ */
+ protected void activatePingContainers(JahiaContainerList list, JahiaUser
user)
+ throws JahiaException {
+ Enumeration en = list.getContainers();
+
+ while (en.hasMoreElements()) {
+ JahiaContainer c = (JahiaContainer)en.nextElement();
+ super.activateContainer(c.getID(), user);
+ }
+ }
}
Index: NewPostAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/NewPostAction.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- NewPostAction.java 25 Apr 2005 14:45:55 -0000 1.1.2.12
+++ NewPostAction.java 26 Apr 2005 09:26:27 -0000 1.1.2.13
@@ -218,13 +218,7 @@
Vector categories = (Vector)struct.get(MetaPostInfo.CATEGORIES);
super.setCategories(categories, postContainer);
}
-
- java.util.Enumeration en = postContainer.getFields();
- while (en.hasMoreElements()) {
- JahiaField f = (JahiaField)en.nextElement();
- log.debug(f.getDefinition().getName());
- }
-
+
JahiaField field = postContainer.getField(fieldName);
field.setValue(fieldValue);
@@ -286,7 +280,7 @@
// Ignore any empty or too short urls
if (url.length() < 7) continue;
- if (i > 0) {
+ if (i == 1) {
pingURLs = containerService.loadContainerList(
ctnListID, LoadFlags.ALL, jParams);
}
@@ -332,11 +326,12 @@
super.activateContainerList(pingURLContainer.getListID(),
user, pingURLContainer.getPageID());
}
-
+
if (publish) {
- super.activateContainer(pingURLContainer.getID(),
user);
+ // publish the trackBack ping url container
+ super.activateContainer(pingURLContainer.getID(),
user);
}
-
+
pingURLContainer = null;
url = null;
}
