dpillot 2005/11/09 13:40:51 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
better visualization
Revision Changes Path
1.46 +40 -20
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.45&r2=1.46&f=h
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ManageContentPicker.java 4 Nov 2005 16:45:58 -0000 1.45
+++ ManageContentPicker.java 9 Nov 2005 12:40:51 -0000 1.46
@@ -37,7 +37,7 @@
*
* @author Thomas Draier, joe Pillot
* @author ${User}
- * @version $Id: ManageContentPicker.java,v 1.45 2005/11/04 16:45:58 dpillot
Exp $
+ * @version $Id: ManageContentPicker.java,v 1.46 2005/11/09 12:40:51 dpillot
Exp $
*/
public class ManageContentPicker {
private static org.apache.log4j.Logger logger =
@@ -161,7 +161,7 @@
/**
* internal method to do the search
*
- * @param object
+ * @param object the initial destination object
* @param processingContext
* @param engineMap
* @throws Exception
@@ -518,7 +518,8 @@
JahiaContainerDefinition thisJcd = (JahiaContainerDefinition)
ContentObject.getInstance(cdk);
logger.debug("destination cdk:" + cdk + " cdfn:" + thisJcd);
- EntryLoadRequest lr = new
EntryLoadRequest(EntryLoadRequest.STAGING_WORKFLOW_STATE, 0,
processingContext.getLocaleList());
+
+ EntryLoadRequest lr = new
EntryLoadRequest(EntryLoadRequest.ACTIVE_WORKFLOW_STATE, 0,
processingContext.getLocaleList());
// big loop to test the compatibility of container type
for (Iterator iterator = searchResults.results().iterator();
iterator.hasNext();) {
@@ -548,13 +549,15 @@
if
(dest.getObjectKey().equals(current.getObjectKey())) {
break;
}
- dest =
dest.getParent(EntryLoadRequest.STAGED);
+ // validated content
+ dest =
dest.getParent(EntryLoadRequest.CURRENT);
}
if (dest == null) {
String key =
Integer.toString(current.getID());
int pageID = contentContainer.getPageID();
//used to try to create an url
int siteID = contentContainer.getSiteID();
+ int
type=JahiaSearchHitInterface.UNDEFINED_TYPE;
logger.debug("found compatible?" + key);
String t = key;
List l =
getChildFieldsOnly(contentContainer.getChilds(null, lr, null));
@@ -570,6 +573,7 @@
}
}
+ // case the content object is text
for (Iterator iterator1 = l.iterator();
iterator1.hasNext();) {
ContentField contentField =
(ContentField) iterator1.next();
if (contentField instanceof
ContentSmallTextField) {
@@ -578,6 +582,7 @@
t = value;
pageID =
contentField.getPageID();
siteID =
contentField.getSiteID();
+
type=JahiaSearchHitInterface.FIELD_TYPE;
logger.debug("smalltext:" + t +
" pageID" + pageID+"on site"+siteID);
break;
}
@@ -592,10 +597,12 @@
t = contentPage.getTitle(lr);
pageID = contentPage.getID();
siteID = contentPage.getSiteID();
+
type=JahiaSearchHitInterface.PAGE_TYPE;
logger.debug("page:" + t + " pageID"
+ pageID+ "on site"+siteID);
break;
}
}
+
if (jahiaSearchHit.getParsedObject()!= null)
{
//logger.debug("fields of searchhit" +
jahiaSearchHit.getParsedObject().getFields());
}
@@ -607,6 +614,7 @@
break;
} else {
JahiaContainerSearchHit hit = new
JahiaContainerSearchHit(jahiaSearchHit.getParsedObject());
+ hit.setType(type);
hit.setId(key);
hit.setPage(contentContainer.getPage().getPage(processingContext));
hit.setPageId(pageID);
@@ -680,16 +688,9 @@
}//end big loop.
*/
- //sorting by score
- orderBy("score", engineMap, myResults, results);
- /*
- for (Iterator iterator = new
TreeSet(results.values()).iterator(); iterator.hasNext();) {
- JahiaSearchHit jahiaSearchHit = (JahiaSearchHit)
iterator.next();
- myResults.addHit(jahiaSearchHit);
- }
+ //sorting
+ orderBy(orderBy, engineMap, myResults, results);
- engineMap.put("searchResults", myResults);
- */
}
}
@@ -743,18 +744,33 @@
logger.debug("sort searching by" + key);
- if (key.equalsIgnoreCase("score")) {
- // by score (default)
+ if (key.equalsIgnoreCase("id")) {
+ //by id
+ }else if(key.equalsIgnoreCase("creator")) {
+ //by creator
+ orderBy("creator",engineMap);
+ }else if(key.equalsIgnoreCase("lastpublishingdate")) {
+ //by last pub date
+ orderBy("lastpublishingdate",engineMap);
+ }else if(key.equalsIgnoreCase("creationdate")) {
+ //by creationdate
+ orderBy("creationdate",engineMap);
+ }else if(key.equalsIgnoreCase("lastmodificationdate")) {
+ //by modif date
+ orderBy("lastmodificationdate",engineMap);
+ }else if(key.equalsIgnoreCase("lastcontributor")) {
+ //by contributor
+ orderBy("lastcontributor",engineMap);
+ }else {
+ // by score (default comparable interface)
for (Iterator iterator = new
TreeSet(results.values()).iterator(); iterator.hasNext();) {
JahiaSearchHit jahiaSearchHit = (JahiaSearchHit)
iterator.next();
myResults.addHit(jahiaSearchHit);
}
-
- } else if (key.equalsIgnoreCase("id")) {
- //by id
+ engineMap.put("searchResults", myResults);
}
- engineMap.put("searchResults", myResults);
+
}
/**
@@ -802,14 +818,18 @@
};
if (myResults.results() != null) {
Collections.sort(myResults.results(), comp);
+ engineMap.put("searchResults", myResults);
} else {
logger.debug("results null!!!");
}
- engineMap.put("searchResults", myResults);
+
}
}
/**
* $Log: ManageContentPicker.java,v $
+ * Revision 1.46 2005/11/09 12:40:51 dpillot
+ * better visualization
+ *
* Revision 1.45 2005/11/04 16:45:58 dpillot
* fix link on page url
*
