knguyen 2005/10/10 10:44:12 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
- remove unused JahiaSearchConstant
Revision Changes Path
1.24 +17 -13
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.23&r2=1.24&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- contentpick.jsp 7 Oct 2005 13:58:14 -0000 1.23
+++ contentpick.jsp 10 Oct 2005 08:44:12 -0000 1.24
@@ -3,7 +3,6 @@
org.jahia.registries.ServicesRegistry,
java.util.HashMap" %>
<%@ page import="java.util.Enumeration" %>
-<%@ page import="org.jahia.services.search.JahiaSearchConstant" %>
<%@ page import="org.jahia.services.sites.JahiaSite" %>
<%@ page import="java.util.Date" %>
@@ -16,7 +15,7 @@
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%
/**
- * @version $Id: contentpick.jsp,v 1.23 2005/10/07 13:58:14 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.24 2005/10/10 08:44:12 knguyen Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -259,7 +258,7 @@
last publish
date
<% } else { %>
- <a
href="javascript:orderby(<%=JahiaSearchConstant.METADATA_PREFIX%>'lastpublishdate');">last
publish
+ <a
href="javascript:orderby('lastpublishdate');">last publish
date</a>
<% } %>
</th>
@@ -291,24 +290,26 @@
<tr>
<td class="text"><a
href="javascript:viewDoc('<%=url%>')" alt="<%=thisHit.getId()%> in
<%=sitekey%>"><b><%=thisHit.getTeaser()%></b></a>
</td>
- <td
class="text"><%=thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX
+ "creator")%></td>
- <td
class="text"><%=thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX
+ "lastcontributor")%></td>
+ <td
class="text"><%=thisHit.getParsedObject().getValue("creator")%></td>
+ <td
class="text"><%=thisHit.getParsedObject().getValue("lastcontributor")%></td>
<td class="text"><%=pickers%></td>
<!--td class="text">score :
<%=thisHit.getScore()%></td-->
<td class="text">
- <% if
(thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX +
"creationdate") != null
- &&
!thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX +
"creationdate").equalsIgnoreCase("")
- &&
!thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX +
"creationdate").equalsIgnoreCase("<empty>")) { %>
- <%=new
Date(Long.parseLong(thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX
+ "creationdate"))).toString()%>
+ <% if
(thisHit.getParsedObject().getValue("creationdate") != null
+ &&
!thisHit.getParsedObject().getValue("creationdate").equalsIgnoreCase("")
+ &&
!thisHit.getParsedObject().getValue("creationdate").equalsIgnoreCase("<text>")
+ &&
!thisHit.getParsedObject().getValue("creationdate").equalsIgnoreCase("<empty>"))
{ %>
+ <%=new
Date(Long.parseLong(thisHit.getParsedObject().getValue("creationdate"))).toString()%>
<% } else { %>
NA
<% } %>
</td>
<td class="text">
- <% if
(thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX +
"lastpublishingdate") != null
- &&
!thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX +
"lastpublishingdate").equalsIgnoreCase("")
- &&
!thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX +
"lastpublishingdate").equalsIgnoreCase("<empty>")) { %>
- <%=new
Date(Long.parseLong(thisHit.getParsedObject().getValue(JahiaSearchConstant.METADATA_PREFIX
+ "lastpublishingdate"))).toString()%>
+ <% if
(thisHit.getParsedObject().getValue("lastpublishingdate") != null
+ &&
!thisHit.getParsedObject().getValue("lastpublishingdate").equalsIgnoreCase("")
+ &&
!thisHit.getParsedObject().getValue("creationdate").equalsIgnoreCase("<text>")
+ &&
!thisHit.getParsedObject().getValue("lastpublishingdate").equalsIgnoreCase("<empty>"))
{ %>
+ <%=new
Date(Long.parseLong(thisHit.getParsedObject().getValue("lastpublishingdate"))).toString()%>
<% } else { %>
NA
<% } %>
@@ -353,6 +354,9 @@
</div><!-- end menu wrapper part -->
<% /**
* $Log: contentpick.jsp,v $
+ * 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
*
