tdraier 2005/10/03 17:12:39 CEST
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
link on subpage in content picker results
Revision Changes Path
1.25 +11 -4
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.24&r2=1.25&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ManageContentPicker.java 30 Sep 2005 16:59:21 -0000 1.24
+++ ManageContentPicker.java 3 Oct 2005 15:12:39 -0000 1.25
@@ -23,6 +23,7 @@
import org.jahia.services.search.*;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.pages.ContentPage;
import org.jahia.utils.JahiaTools;
import java.util.*;
@@ -34,7 +35,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.24 2005/09/30 16:59:21 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.25 2005/10/03 15:12:39 tdraier
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -262,6 +263,7 @@
//is compatible
if (ie.isCompatible(thisJcd, currentJcd)) {
String key = Integer.toString(current.getID());
+ int pageID = ((ContentContainer)
current).getPageID();
logger.debug("found compatible?" + key);
String t = key;
List l = ((ContentContainer)
current).getChilds(null, lr, null);
@@ -282,7 +284,9 @@
for (Iterator iterator1 = l.iterator();
iterator1.hasNext();) {
ContentField contentField = (ContentField)
iterator1.next();
if (contentField instanceof
ContentPageField) {
- t = ((ContentPageField)
l.iterator().next()).getContentPage(lr).getTitle(lr);
+ ContentPage contentPage =
((ContentPageField) l.iterator().next()).getContentPage(lr);
+ t = contentPage.getTitle(lr);
+ pageID = contentPage.getID();
logger.debug("page:" + t);
break;
}
@@ -299,8 +303,8 @@
JahiaContainerSearchHit hit = new
JahiaContainerSearchHit(jahiaSearchHit.getParsedObject());
hit.setId(key);
hit.setPage(((ContentContainer)
current).getPage().getPage(processingContext));
- hit.setPageId(((ContentContainer)
current).getPageID());
-
hit.setURL(processingContext.composePageUrl(((ContentContainer)
current).getPageID()));
+ hit.setPageId(pageID);
+
hit.setURL(processingContext.composePageUrl(pageID));
hit.setTeaser(t);
hit.setScore(score);
@@ -425,6 +429,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.25 2005/10/03 15:12:39 tdraier
+ * link on subpage in content picker results
+ *
* Revision 1.24 2005/09/30 16:59:21 dpillot
* bug fix
*
