Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish
In directory
james.mmbase.org:/tmp/cvs-serv32513/publish-remote/src/java/com/finalist/cmsc/services/publish
Modified Files:
Tag: b1_4
PublishServiceMMBaseImpl.java
Log Message:
CMSC-635 - Improved PublishService.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish
See also: http://www.mmbase.org/jira/browse/CMSC-635
Index: PublishServiceMMBaseImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish/PublishServiceMMBaseImpl.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -b -r1.10.2.2 -r1.10.2.3
--- PublishServiceMMBaseImpl.java 25 Feb 2008 13:24:06 -0000 1.10.2.2
+++ PublishServiceMMBaseImpl.java 26 Feb 2008 17:04:06 -0000 1.10.2.3
@@ -19,6 +19,7 @@
import com.finalist.cmsc.navigation.NavigationItemManager;
import com.finalist.cmsc.navigation.NavigationManager;
import com.finalist.cmsc.publish.*;
+import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.services.search.Search;
import com.finalist.cmsc.services.workflow.Workflow;
@@ -154,6 +155,9 @@
@Override
public String getRemoteContentUrl(Node node) {
if (Publish.isPublished(node) && Search.hasContentPages(node)) {
+ if (ContentElementUtil.isContentElement(node) &&
!Search.hasContentPages(node)) {
+ return null;
+ }
int remoteNumber = Publish.getRemoteNumber(node);
String appPath = "/content/" + remoteNumber;
return getRemoteUrl(appPath);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
