Update of /var/cvs/contributions/natmm/templates/natmm/includes/zoek
In directory james.mmbase.org:/tmp/cvs-serv743/templates/natmm/includes/zoek
Modified Files:
resultaten.jsp
Log Message:
NMCMS-447
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/zoek
See also: http://www.mmbase.org/jira/browse/NMCMS-447
Index: resultaten.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/zoek/resultaten.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- resultaten.jsp 19 Sep 2007 10:11:02 -0000 1.19
+++ resultaten.jsp 23 Apr 2008 09:14:28 -0000 1.20
@@ -52,10 +52,11 @@
<select name="pcontentype"
style="width:100%;border:0;font-size:12px;" />
<%
Map contentTypes = new TreeMap();
- contentTypes.put("0","Artikelen");
- contentTypes.put("1","Producten uit de webwinkel");
- contentTypes.put("2","Activiteiten");
- contentTypes.put("3","Natuurgebieden");
+ contentTypes.put("0","Alles");
+ contentTypes.put("1","Artikelen");
+ contentTypes.put("2","Producten uit de webwinkel");
+ contentTypes.put("3","Activiteiten");
+ contentTypes.put("4","Natuurgebieden");
Iterator it1 = contentTypes.entrySet().iterator();
while(it1.hasNext()) {
@@ -100,19 +101,23 @@
int thisOffset = Integer.parseInt(offsetID);
List searchResults = new ArrayList();
+ boolean searchAllNodes = false;
+
switch (contentType) {
case 0:
- %><[EMAIL PROTECTED] file="results/articles_nodes.jsp" %><%
- break;
+ searchAllNodes = true;
case 1:
- %><[EMAIL PROTECTED] file="results/items_nodes.jsp" %><%
- break;
+ %><[EMAIL PROTECTED] file="results/articles_nodes.jsp" %><%
+ if (!searchAllNodes) break;
case 2:
- %><[EMAIL PROTECTED] file="results/evenement_nodes.jsp" %><%
- break;
+ %><[EMAIL PROTECTED] file="results/items_nodes.jsp" %><%
+ if (!searchAllNodes) break;
case 3:
+ %><[EMAIL PROTECTED] file="results/evenement_nodes.jsp" %><%
+ if (!searchAllNodes) break;
+ case 4:
%><[EMAIL PROTECTED] file="results/natuurgebieden_nodes.jsp"
%><%
- break;
+ if (!searchAllNodes) break;
}
int listSize = searchResults.size();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
