Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
In directory
james.mmbase.org:/tmp/cvs-serv16268/publish-remote/src/java/com/finalist/cmsc/publish
Modified Files:
Publisher.java
Log Message:
CMSC-1040 Move some sources from net.sf.mmapps.remotepublishing to cmsc cvs
Changed source to depend on servicemanagement instead of publish-remote
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
See also: http://www.mmbase.org/jira/browse/CMSC-1040
Index: Publisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish/Publisher.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Publisher.java 25 Feb 2008 14:18:12 -0000 1.7
+++ Publisher.java 1 Aug 2008 14:47:51 -0000 1.8
@@ -96,20 +96,29 @@
}
public int getRemoteNumber(Node node) {
+ if (PublishManager.isPublished(node)) {
Map<Integer,Integer> numbers =
PublishManager.getPublishedNodeNumbers(node);
Iterator<Integer> iter = numbers.values().iterator();
if (iter.hasNext()) {
return iter.next();
}
+ }
return -1;
}
public Node getRemoteNode(Node node) {
- Map<Integer,Node> numbers = PublishManager.getPublishedNodes(node);
+ if (PublishManager.isPublished(node)) {
+ Map<Integer, Node> numbers = PublishManager.getPublishedNodes(node);
Iterator<Node> iter = numbers.values().iterator();
if (iter.hasNext()) {
return iter.next();
}
+ }
+ else {
+ if (PublishManager.isImported(node)) {
+ return PublishManager.getSourceNode(node);
+ }
+ }
return null;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
