From: Sweidan Omar <TFS\sweidan.omar>
Date: Mon, 6 Dec 2021 11:12:53 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=f94e2bfc3731ed91ee920382bbbfac60675c9cf2;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32440
---

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index d3df3208..9543a6bc 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -37,10 +37,12 @@ public class ItemDAOEx {
 			resultQuery.append("WITH NUMBEREDITEM AS (");
 			Metadata orderMetadata = rp.getOrderBy();
 			if (queryObject.hasOrderInfo())
-				qf.format("SELECT ROWNUMBER() OVER (ORDER BY %1$s %2$s) AS RN, ", orderMetadata.getOrderName("i", "md"), rp.getOrderDirection().name());
+				qf.format("SELECT ROWNUMBER() OVER (ORDER BY %1$s %2$s) AS RN, ", orderMetadata.getOrderName("i", "md"),
+						rp.getOrderDirection().name());
 			else
 				resultQuery.append("SELECT ROWNUMBER() OVER () AS RN, ");
-			resultQuery.append("i.ID, i.TITLE, i.DESCRIPTION, i.ITEMTYPEID, i.HOUSEID, i.CREATED, i.ISFOLDER FROM ITEM i ");
+			resultQuery.append(
+					"i.ID, i.TITLE, i.DESCRIPTION, i.ITEMTYPEID, i.HOUSEID, i.CREATED, i.ISFOLDER FROM ITEM i ");
 			String orderTableName = orderMetadata.getTableName();
 			if (orderTableName != null)
 				qf.format("LEFT OUTER JOIN %1$s md ON (md.ID = i.ID) ", orderTableName);
@@ -48,22 +50,27 @@ public class ItemDAOEx {
 			qf.format("(SELECT ii.ID %1$s AND ii.ITEMTYPEID = %2$d))", innerQuery, csr.getItemType().getId());
 			qf.format(" SELECT * FROM NUMBEREDITEM WHERE RN BETWEEN %1$d AND %2$d", bottom, top);
 		} else {
-			resultQuery.append("SELECT i.ID, i.TITLE, i.DESCRIPTION, i.ITEMTYPEID, i.HOUSEID, i.CREATED, i.ISFOLDER FROM ITEM i ");
+			resultQuery.append(
+					"SELECT i.ID, i.TITLE, i.DESCRIPTION, i.ITEMTYPEID, i.HOUSEID, i.CREATED, i.ISFOLDER FROM ITEM i ");
 			resultQuery.append("WHERE i.ID IN ");
 			qf.format("(SELECT ii.ID %1$s) ORDER BY i.TITLE", innerQuery);
 		}
 
+		qf.close();
 		logger.trace(resultQuery.toString());
 		return resultQuery.toString();
 	}
 
-	private List<ComplexSearchResult> getResultHeaders(Connection connection, QueryObject queryObject, String innerQuery) {
+	private List<ComplexSearchResult> getResultHeaders(Connection connection, QueryObject queryObject,
+			String innerQuery) {
 		List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();
 		String typeQuery;
 		if (queryObject.getParameters() == null)
 			typeQuery = String.format("SELECT CAST(COUNT(DISTINCT(ii.ID)) AS BIGINT) %s", innerQuery);
 		else
-			typeQuery = String.format("SELECT ii.ITEMTYPEID, CAST(COUNT(DISTINCT(ii.ID)) AS BIGINT) %s GROUP BY ii.ITEMTYPEID", innerQuery);
+			typeQuery = String.format(
+					"SELECT ii.ITEMTYPEID, CAST(COUNT(DISTINCT(ii.ID)) AS BIGINT) %s GROUP BY ii.ITEMTYPEID",
+					innerQuery);
 
 		logger.trace(typeQuery.toString());
 		PreparedStatement st = null;
@@ -258,7 +265,8 @@ public class ItemDAOEx {
 		try {
 			StringBuffer sql = new StringBuffer();
 			sql.append("select * from ((");
-			sql.append("select distinct i.id,i.itemtypeid,i.houseid,i.title,i.description,i.isfolder,i.created,i.modified from item i, media m, mediafile mf");
+			sql.append(
+					"select distinct i.id,i.itemtypeid,i.houseid,i.title,i.description,i.isfolder,i.created,i.modified from item i, media m, mediafile mf");
 			sql.append(
 					" where ((CONTAINS(i.title, ?) >= 1)  OR (CONTAINS(i.description, ?) >= 1) OR (CONTAINS(i.houseId, ?) >= 1)) and m.itemid = i.id and mf.MEDIAID = m.id");
 			sql.append(")UNION(");
@@ -273,12 +281,14 @@ public class ItemDAOEx {
 			sql.append(")) order by title");
 			String query = sql.toString();
 			/*
-						query = "SELECT i.* from item i, media m, mediafile mf WHERE m.ITEMID = i.id AND mf.MEDIAID = m.ID"
-								+ " AND (" + "(CONTAINS(i.TITLE, '" + criteria + "') >= 1) OR (CONTAINS(i.DESCRIPTION, '" + criteria
-								+ "') >= 1)" + " OR (CONTAINS(m.TITLE, '" + criteria + "') >= 1) OR (CONTAINS(m.DESCRIPTION, '"
-								+ criteria + "') >= 1)" + " OR (CONTAINS(mf.HOUSEID, '" + criteria
-								+ "') >= 1)) ORDER BY i.title";
-			*/
+			 * query =
+			 * "SELECT i.* from item i, media m, mediafile mf WHERE m.ITEMID = i.id AND mf.MEDIAID = m.ID"
+			 * + " AND (" + "(CONTAINS(i.TITLE, '" + criteria +
+			 * "') >= 1) OR (CONTAINS(i.DESCRIPTION, '" + criteria + "') >= 1)" +
+			 * " OR (CONTAINS(m.TITLE, '" + criteria +
+			 * "') >= 1) OR (CONTAINS(m.DESCRIPTION, '" + criteria + "') >= 1)" +
+			 * " OR (CONTAINS(mf.HOUSEID, '" + criteria + "') >= 1)) ORDER BY i.title";
+			 */
 			// query = "SELECT * FROM ITEM ORDER BY title";
 
 			st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
@@ -299,7 +309,8 @@ public class ItemDAOEx {
 					}
 				} else {
 					if (result.getItemCount() > 0) {
-						throw new Exception("Invalid searchResult 'from' position: " + fromResult + " total records: " + result.getItemCount() + " " + query);
+						throw new Exception("Invalid searchResult 'from' position: " + fromResult + " total records: "
+								+ result.getItemCount() + " " + query);
 					}
 				}
 			} else {