dpillot 2005/11/04 17:45:59 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
fix link on page url
Revision Changes Path
1.45 +16 -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.44&r2=1.45&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ManageContentPicker.java 3 Nov 2005 13:22:22 -0000 1.44
+++ ManageContentPicker.java 4 Nov 2005 16:45:58 -0000 1.45
@@ -26,6 +26,7 @@
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.pages.ContentPage;
import org.jahia.utils.JahiaTools;
+import org.jahia.bin.Jahia;
import java.util.*;
@@ -36,7 +37,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.44 2005/11/03 13:22:22 knguyen
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.45 2005/11/04 16:45:58 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -552,6 +553,8 @@
if (dest == null) {
String key =
Integer.toString(current.getID());
int pageID = contentContainer.getPageID();
+ //used to try to create an url
+ int siteID = contentContainer.getSiteID();
logger.debug("found compatible?" + key);
String t = key;
List l =
getChildFieldsOnly(contentContainer.getChilds(null, lr, null));
@@ -574,7 +577,8 @@
if (value != null &&
!value.trim().equals("") && !value.equals("<empty>")) {
t = value;
pageID =
contentField.getPageID();
- logger.debug("smalltext:" + t +
" pageID" + pageID);
+ siteID =
contentField.getSiteID();
+ logger.debug("smalltext:" + t +
" pageID" + pageID+"on site"+siteID);
break;
}
}
@@ -587,7 +591,8 @@
ContentPage contentPage =
((ContentPageField) contentField).getContentPage(lr);
t = contentPage.getTitle(lr);
pageID = contentPage.getID();
- logger.debug("page:" + t + " pageID"
+ pageID);
+ siteID = contentPage.getSiteID();
+ logger.debug("page:" + t + " pageID"
+ pageID+ "on site"+siteID);
break;
}
}
@@ -605,7 +610,11 @@
hit.setId(key);
hit.setPage(contentContainer.getPage().getPage(processingContext));
hit.setPageId(pageID);
-
hit.setURL(processingContext.composePageUrl(pageID));
+ //the independant url from site
+ String hiturl=
Jahia.getContextPath()+Jahia.getServletPath()+"/pid/"+pageID;
+ //logger.debug("URL:---->"+hiturl);
+
//hit.setURL(processingContext.composePageUrl(pageID));
+ hit.setURL(hiturl);
hit.setTeaser(t);
hit.setScore(score);
List metadata =
contentContainer.getMetadatas();
@@ -801,6 +810,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.45 2005/11/04 16:45:58 dpillot
+ * fix link on page url
+ *
* Revision 1.44 2005/11/03 13:22:22 knguyen
* - synchr
*
