dpillot 2005/12/02 18:59:59 CET
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
misc bugs:fix pid bug, queries persistence bug, null url of hit in some
circumstances
added ability to querying number as jahia_pid
Revision Changes Path
1.42 +7 -54
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp.diff?r1=1.41&r2=1.42&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- contentpick.jsp 30 Nov 2005 11:00:51 -0000 1.41
+++ contentpick.jsp 2 Dec 2005 17:59:58 -0000 1.42
@@ -79,7 +79,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.41 2005/11/30 11:00:51 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.42 2005/12/02 17:59:58 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -907,10 +907,12 @@
sb = new StringBuffer();
for (int i = 0; i < totalHits; i++) {
JahiaSearchHit thisHit = (JahiaSearchHit) sr.results().get(i);
- String url = "#";
+ String url = serverpath + thisHit.getURL();
+ /*
if (thisHit.getTeaser() != null &&
!thisHit.getTeaser().equalsIgnoreCase("")) {
url = serverpath + thisHit.getURL();
}
+ */
String sitekey = null;
int pickersUsage = 0;
try {
@@ -1002,63 +1004,15 @@
<%
/**
* $Log: contentpick.jsp,v $
+ * Revision 1.42 2005/12/02 17:59:58 dpillot
+ * misc bugs:fix pid bug, queries persistence bug, null url of hit in
some circumstances
+ * added ability to querying number as jahia_pid
+ *
* Revision 1.41 2005/11/30 11:00:51 dpillot
* cluster bug fix
*
* Revision 1.39 2005/11/23 17:33:47 dpillot
* object type info for cp display
*
- * Revision 1.38 2005/11/22 16:42:21 dpillot
- * call disp pickers script fix
- *
- * Revision 1.37 2005/11/22 16:01:13 dpillot
- * display pickers script
- *
- * Revision 1.36 2005/11/09 12:41:09 dpillot
- * better visualization
- *
- * Revision 1.35 2005/11/08 17:36:54 dpillot
- * fix for compilation
- *
- * Revision 1.34 2005/11/08 16:09:21 dpillot
- * pickers vizualisation and some fix for info on results
- *
- * Revision 1.33 2005/11/03 13:22:52 knguyen
- * - synchr
- *
- * Revision 1.32 2005/10/26 17:23:16 dpillot
- * cp icon fix
- *
- * Revision 1.31 2005/10/21 14:04:11 dpillot
- * minor cosmetic changes
- *
- * Revision 1.30 2005/10/21 09:06:09 dpillot
- * fix .
- *
- * Revision 1.29 2005/10/20 16:53:40 dpillot
- * internationalization & bug NFE fix
- *
- * Revision 1.28 2005/10/19 14:22:27 dpillot
- * content pick final enhancements
- *
- * Revision 1.27 2005/10/12 10:40:12 dpillot
- * npe bugfix & avd queries enhacement
- *
- * Revision 1.26 2005/10/11 15:15:55 dpillot
- * added support for limited advanced queries
- *
- * Revision 1.25 2005/10/11 09:51:38 dpillot
- * date display & selection enhancements
- *
- * Revision 1.24 2005/10/10 08:44:12 knguyen
- * - remove unused JahiaSearchConstant
- *
- * Revision 1.23 2005/10/07 13:58:14 dpillot
- * removed prefix useless
- *
- * Revision 1.22 2005/10/07 12:45:34 knguyen
- * - synchro
- *
- *
*/
%>
\ No newline at end of file