tdraier 2005/10/06 17:50:36 CEST
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
display metadatas in content pick
Revision Changes Path
1.32 +18 -8
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.31&r2=1.32&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ManageContentPicker.java 6 Oct 2005 14:50:36 -0000 1.31
+++ ManageContentPicker.java 6 Oct 2005 15:50:35 -0000 1.32
@@ -17,9 +17,7 @@
import org.jahia.services.containers.ContentContainer;
import org.jahia.services.containers.ContentContainerList;
import org.jahia.services.containers.JahiaContainersService;
-import org.jahia.services.fields.ContentField;
-import org.jahia.services.fields.ContentPageField;
-import org.jahia.services.fields.ContentSmallTextField;
+import org.jahia.services.fields.*;
import org.jahia.services.importexport.ImportExportService;
import org.jahia.services.search.*;
import org.jahia.services.sites.JahiaSite;
@@ -37,7 +35,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.31 2005/10/06 14:50:36 tdraier
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.32 2005/10/06 15:50:35 tdraier
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -301,17 +299,19 @@
//check if container
if (current instanceof ContentContainer) {
- ContainerDefinitionKey currentCdk =
(ContainerDefinitionKey) ((ContentContainer) current).getDefinitionKey(null);
+ ContentContainer contentContainer =
((ContentContainer) current);
+ ContainerDefinitionKey currentCdk =
(ContainerDefinitionKey) contentContainer.getDefinitionKey(null);
JahiaContainerDefinition currentJcd =
(JahiaContainerDefinition) ContentObject.getInstance(currentCdk);
logger.debug("Hit-id:" + jahiaSearchHit.getId() + "
[score:" + score + "] cdk:" + currentCdk + " cdfn:" + currentJcd);
//is compatible
if (ie.isCompatible(thisJcd, currentJcd)) {
+
String key = Integer.toString(current.getID());
- int pageID = ((ContentContainer)
current).getPageID();
+ int pageID = contentContainer.getPageID();
logger.debug("found compatible?" + key);
String t = key;
- List l = ((ContentContainer)
current).getChilds(null, lr, null);
+ List l = contentContainer.getChilds(null, lr,
null);
if (!l.isEmpty()) {
t = ((ContentField)
l.iterator().next()).getValue(processingContext, lr);
logger.debug("tkey=" + t);
@@ -349,11 +349,18 @@
} else {
JahiaContainerSearchHit hit = new
JahiaContainerSearchHit(jahiaSearchHit.getParsedObject());
hit.setId(key);
- hit.setPage(((ContentContainer)
current).getPage().getPage(processingContext));
+
hit.setPage(contentContainer.getPage().getPage(processingContext));
hit.setPageId(pageID);
hit.setURL(processingContext.composePageUrl(pageID));
hit.setTeaser(t);
hit.setScore(score);
+ List metadata =
contentContainer.getMetadatas();
+ logger.debug("metadata : "+metadata);
+ Hashtable fields =
hit.getParsedObject().getFields();
+ fields.put("creator", new String[]
{((ContentSmallTextSharedLangField)
contentContainer.getMetadata("creator")).getValue(processingContext)});
+ fields.put("lastcontributor", new String[]
{((ContentSmallTextSharedLangField)
contentContainer.getMetadata("lastContributor")).getValue(processingContext)});
+ fields.put("creationdate", new String[]
{((ContentDateField)
contentContainer.getMetadata("creationDate")).getValue(processingContext)});
+ fields.put("lastpublishingdate", new
String[] {((ContentDateField)
contentContainer.getMetadata("lastPublishingDate")).getValue(processingContext)});
while (current != null) {
current = current.getParent(null);
@@ -495,6 +502,9 @@
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.32 2005/10/06 15:50:35 tdraier
+ * display metadatas in content pick
+ *
* Revision 1.31 2005/10/06 14:50:36 tdraier
* fixed teaser in cp
*
