4. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 18 14:41:31 2007 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

4.1 Files compared

#FileLocationLast Modified
1advsearchresult.jspC:\jahia\template_diff\500\corporate_portal_templates_v2Wed Sep 20 13:21:34 2006 UTC
2advsearchresult.jspC:\jahia\jahia5.0.3_r18924\tomcat\webapps\jahia\jsp\jahia\templates\site1\corporate_portal_templates_v2Thu Oct 18 14:16:56 2007 UTC

4.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged2277
Changed12
Inserted00
Removed00

4.3 Comparison options

WhitespaceAll differences in whitespace within lines are ignored
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersHidden in comparison detail

4.4 Active regular expressions

No regular expressions were active.

4.5 Comparison detail

1 <%-- 1 <%--
2 Copyright 2002-2006 Jahia Ltd 2 Copyright 2002-2006 Jahia Ltd
3  3 
4 Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDDL),  4 Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDDL),
5 Version 1.0 (the "License"), or (at your option) any later version; you may  5 Version 1.0 (the "License"), or (at your option) any later version; you may
6 not use this file except in compliance with the License. You should have  6 not use this file except in compliance with the License. You should have
7 received a copy of the License along with this program; if not, you may obtain  7 received a copy of the License along with this program; if not, you may obtain
8 a copy of the License at  8 a copy of the License at
9  9 
10  http://www.jahia.org/license/ 10  http://www.jahia.org/license/
11  11 
12 Unless required by applicable law or agreed to in writing, software  12 Unless required by applicable law or agreed to in writing, software
13 distributed under the License is distributed on an "AS IS" BASIS,  13 distributed under the License is distributed on an "AS IS" BASIS,
14 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  14 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15 See the License for the specific language governing permissions and  15 See the License for the specific language governing permissions and
16 limitations under the License. 16 limitations under the License.
17 --%><%@ include file="common/top_declarations.inc"%> 17 --%><%@ include file="common/top_declarations.inc"%>
18 <jesi:template> 18 <jesi:template>
19          19 
20         <%@ include file="common/top.inc"%> 20         <%@ include file="common/top.inc"%>
21  21 
22 <div class="full2"> 22 <div class="full2">
23  23 
24 <%@ page import="org.jahia.data.search.*" %> 24 <%@ page import="org.jahia.data.search.*" %>
25 <%@ page import="org.jahia.engines.search.*" %> 25 <%@ page import="org.jahia.engines.search.*" %>
26 <%@ page import="org.jahia.services.search.*" %> 26 <%@ page import="org.jahia.services.search.*" %>
27 <%@ page import="org.jahia.services.search.savedsearch.*" %> 27 <%@ page import="org.jahia.services.search.savedsearch.*" %>
28 <%@ page import="org.jahia.services.search.lucene.*" %> 28 <%@ page import="org.jahia.services.search.lucene.*" %>
29 <%@ page import="org.jahia.services.webdav.*" %> 29 <%@ page import="org.jahia.services.webdav.*" %>
30 <%@ page import="org.compassframework.core.*" %> 30 <%@ page import="org.compass .core.*" %>
31 <%@ page import="org.jahia.ajax.webdav.DAVAbstractAction"%> 31 <%@ page import="org.jahia.ajax.webdav.DAVAbstractAction"%>
32 <%@ page import="org.jahia.engines.timebasedpublishing.CalendarHandler" %> 32 <%@ page import="org.jahia.engines.timebasedpublishing.CalendarHandler" %>
33 <%@ page import="org.jahia.services.search.slide.*" %> 33 <%@ page import="org.jahia.services.search.slide.*" %>
34 <%@ page import="org.jahia.services.acl.JahiaBaseACL" %> 34 <%@ page import="org.jahia.services.acl.JahiaBaseACL" %>
35  35 
36 <jesi:fragment cache="no"> 36 <jesi:fragment cache="no">
37 <% 37 <%
38  38 
39  39 
40   String theScreen = (String)engineMap.get("screen"); 40   String theScreen = (String)engineMap.get("screen");
41  41 
42   String searchVersionId = "org.jahia.engines.search.AdvSearch.versionId.01"; 42   String searchVersionId = "org.jahia.engines.search.AdvSearch.versionId.01";
43  43 
44         // Search engine related data 44         // Search engine related data
45         JahiaSearchResult searchResults = (JahiaSearchResult) engineMap.get( "searchResults" ); 45         JahiaSearchResult searchResults = (JahiaSearchResult) engineMap.get( "searchResults" );
46  46 
47         String searchString = (String) engineMap.get ("searchString"); 47         String searchString = (String) engineMap.get ("searchString");
48         searchString = removeTags(searchString); 48         searchString = removeTags(searchString);
49  49 
50         String searchView = (String)engineMap.get("searchView"); 50         String searchView = (String)engineMap.get("searchView");
51  51 
52   List searchRefineAttributeList = (List)engineMap.get(Search_Engine.SEARCH_REFINE_ATTRIBUTE); 52   List searchRefineAttributeList = (List)engineMap.get(Search_Engine.SEARCH_REFINE_ATTRIBUTE);
53  53 
54         if ( searchView == null ){ 54         if ( searchView == null ){
55                 searchView = "simple"; 55                 searchView = "simple";
56         } 56         }
57  57 
58   String searchRefineForm = "searchForm"; 58   String searchRefineForm = "searchForm";
59   if ( "advSearch".equals(searchView) ){ 59   if ( "advSearch".equals(searchView) ){
60     searchRefineForm = "advSearchForm"; 60     searchRefineForm = "advSearchForm";
61   } 61   }
62  62 
63         SearchViewHandler searchViewHandler = (SearchViewHandler)engineMap.get(Search_Engine.SEARCH_HANDLER); 63         SearchViewHandler searchViewHandler = (SearchViewHandler)engineMap.get(Search_Engine.SEARCH_HANDLER);
64   JahiaSavedSearch savedSearch = (JahiaSavedSearch)engineMap.get(SearchOptionsHandler.SAVED_SEARCH); 64   JahiaSavedSearch savedSearch = (JahiaSavedSearch)engineMap.get(SearchOptionsHandler.SAVED_SEARCH);
65  65 
66   int totalHits = searchResults.getHitCount(); 66   int totalHits = searchResults.getHitCount();
67  67 
68         Integer maxPageItemsInt = (Integer)engineMap.get(Search_Engine.MAX_PAGE_ITEMS); 68         Integer maxPageItemsInt = (Integer)engineMap.get(Search_Engine.MAX_PAGE_ITEMS);
69         int maxPageItems = maxPageItemsInt.intValue(); 69         int maxPageItems = maxPageItemsInt.intValue();
70  70 
71   boolean oneHitPerPage = !("false".equalsIgnoreCase(request.getParameter(PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME))); 71   boolean oneHitPerPage = !("false".equalsIgnoreCase(request.getParameter(PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME)));
72   List pageHitsList = null;  72   List pageHitsList = null;
73  73 
74   List savedSearches = (List)engineMap.get(SearchOptionsHandler.SAVED_SEARCHES); 74   List savedSearches = (List)engineMap.get(SearchOptionsHandler.SAVED_SEARCHES);
75   Boolean mySavedSearchesOnly = (Boolean)engineMap.get("mySavedSearchesOnly"); 75   Boolean mySavedSearchesOnly = (Boolean)engineMap.get("mySavedSearchesOnly");
76   if ( mySavedSearchesOnly == null ){ 76   if ( mySavedSearchesOnly == null ){
77     mySavedSearchesOnly = Boolean.FALSE; 77     mySavedSearchesOnly = Boolean.FALSE;
78   } 78   }
79  79 
80 %> 80 %>
81 <% 81 <%
82         String searchUrl = jData.gui().html().drawSearchLauncher(); 82         String searchUrl = jData.gui().html().drawSearchLauncher();
83         int pos = searchUrl.indexOf("?"); 83         int pos = searchUrl.indexOf("?");
84         if ( pos != -1 ){ 84         if ( pos != -1 ){
85                 // remove the matrix 85                 // remove the matrix
86                 searchUrl = searchUrl.substring(0,pos); 86                 searchUrl = searchUrl.substring(0,pos);
87         } 87         }
88  88 
89 %> 89 %>
90 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/searchHighlighting/SearchHighlighting.js" 90 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/searchHighlighting/SearchHighlighting.js"
91     type="text/javascript"></script> 91     type="text/javascript"></script>
92 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/searchHighlighting/DwtSearchHighlightButton.js" 92 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/searchHighlighting/DwtSearchHighlightButton.js"
93     type="text/javascript"></script> 93     type="text/javascript"></script>
94 <script language="javascript" type="text/javascript"> 94 <script language="javascript" type="text/javascript">
95 <!-- 95 <!--
96  96 
97 function submitSearchForm(screen,operation) { 97 function submitSearchForm(screen,operation) {
98     document.advSearchForm.screen.value = screen; 98     document.advSearchForm.screen.value = screen;
99     if ( submitSearchForm.arguments.length>1 ){ 99     if ( submitSearchForm.arguments.length>1 ){
100         document.advSearchForm.operation.value=operation; 100         document.advSearchForm.operation.value=operation;
101     } 101     }
102     document.advSearchForm.submit(); 102     document.advSearchForm.submit();
103 } 103 }
104  104 
105 function changeSearchMode(searchMode) { 105 function changeSearchMode(searchMode) {
106     document.advSearchForm.searchMode.value=searchMode; 106     document.advSearchForm.searchMode.value=searchMode;
107     document.advSearchForm.submit(); 107     document.advSearchForm.submit();
108 } 108 }
109  109 
110  110 
111 --> 111 -->
112 </script> 112 </script>
113 <% if ( !"simple".equals(searchView) ){ 113 <% if ( !"simple".equals(searchView) ){
114     AdvSearchViewHandler advSearchViewHandler = (AdvSearchViewHandler)searchViewHandler; 114     AdvSearchViewHandler advSearchViewHandler = (AdvSearchViewHandler)searchViewHandler;
115  115 
116     searchString = advSearchViewHandler.getFreeSearch(); 116     searchString = advSearchViewHandler.getFreeSearch();
117  117 
118  118 
119         if ( JahiaWebdavBaseService.getInstance().getEnableSlideSearch() ){ %> 119         if ( JahiaWebdavBaseService.getInstance().getEnableSlideSearch() ){ %>
120 <div id="menubar"> 120 <div id="menubar">
121     <ul id="floatright_tabs"> 121     <ul id="floatright_tabs">
122         <li class="tabs_li"> 122         <li class="tabs_li">
123         <% if (searchViewHandler.isWebSiteSearch()){ %> 123         <% if (searchViewHandler.isWebSiteSearch()){ %>
124                 <span class="current"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.webSiteSearch" defaultValue="Web Site Search" /></span> 124                 <span class="current"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.webSiteSearch" defaultValue="Web Site Search" /></span>
125         <% } else { %> 125         <% } else { %>
126                 <a href="javascript:changeSearchMode(<%=SearchViewHandler.SEARCH_MODE_WEBSITE%>);"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.webSiteSearch" defaultValue="Web Site Search" /></a> 126                 <a href="javascript:changeSearchMode(<%=SearchViewHandler.SEARCH_MODE_WEBSITE%>);"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.webSiteSearch" defaultValue="Web Site Search" /></a>
127         <% } %> 127         <% } %>
128         </li> 128         </li>
129         <li class="tabs_li"> 129         <li class="tabs_li">
130         <% if (!searchViewHandler.isWebSiteSearch()){ %> 130         <% if (!searchViewHandler.isWebSiteSearch()){ %>
131                 <span class="current"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileRepositorySearch" defaultValue="File repository search" /></span> 131                 <span class="current"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileRepositorySearch" defaultValue="File repository search" /></span>
132         <% } else { %> 132         <% } else { %>
133                 <a href="javascript:changeSearchMode(<%=SearchViewHandler.SEARCH_MODE_WEBDAV%>);"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileRepositorySearch" defaultValue="File repository search" /></a> 133                 <a href="javascript:changeSearchMode(<%=SearchViewHandler.SEARCH_MODE_WEBDAV%>);"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileRepositorySearch" defaultValue="File repository search" /></a>
134         <% } %> 134         <% } %>
135         </li> 135         </li>
136                 </ul> 136                 </ul>
137 </div> 137 </div>
138 <%      } else { %> 138 <%      } else { %>
139         <br/><br/> 139         <br/><br/>
140 <%      } 140 <%      }
141     } %> 141     } %>
142 <div id="searchPanel"> 142 <div id="searchPanel">
143 <% if ("simple".equals(searchView)) { %> 143 <% if ("simple".equals(searchView)) { %>
144 <%@ include file="advsearch/simplesearch.inc"%> 144 <%@ include file="advsearch/simplesearch.inc"%>
145  145 
146 <% } else { 146 <% } else {
147  147 
148   AdvSearchViewHandler advSearchViewHandler = (AdvSearchViewHandler)searchViewHandler; 148   AdvSearchViewHandler advSearchViewHandler = (AdvSearchViewHandler)searchViewHandler;
149  149 
150 %> 150 %>
151  151 
152 <pg:pager 152 <pg:pager
153 url="<%=searchUrl%>" 153 url="<%=searchUrl%>"
154 items="<%= totalHits %>" 154 items="<%= totalHits %>"
155 maxPageItems="<%= maxPageItems %>" 155 maxPageItems="<%= maxPageItems %>"
156 maxIndexPages="<%= 10 %>" 156 maxIndexPages="<%= 10 %>"
157 isOffset="true" 157 isOffset="true"
158 export="offset,currentPageNumber=pageNumber" 158 export="offset,currentPageNumber=pageNumber"
159 scope="request"> 159 scope="request">
160  160 
161 <script language="javascript" type="text/javascript"> 161 <script language="javascript" type="text/javascript">
162 <!-- 162 <!--
163 function submitSearchPagerForm() { 163 function submitSearchPagerForm() {
164 var index = document.advSearchForm.maxPageItems.selectedIndex; 164 var index = document.advSearchForm.maxPageItems.selectedIndex;
165 if ( index != -1 ){ 165 if ( index != -1 ){
166 document.searchpager.maxPageItems.value = 166 document.searchpager.maxPageItems.value =
167 document.advSearchForm.maxPageItems.options[index].value; 167 document.advSearchForm.maxPageItems.options[index].value;
168 } 168 }
169 document.searchpager.submit(); 169 document.searchpager.submit();
170 } 170 }
171  171 
172 // override previous declaration 172 // override previous declaration
173 function checkMaxPageItems(theForm){ 173 function checkMaxPageItems(theForm){
174 if ( document.advSearchForm && document.advSearchForm.maxPageItems 174 if ( document.advSearchForm && document.advSearchForm.maxPageItems
175 && document.advSearchForm.maxPageItems.selectedIndex != -1 ){ 175 && document.advSearchForm.maxPageItems.selectedIndex != -1 ){
176 theForm.maxPageItems.value = document.advSearchForm.maxPageItems.options[document.advSearchForm.maxPageItems.selectedIndex].value; 176 theForm.maxPageItems.value = document.advSearchForm.maxPageItems.options[document.advSearchForm.maxPageItems.selectedIndex].value;
177 } 177 }
178 } 178 }
179 --> 179 -->
180 </script> 180 </script>
181 <pg:page export="pageUrl"> 181 <pg:page export="pageUrl">
182 <form name="searchpager" action='<%=pageUrl + "&screen=naviguate_result"%>' method="POST"> 182 <form name="searchpager" action='<%=pageUrl + "&screen=naviguate_result"%>' method="POST">
183         <input type="hidden" name="maxPageItems" value="<%=maxPageItems%>"> 183         <input type="hidden" name="maxPageItems" value="<%=maxPageItems%>">
184 </form> 184 </form>
185 </pg:page> 185 </pg:page>
186  186 
187 <FORM name="advSearchForm" action="<%=jData.gui().html().drawSearchLauncher()%>" method="post"> 187 <FORM name="advSearchForm" action="<%=jData.gui().html().drawSearchLauncher()%>" method="post">
188 <input type="hidden" name="search" value="<%=JahiaTools.text2html(searchString)%>" /> 188 <input type="hidden" name="search" value="<%=JahiaTools.text2html(searchString)%>" />
189 <input type="hidden" name="screen" value="execute" /> 189 <input type="hidden" name="screen" value="execute" />
190 <input type="hidden" name="operation" value="" /> 190 <input type="hidden" name="operation" value="" />
191 <input type="hidden" name="searchMode" value="<%=advSearchViewHandler.getSearchMode()%>" /> 191 <input type="hidden" name="searchMode" value="<%=advSearchViewHandler.getSearchMode()%>" />
192 <input type="hidden" name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" value="<% if (oneHitPerPage){%>true<%} else {%>false<%}%>" /> 192 <input type="hidden" name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" value="<% if (oneHitPerPage){%>true<%} else {%>false<%}%>" />
193 <input type="hidden" name="versionId" value="<%=searchVersionId%>" /> 193 <input type="hidden" name="versionId" value="<%=searchVersionId%>" />
194 <input type="hidden" name="<%=Search_Engine.SEARCH_REFINE_ATTRIBUTE%>" value="" /> 194 <input type="hidden" name="<%=Search_Engine.SEARCH_REFINE_ATTRIBUTE%>" value="" />
195  195 
196  196 
197 <TABLE cellSpacing="0" cellPadding="3" width="100%" border="0"> 197 <TABLE cellSpacing="0" cellPadding="3" width="100%" border="0">
198 <TBODY> 198 <TBODY>
199 <TR bgColor="#cccccc"> 199 <TR bgColor="#cccccc">
200     <TD> 200     <TD>
201         <TABLE cellSpacing=0 cellPadding=0 width="100%" border="0"> 201         <TABLE cellSpacing=0 cellPadding=0 width="100%" border="0">
202         <TBODY> 202         <TBODY>
203         <TR bgColor="#cccccc"> 203         <TR bgColor="#cccccc">
204             <TD> 204             <TD>
205                 <%@ include file="advsearch/searchoptions.inc"%> 205                 <%@ include file="advsearch/searchoptions.inc"%>
206             </TD> 206             </TD>
207         </TR> 207         </TR>
208         </TBODY> 208         </TBODY>
209         </TABLE> 209         </TABLE>
210     </TD> 210     </TD>
211 </TR> 211 </TR>
212 <% 212 <%
213     if ( Search_Engine.SAVE_SEARCH_SCREEN.equals(theScreen) ){ 213     if ( Search_Engine.SAVE_SEARCH_SCREEN.equals(theScreen) ){
214 %> 214 %>
215 <TR id="saveSearch" bgColor="#eeeeee"> 215 <TR id="saveSearch" bgColor="#eeeeee">
216     <TD> 216     <TD>
217         <TABLE cellSpacing=0 cellPadding=0 width="100%" border="0"> 217         <TABLE cellSpacing=0 cellPadding=0 width="100%" border="0">
218         <TBODY> 218         <TBODY>
219         <TR bgColor="#eeeeee"> 219         <TR bgColor="#eeeeee">
220             <TD> 220             <TD>
221                 <%@ include file="advsearch/savesearch.inc"%> 221                 <%@ include file="advsearch/savesearch.inc"%>
222             </TD> 222             </TD>
223         </TR> 223         </TR>
224         </TBODY> 224         </TBODY>
225         </TABLE> 225         </TABLE>
226     </TD> 226     </TD>
227 </TR> 227 </TR>
228 <% 228 <%
229     } 229     }
230     if ( !Search_Engine.SAVE_SEARCH_SCREEN.equals(theScreen) ){ 230     if ( !Search_Engine.SAVE_SEARCH_SCREEN.equals(theScreen) ){
231 %> 231 %>
232 <TR bgColor="#cbdced"> 232 <TR bgColor="#cbdced">
233     <TD> 233     <TD>
234         <TABLE cellSpacing=0 cellPadding=0 width="100%" border="0"> 234         <TABLE cellSpacing=0 cellPadding=0 width="100%" border="0">
235         <TBODY> 235         <TBODY>
236         <TR bgColor=#cbdced> 236         <TR bgColor=#cbdced>
237             <TD> 237             <TD>
238                 <%@ include file="advsearch/advsearch.inc"%> 238                 <%@ include file="advsearch/advsearch.inc"%>
239             </TD> 239             </TD>
240         </TR> 240         </TR>
241  241 
242         <% if (advSearchViewHandler.isWebSiteSearch()) { %> 242         <% if (advSearchViewHandler.isWebSiteSearch()) { %>
243             <%@ include file="advsearch/websitesearch.inc"%> 243             <%@ include file="advsearch/websitesearch.inc"%>
244         <% } else { %> 244         <% } else { %>
245             <jsp:include page="advsearch/webdavsearch.jsp" flush="true"/> 245             <jsp:include page="advsearch/webdavsearch.jsp" flush="true"/>
246         <% } %> 246         <% } %>
247         </TBODY> 247         </TBODY>
248         </TABLE> 248         </TABLE>
249     </TD> 249     </TD>
250 </TR> 250 </TR>
251 <% } %> 251 <% } %>
252 </TBODY> 252 </TBODY>
253 </TABLE> 253 </TABLE>
254  254 
255 </FORM> 255 </FORM>
256  256 
257 <%-- keep track of preference --%> 257 <%-- keep track of preference --%>
258 <pg:param name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" /> 258 <pg:param name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" />
259 <% 259 <%
260     if ( !Search_Engine.SAVE_SEARCH_SCREEN.equals(theScreen) ){ 260     if ( !Search_Engine.SAVE_SEARCH_SCREEN.equals(theScreen) ){
261 %> 261 %>
262 <% if (advSearchViewHandler.isWebSiteSearch()) { %> 262 <% if (advSearchViewHandler.isWebSiteSearch()) { %>
263 <%@ include file="advsearch/search_result_list.inc"%><br/> 263 <%@ include file="advsearch/search_result_list.inc"%><br/>
264 <% } else { %> 264 <% } else { %>
265     <%@ include file="advsearch/detailed_search_result_list.inc"%><br/> 265     <%@ include file="advsearch/detailed_search_result_list.inc"%><br/>
266 <% } %> 266 <% } %>
267  267 
268 <% } %> 268 <% } %>
269 </pg:pager> 269 </pg:pager>
270  270 
271 <% } %> 271 <% } %>
272 </div> 272 </div>
273 </div> 273 </div>
274 </jesi:fragment> 274 </jesi:fragment>
275  275 
276 <%@ include file="common/bottom.inc"%> 276 <%@ include file="common/bottom.inc"%>
277  277 
278 </jesi:template> 278 </jesi:template>

Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.