fixing bug #9725

Author: NicolasEYSSERIC

kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/control/KmeliaSessionController.java

@@ -1665,7 +1665,6 @@ public void setCurrentFolderId(String id, boolean resetSessionPublication) {
     if (!id.equals(currentFolderId)) {
       indexOfFirstPubToDisplay = 0;
       resetSelectedPublicationPKs();
-      setSearchContext(null);
       if (!KmeliaHelper.SPECIALFOLDER_TOVALIDATE.equalsIgnoreCase(id)) {
         Collection<NodeDetail> pathColl = getTopicPath(id);
         String linkedPathString = displayPath(pathColl, true, 3);
@@ -1677,6 +1676,7 @@ public void setCurrentFolderId(String id, boolean resetSessionPublication) {
     if (resetSessionPublication) {
       setSessionPublication(null);
     }
+    setSearchContext(null);
     currentFolderId = id;
   }
 

kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java

@@ -33,8 +33,6 @@
 import org.silverpeas.components.kmelia.model.KmeliaPublication;
 import org.silverpeas.components.kmelia.model.KmeliaPublicationComparator;
 import org.silverpeas.components.kmelia.model.TopicDetail;
-import org.silverpeas.components.kmelia.model.TopicSearch;
-import org.silverpeas.components.kmelia.search.KmeliaSearchServiceProvider;
 import org.silverpeas.components.kmelia.service.KmeliaHelper;
 import org.silverpeas.core.ResourceReference;
 import org.silverpeas.core.admin.component.model.ComponentInstLight;
@@ -199,8 +197,6 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
         publications = kmeliaSC.getSessionPublicationsList();
         role = SilverpeasRole.user.toString();
       } else if (searchInProgress) {
-        // Insert this new search inside persistence layer in order to compute statistics
-        saveTopicSearch(componentId, nodeId, kmeliaSC, query);
         publications = kmeliaSC.search(query);
       } else {
         publications = kmeliaSC.getSessionPublicationsList();
@@ -249,25 +245,6 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
     }
   }
 
-  /**
-   * Save current topic search inside persistence layer
-   * @param componentId the component identifier
-   * @param nodeId the node identifier
-   * @param kmeliaSC the KmeliaSessionController
-   * @param query the topic search query keywords
-   */
-  private void saveTopicSearch(String componentId, String nodeId, KmeliaSessionController kmeliaSC,
-      String query) {
-    //Check node value
-    if (!StringUtil.isDefined(nodeId)) {
-      nodeId = kmeliaSC.getCurrentFolderId();
-    }
-    TopicSearch newTS = new TopicSearch(componentId, Integer.parseInt(nodeId),
-        Integer.parseInt(kmeliaSC.getUserId()), kmeliaSC.getLanguage(), query.toLowerCase(),
-        new Date());
-    KmeliaSearchServiceProvider.getTopicSearchService().createTopicSearch(newTS);
-  }
-
   /**
    * @param allPubs
    * @param sortAllowed
@@ -345,8 +322,6 @@ private void displayPublications(List<KmeliaPublication> allPubs, boolean sortAl
           highlightClass = "highlight";
         }
 
-        out.write("<!-- Publication Body -->");
-
         if (pub.getStatus() != null && pub.isValid()) {
           if (pub.haveGotClone() && CLONE_STATUS.equals(pub.getCloneStatus()) && !user.isInRole(profile)) {
             pubColor = "blue";
@@ -467,6 +442,7 @@ private void displayPublications(List<KmeliaPublication> allPubs, boolean sortAl
         displayFragmentOfPublication(specificTemplateUsed, aPub, fragmentSettings, language,
             currentUserId, currentTopicId, kmeliaScc, resources, out);
         out.write("</div>");
+        out.write("</li>");
       }
       out.write("</ul>");