Revize 06095907

Re #8031: Programová příručka BE
- uploadedDate ukazuje správné datum (a ukládá se do core files)

be/fulltextsearch/src/main/java/cz/zcu/kiv/aswi/fulltextsearch/IndexController.java

@@ -80 +80 @@
 
         try {
             LOG.debug("Calling SolrService and its listAllFiles method");
-            List<String> filenames = solrService.listAllFiles();
-            int id = 0;
-            for (String filename: filenames) {
-                response.add(new DocumentResponse(filename, id++, new Date()));
-            }
-
+            response = solrService.listAllFiles();
             return response;
         } catch (SolrServerException e) {
             LOG.error("SolrServerException: " + e.toString());

be/fulltextsearch/src/main/java/cz/zcu/kiv/aswi/fulltextsearch/SolrService.java

@@ -1 +1 @@
 package cz.zcu.kiv.aswi.fulltextsearch;
 
 import cz.zcu.kiv.aswi.fulltextsearch.document.*;
+import cz.zcu.kiv.aswi.fulltextsearch.model.DocumentResponse;
 import cz.zcu.kiv.aswi.fulltextsearch.model.SearchRequest;
 import cz.zcu.kiv.aswi.fulltextsearch.model.SearchResponse;
 import javaxt.io.Image;
@@ -26 +27 @@
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -51 +54 @@
     private static final String FIELD_UPLOADED_DATE = "uploadedDate";
 
     private static final float IMG_OUTPUT_QUALITY = 0.5f;
+    private static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd");
 
     private static final int DEFAULT_LINE_FIELD_COUNT = 150;
     private static final int DEFAULT_WORD_FIELD_COUNT = 30;
@@ -196 +200 @@
         solrInputDocument.addField(FIELD_IMG_FILENAME, imageFile.getOriginalFilename());
         solrInputDocument.addField(FIELD_DOC_CONTENT, xmlFile.getBytes());
         solrInputDocument.addField(FIELD_IMG_CONTENT, Base64.getEncoder().encode(imageFile.getBytes()));
+        solrInputDocument.addField(FIELD_UPLOADED_DATE, FORMAT.format(new Date()));
 
         // adding to core files
         solrClientFiles.add(solrInputDocument);
@@ -254 +259 @@
      * @throws IOException if IO problem occurs
      * @throws SolrServerException if SolrServer problem occurs
      */
-    public byte[] getImageFromFilesCore(String filename) throws IOException, SolrServerException {
+    private byte[] getImageFromFilesCore(String filename) throws IOException, SolrServerException {
         LOG.trace("SolrService method getImageFromFilesCore called");
         LOG.debug("Getting an image from Files core");
         SolrQuery solrQuery = new SolrQuery();
@@ -519 +524 @@
         }
     }
 
-    public List<String> listAllFiles() throws IOException, SolrServerException {
+    public List<DocumentResponse> listAllFiles() throws IOException, SolrServerException, ParseException {
         LOG.trace("SolrService method listAllFiles called");
         LOG.debug("Displaying ALL files in Solr");
         SolrQuery solrQuery = new SolrQuery();
         solrQuery.set("q", FIELD_DOC_FILENAME + ":*");
         SolrDocumentList docList = solrClientFiles.query(solrQuery).getResults();
-        return docList.stream().map(doc -> doc.getFieldValue(FIELD_DOC_FILENAME).toString().replaceAll(".xml", "")).collect(Collectors.toList());
+
+        int id = 0;
+        List<DocumentResponse> responses = new LinkedList<>();
+        for (SolrDocument doc: docList) {
+            String filename = doc.getFieldValue(FIELD_DOC_FILENAME).toString().replaceAll(".xml", "");
+            String dateStr = doc.getFieldValue(FIELD_UPLOADED_DATE).toString();
+            Date date = FORMAT.parse(dateStr);
+            responses.add(new DocumentResponse(filename, id++, date));
+        }
+
+        return responses;
     }
 
     public String listSingleFile(String documentName) throws IOException, SolrServerException {