dpillot 2005/10/12 12:40:12 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
npe bugfix & avd queries enhacement
Revision Changes Path
1.27 +32 -21
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.26&r2=1.27&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- contentpick.jsp 11 Oct 2005 15:15:55 -0000 1.26
+++ contentpick.jsp 12 Oct 2005 10:40:12 -0000 1.27
@@ -76,7 +76,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.26 2005/10/11 15:15:55 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.27 2005/10/12 10:40:12 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -84,7 +84,11 @@
String theScreen = (String) engineMap.get("screen");
//parameter to order the results (def:score)
String orderBy = (String) engineMap.get("orderby");
- if(orderBy==null || orderBy.equalsIgnoreCase("")) orderBy="score";
+ logger.debug("enginemap orderby="+orderBy);
+ if(orderBy==null || orderBy.equalsIgnoreCase("")) {
+ logger.debug("set order to def score");
+ orderBy="score";
+ }
// # of sites
int sitecount = Integer.parseInt((String) engineMap.get("sitecount"));
// server path
@@ -242,7 +246,7 @@
<% } %>
</select>
<!-- query -->
- <INPUT name="query" size=40
value="<%=engineMap.get("searchString")%>"
+ <INPUT name="query" size=30
value="<%=engineMap.get("searchString")%>"
onkeypress="submitenter(this,window.event)"
onfocus="this.value=''"/>
<%
@@ -251,7 +255,7 @@
if (sitecount > 1) {
// looping on all sites
%>
-
+ <!--id searchsite:<%=searchsite%> -->
<select name="searchSite" onchange="goSearch()">
<%
String isSelected = "";
@@ -260,8 +264,7 @@
String id = "" + jahiaSite.getID();
String key = "" + jahiaSite.getSiteKey();
if (searchsite.equalsIgnoreCase(id)) isSelected =
"selected=selected";
- else
- isSelected = "";
+ else isSelected = "";
count++;
%>
<option value="<%=id%>" <%=isSelected%>><%=key%></option>
@@ -281,17 +284,19 @@
<% } %>
<a href="javascript:expandcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
- height="16"
border="0"></a>
+ height="16"
border="0" alt="ajoute un critere"></a>
</div>
<!-- some other queries criteria -->
<div id="sc2" class="switchcontent">
- <select name="condition2" onchange="goSearch()">
- <option label="creator" value="creator"
selected="selected"></option>
- <option label="keywords" value="keywords"></option>
+ <select name="condition2">
+ <option value="creator" selected="selected">par createur</option>
+ <option value="keywords">par keywords</option>
+ <option value="pageid">par page id</option>
+ <option value="date">par date range</option>
</select>
- <INPUT size=50 value="" name="query2"
onkeypress="submitenter(this,window.event)" onfocus="this.value=''"/>
+ <INPUT size=30 value="" name="query2"
onkeypress="submitenter(this,window.event)" onfocus="this.value=''"/>
<a href="javascript:expandcontent('sc3')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
height="16"
border="0"></a><a
href="javascript:contractcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16"
@@ -300,12 +305,14 @@
<div id="sc3" class="switchcontent">
- <select name="condition3" onchange="goSearch()">
- <option label="creator" value="creator"
selected="selected"></option>
- <option label="keywords" value="keywords"></option>
+ <select name="condition3">
+ <option value="creator" selected="selected">par createur</option>
+ <option value="keywords">par keywords</option>
+ <option value="pageid">par page id</option>
+ <option value="date">par date range</option>
</select>
- <INPUT size=50 value="" name="query3"
onkeypress="submitenter(this,window.event)" onfocus="this.value=''"/>
+ <INPUT size=30 value="" name="query3"
onkeypress="submitenter(this,window.event)" onfocus="this.value=''"/>
<a href="javascript:expandcontent('sc4')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
height="16"
border="0"></a><a
href="javascript:contractcontent('sc3')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16"
@@ -314,12 +321,13 @@
</div>
<div id="sc4" class="switchcontent">
- <select name="condition4" onchange="goSearch()">
- <option label="creator" value="creator"
selected="selected"></option>
- <option label="keywords" value="keywords"></option>
-
+ <select name="condition4" >
+ <option value="creator" selected="selected">par createur</option>
+ <option value="keywords">par keywords</option>
+ <option value="pageid">par page id</option>
+ <option value="date">par date range</option>
</select>
- <INPUT size=50 value="" name="query4"
onkeypress="submitenter(this,window.event)" onfocus="this.value=''" />
+ <INPUT size=30 value="" name="query4"
onkeypress="submitenter(this,window.event)" onfocus="this.value=''" />
<a href="javascript:expandcontent('sc5')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
height="16"
border="0"></a><a
href="javascript:contractcontent('sc4')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16"
@@ -329,7 +337,7 @@
</td></tr>
<tr><td><a href="javascript:goSearch()">search</a></td><td
align="right"><img id="waiting" src="/jahia/jsp/jahia/engines/images/pix.gif"
width="16"
- height="16"
border="0"></td></tr>
+ height="16"
border="0" align="right"></td></tr>
</table>
@@ -471,6 +479,9 @@
</div><!-- end menu wrapper part -->
<% /**
* $Log: contentpick.jsp,v $
+ * 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
*
