[MMBASE CVS] contributions/natmm/templates/natmm/rss xmlactiviteiten.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/natmm/rss
In directory james.mmbase.org:/tmp/cvs-serv26825/templates/natmm/rss

Modified Files:
        xmlactiviteiten.jsp 
Log Message:
NMCMS-408


See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/rss
See also: http://www.mmbase.org/jira/browse/NMCMS-408


Index: xmlactiviteiten.jsp
===================================================================
RCS file: /var/cvs/contributions/natmm/templates/natmm/rss/xmlactiviteiten.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- xmlactiviteiten.jsp 27 Feb 2008 15:00:38 -0000      1.6
+++ xmlactiviteiten.jsp 22 Apr 2008 11:26:41 -0000      1.7
@@ -21,7 +21,11 @@
    lDateSearchTill = ((Long) 
application.getAttribute("events_till")).longValue();
 }
    
-String sChildConstraints = 
Evenement.getEventsConstraint(lDateSearchFrom,lDateSearchTill);;
+String sChildConstraints = 
Evenement.getEventsConstraint(lDateSearchFrom,lDateSearchTill);
+
+String pProvincie = request.getParameter("provincie");
+pProvincie = (pProvincie == null ? "" : 
HtmlCleaner.filterAmps(pProvincie).trim());
+boolean isProvincieMatch = false;
 
 
 %><?xml version="1.0" encoding="utf-8" ?>
@@ -75,14 +79,28 @@
                if(omschrijving!=null) { %><%= 
HtmlCleaner.filterAmps(HtmlCleaner.cleanText(omschrijving,"<",">","")).trim() 
%><% } 
             %></description>
             <mm:listnodes type="evenement" 
constraints="<%=sChildConstraints%>" jspvar="thisEvent" orderby="begindatum" 
max="30" directions="UP"
-               ><item>
+               ><%               
+               String parent_number = 
Evenement.findParentNumber(thisEvent.getStringValue("number"));
+               %><mm:node number="<%= parent_number %>"
+               ><mm:related path="related,natuurgebieden,pos4rel,provincies"
+                ><mm:field name="provincies.naam" jspvar="naam" 
vartype="String" write="false"><%
+                     naam = (naam==null ? "" : 
HtmlCleaner.filterAmps(naam).trim());
+                     isProvincieMatch = false;
+                     if (pProvincie.toLowerCase().equals(naam.toLowerCase())) 
isProvincieMatch = true; 
+                %></mm:field
+               ></mm:related
+               ></mm:node><%="Provincie: |" + pProvincie + "|"%><% 
+               
+               
+               
+               if ((pProvincie == "") || (isProvincieMatch)) { 
+                %><item>
                   <title><mm:field name="titel" jspvar="naam" vartype="String" 
write="false"
                             ><%= (naam==null ? "" : 
HtmlCleaner.filterAmps(naam).trim()) 
                          %></mm:field
                   ></title>
                   <link>http://<%= request.getServerName() 
%>/<%=sPageTemplateURL%>?p=<%= thisPage.getStringValue("number") 
%>&amp;e=<mm:field name="number"/></link>
-                  <% String parent_number = 
Evenement.findParentNumber(thisEvent.getStringValue("number")); 
-                  %><mm:node number="<%= parent_number %>"
+                  <mm:node number="<%= parent_number %>"
                      ><description><%
                         %><mm:field name="tekst" jspvar="tekst" 
vartype="String" write="false"
                            ><%= (tekst==null ? "" : 
HtmlCleaner.filterAmps(HtmlCleaner.cleanText(tekst,"<",">","")).trim()) 
@@ -176,8 +194,8 @@
                         <einddatum><mm:field name="einddatum" jspvar="datum" 
vartype="String" write="false"><mm:time time="<%=datum%>" format="<%= 
DATA_FORMAT %>"/></mm:field></einddatum>
                      </activiteitdatum>
                   </activiteitdata>
-               </item>
-            </mm:listnodes
+               </item><% } 
+           %></mm:listnodes
          ></mm:node
       ></channel>
    </mm:list
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs