From 76969a2baf630afa88ace6e3fc6d9c71f97059bb Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Sun, 12 Apr 2015 18:53:43 +0200
Subject: [PATCH] =?UTF-8?q?-=20P=C5=99id=C3=A1n=20fulltext=20index=20na=20?=
 =?UTF-8?q?=C4=8D=C3=ADslo=20po=C5=BEadavku.=20-=20Opravena=20velikost=20p?=
 =?UTF-8?q?=C3=ADsmen=20v=20SQL=20dotazu=20pro=20=C3=BAklid=20tabulek=20s?=
 =?UTF-8?q?=20p=C5=99ilo=C5=BEen=C3=BDmi=20soubory.=20-=20Informativn?=
 =?UTF-8?q?=C3=AD=20=C4=8D=C3=ADslo=20verze=20zv=C3=BD=C5=A1eno=20na=202.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/bukova/isspst/data/RequirementBase.java    |  1 +
 .../isspst/storage/DocumentFileStorageImpl.java     | 13 ++++++-------
 src/main/webapp/app/mailForm.zul                    |  2 +-
 src/main/webapp/app/template.zhtml                  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/data/RequirementBase.java b/src/main/java/info/bukova/isspst/data/RequirementBase.java
index a10bc695..b6fc5241 100644
--- a/src/main/java/info/bukova/isspst/data/RequirementBase.java
+++ b/src/main/java/info/bukova/isspst/data/RequirementBase.java
@@ -36,6 +36,7 @@ public class RequirementBase extends BaseData implements FilterableRequirement {
 	@OrderBy("CENTRE, WORDER")
 	private List<Workflow> workflow;
 	@Column(name = "NUMSER", unique = true)
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String numser;
 	@Column(name = "REQ_DATE")
 	private Date reqDate;
diff --git a/src/main/java/info/bukova/isspst/storage/DocumentFileStorageImpl.java b/src/main/java/info/bukova/isspst/storage/DocumentFileStorageImpl.java
index 9edc1ab9..4ff84e90 100644
--- a/src/main/java/info/bukova/isspst/storage/DocumentFileStorageImpl.java
+++ b/src/main/java/info/bukova/isspst/storage/DocumentFileStorageImpl.java
@@ -5,6 +5,11 @@ import info.bukova.isspst.data.FileContent;
 import info.bukova.isspst.data.FileMetainfo;
 import info.bukova.isspst.services.fulltext.Extractor;
 import info.bukova.isspst.services.fulltext.ExtractorFactory;
+import org.apache.commons.codec.binary.Hex;
+import org.hibernate.Query;
+import org.hibernate.SQLQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -17,12 +22,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.commons.codec.binary.Hex;
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @author Pepa Rokos
  *
@@ -267,7 +266,7 @@ public class DocumentFileStorageImpl extends AbstractFileStorage<FileMetainfo> i
 			}
 		}
 
-		SQLQuery sql = queryDao.getSession().createSQLQuery("delete from file_contents where id not in(select CONTENT_ID from file_metainfo)");
+		SQLQuery sql = queryDao.getSession().createSQLQuery("delete from FILE_CONTENTS where ID not in(select CONTENT_ID from FILE_METAINFO)");
 		sql.executeUpdate();
 	}
 }
diff --git a/src/main/webapp/app/mailForm.zul b/src/main/webapp/app/mailForm.zul
index ffed7433..33ac6a6f 100644
--- a/src/main/webapp/app/mailForm.zul
+++ b/src/main/webapp/app/mailForm.zul
@@ -83,7 +83,7 @@ viewModel="@id('vm') @init('info.bukova.isspst.ui.mail.MailForm')" width="800px"
 			<vbox>
 				<ckeditor width="540px" height="250px" value="@bind(vm.message.text)" toolbar="Basic"/>
 				<hbox>
-					<button label="${labels.MailSend}" onClick="@command('send', window=mailWin)" disabled="@load(empty vm.to)" sclass="nicebutton"/> <button label="${labels.ButtonStorno}" onClick="mailWin.detach()" sclass="nicebutton"/>
+					<button label="${labels.MailSend}" onClick="@command('send', window=mailWin)" disabled="@load((empty vm.to) or (empty vm.message.subject))" sclass="nicebutton"/> <button label="${labels.ButtonStorno}" onClick="mailWin.detach()" sclass="nicebutton"/>
 				</hbox>
 			</vbox>
 		</vbox>
diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml
index 659149bf..7fa7cdbd 100644
--- a/src/main/webapp/app/template.zhtml
+++ b/src/main/webapp/app/template.zhtml
@@ -51,6 +51,6 @@
 		<div id="mainData">
 			<u:include src="${gridZul}" />
 		</div>
-		<div id="footer"> Verze 1.5 </div>
+		<div id="footer"> Verze 2.0 </div>
 	</div>
 </html>
\ No newline at end of file