Skip to content

Commit 589ad76

Browse files
dtheilerdtheiler
committed
* removing changes dedicated to b&p deployment on demo server (mysql 5 and java7)
1 parent c6b1ab8 commit 589ad76

File tree

6 files changed

+202
-182
lines changed

6 files changed

+202
-182
lines changed

‎serv/ss-datatypes/ss-entity/ss-entity-impl/src/main/java/at/kc/tugraz/ss/serv/datatypes/entity/impl/SSEntityImpl.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,7 @@ public List<SSEntity> entitiesForLabelsAndDescriptionsGet(final SSServPar parA)
803803
try{
804804
final SSEntitiesForLabelsAndDescriptionsGetPar par = new SSEntitiesForLabelsAndDescriptionsGetPar(parA);
805805

806-
return new ArrayList<>();
807-
// return sqlFct.getEntitiesForLabelsAndDescriptions(SSStrU.distinctWithoutEmptyAndNull(par.keywords));
806+
return sqlFct.getEntitiesForLabelsAndDescriptions(SSStrU.distinctWithoutEmptyAndNull(par.keywords));
808807
}catch(Exception error){
809808
SSServErrReg.regErrThrow(error);
810809
return null;
@@ -817,8 +816,7 @@ public List<SSEntity> entitiesForLabelsGet(final SSServPar parA) throws Exceptio
817816
try{
818817
final SSEntitiesForLabelsGetPar par = new SSEntitiesForLabelsGetPar(parA);
819818

820-
return new ArrayList<>();
821-
// return sqlFct.getEntitiesForLabels(SSStrU.distinctWithoutEmptyAndNull(par.keywords));
819+
return sqlFct.getEntitiesForLabels(SSStrU.distinctWithoutEmptyAndNull(par.keywords));
822820
}catch(Exception error){
823821
SSServErrReg.regErrThrow(error);
824822
return null;
@@ -831,8 +829,7 @@ public List<SSEntity> entitiesForDescriptionsGet(final SSServPar parA) throws Ex
831829
try{
832830
final SSEntitiesForDescriptionsGetPar par = new SSEntitiesForDescriptionsGetPar(parA);
833831

834-
return new ArrayList<>();
835-
// return sqlFct.getEntitiesForDescriptions(SSStrU.distinctWithoutEmptyAndNull(par.keywords));
832+
return sqlFct.getEntitiesForDescriptions(SSStrU.distinctWithoutEmptyAndNull(par.keywords));
836833
}catch(Exception error){
837834
SSServErrReg.regErrThrow(error);
838835
return null;

‎serv/ss-datatypes/ss-entity/ss-entity-impl/src/main/java/at/kc/tugraz/ss/serv/datatypes/entity/impl/fct/sql/SSEntitySQLFct.java‎

Lines changed: 127 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -854,135 +854,135 @@ private SSUri getCirclePublicURI() throws Exception{
854854
}
855855
}
856856

857-
// public List<SSEntity> getEntitiesForLabelsAndDescriptions(
858-
// final List<String> keywords) throws Exception{
859-
//
860-
// ResultSet resultSet = null;
861-
//
862-
// try{
863-
// final List<SSEntity> entities = new ArrayList<>();
864-
// final List<String> columns = new ArrayList<>();
865-
// final List<String> matches = new ArrayList<>();
866-
// final List<String> againsts = new ArrayList<>();
867-
//
868-
// column (columns, SSSQLVarU.id);
869-
// column (columns, SSSQLVarU.label);
870-
// column (columns, SSSQLVarU.description);
871-
// column (columns, SSSQLVarU.type);
872-
// match (matches, SSSQLVarU.label);
873-
// match (matches, SSSQLVarU.description);
874-
//
875-
// againsts.addAll(keywords);
876-
//
877-
// resultSet = dbSQL.select(entityTable, columns, matches, againsts);
878-
//
879-
// while(resultSet.next()){
880-
//
881-
// entities.add(
882-
// SSEntity.get(
883-
// bindingStrToUri (resultSet, SSSQLVarU.id),
884-
// bindingStrToLabel (resultSet, SSSQLVarU.label),
885-
// null,
886-
// bindingStrToEntityType (resultSet, SSSQLVarU.type),
887-
// null,
888-
// SSTextComment.get (bindingStr(resultSet, SSSQLVarU.description))));
889-
// }
890-
//
891-
// return entities;
892-
//
893-
// }catch(Exception error){
894-
// SSServErrReg.regErrThrow(error);
895-
// return null;
896-
// }finally{
897-
// dbSQL.closeStmt(resultSet);
898-
// }
899-
// }
857+
public List<SSEntity> getEntitiesForLabelsAndDescriptions(
858+
final List<String> keywords) throws Exception{
859+
860+
ResultSet resultSet = null;
861+
862+
try{
863+
final List<SSEntity> entities = new ArrayList<>();
864+
final List<String> columns = new ArrayList<>();
865+
final List<String> matches = new ArrayList<>();
866+
final List<String> againsts = new ArrayList<>();
867+
868+
column (columns, SSSQLVarU.id);
869+
column (columns, SSSQLVarU.label);
870+
column (columns, SSSQLVarU.description);
871+
column (columns, SSSQLVarU.type);
872+
match (matches, SSSQLVarU.label);
873+
match (matches, SSSQLVarU.description);
874+
875+
againsts.addAll(keywords);
876+
877+
resultSet = dbSQL.select(entityTable, columns, matches, againsts);
878+
879+
while(resultSet.next()){
880+
881+
entities.add(
882+
SSEntity.get(
883+
bindingStrToUri (resultSet, SSSQLVarU.id),
884+
bindingStrToLabel (resultSet, SSSQLVarU.label),
885+
null,
886+
bindingStrToEntityType (resultSet, SSSQLVarU.type),
887+
null,
888+
SSTextComment.get (bindingStr(resultSet, SSSQLVarU.description))));
889+
}
890+
891+
return entities;
892+
893+
}catch(Exception error){
894+
SSServErrReg.regErrThrow(error);
895+
return null;
896+
}finally{
897+
dbSQL.closeStmt(resultSet);
898+
}
899+
}
900900

901-
// public List<SSEntity> getEntitiesForLabels(
902-
// final List<String> keywords) throws Exception{
903-
//
904-
// ResultSet resultSet = null;
905-
//
906-
// try{
907-
// final List<SSEntity> entities = new ArrayList<>();
908-
// final List<String> columns = new ArrayList<>();
909-
// final List<String> matches = new ArrayList<>();
910-
// final List<String> againsts = new ArrayList<>();
911-
//
912-
// column (columns, SSSQLVarU.id);
913-
// column (columns, SSSQLVarU.label);
914-
// column (columns, SSSQLVarU.type);
915-
// column (columns, SSSQLVarU.description);
916-
// match (matches, SSSQLVarU.label);
917-
//
918-
// againsts.addAll(keywords);
919-
//
920-
// resultSet = dbSQL.select(entityTable, columns, matches, againsts);
921-
//
922-
// while(resultSet.next()){
923-
//
924-
// entities.add(
925-
// SSEntity.get(
926-
// bindingStrToUri (resultSet, SSSQLVarU.id),
927-
// bindingStrToLabel (resultSet, SSSQLVarU.label),
928-
// null,
929-
// bindingStrToEntityType (resultSet, SSSQLVarU.type),
930-
// null,
931-
// SSTextComment.get (bindingStr(resultSet, SSSQLVarU.description))));
932-
// }
933-
//
934-
// return entities;
935-
//
936-
// }catch(Exception error){
937-
// SSServErrReg.regErrThrow(error);
938-
// return null;
939-
// }finally{
940-
// dbSQL.closeStmt(resultSet);
941-
// }
942-
// }
901+
public List<SSEntity> getEntitiesForLabels(
902+
final List<String> keywords) throws Exception{
903+
904+
ResultSet resultSet = null;
905+
906+
try{
907+
final List<SSEntity> entities = new ArrayList<>();
908+
final List<String> columns = new ArrayList<>();
909+
final List<String> matches = new ArrayList<>();
910+
final List<String> againsts = new ArrayList<>();
911+
912+
column (columns, SSSQLVarU.id);
913+
column (columns, SSSQLVarU.label);
914+
column (columns, SSSQLVarU.type);
915+
column (columns, SSSQLVarU.description);
916+
match (matches, SSSQLVarU.label);
917+
918+
againsts.addAll(keywords);
919+
920+
resultSet = dbSQL.select(entityTable, columns, matches, againsts);
921+
922+
while(resultSet.next()){
923+
924+
entities.add(
925+
SSEntity.get(
926+
bindingStrToUri (resultSet, SSSQLVarU.id),
927+
bindingStrToLabel (resultSet, SSSQLVarU.label),
928+
null,
929+
bindingStrToEntityType (resultSet, SSSQLVarU.type),
930+
null,
931+
SSTextComment.get (bindingStr(resultSet, SSSQLVarU.description))));
932+
}
933+
934+
return entities;
935+
936+
}catch(Exception error){
937+
SSServErrReg.regErrThrow(error);
938+
return null;
939+
}finally{
940+
dbSQL.closeStmt(resultSet);
941+
}
942+
}
943943

944-
// public List<SSEntity> getEntitiesForDescriptions(
945-
// final List<String> keywords) throws Exception{
946-
//
947-
// ResultSet resultSet = null;
948-
//
949-
// try{
950-
// final List<SSEntity> entities = new ArrayList<>();
951-
// final List<String> columns = new ArrayList<>();
952-
// final List<String> matches = new ArrayList<>();
953-
// final List<String> againsts = new ArrayList<>();
954-
//
955-
// column (columns, SSSQLVarU.id);
956-
// column (columns, SSSQLVarU.label);
957-
// column (columns, SSSQLVarU.type);
958-
// column (columns, SSSQLVarU.description);
959-
// match (matches, SSSQLVarU.description);
960-
//
961-
// againsts.addAll(keywords);
962-
//
963-
// resultSet = dbSQL.select(entityTable, columns, matches, againsts);
964-
//
965-
// while(resultSet.next()){
966-
//
967-
// entities.add(
968-
// SSEntity.get(
969-
// bindingStrToUri (resultSet, SSSQLVarU.id),
970-
// bindingStrToLabel (resultSet, SSSQLVarU.label),
971-
// null,
972-
// bindingStrToEntityType (resultSet, SSSQLVarU.type),
973-
// null,
974-
// SSTextComment.get (bindingStr(resultSet, SSSQLVarU.description))));
975-
// }
976-
//
977-
// return entities;
978-
//
979-
// }catch(Exception error){
980-
// SSServErrReg.regErrThrow(error);
981-
// return null;
982-
// }finally{
983-
// dbSQL.closeStmt(resultSet);
984-
// }
985-
// }
944+
public List<SSEntity> getEntitiesForDescriptions(
945+
final List<String> keywords) throws Exception{
946+
947+
ResultSet resultSet = null;
948+
949+
try{
950+
final List<SSEntity> entities = new ArrayList<>();
951+
final List<String> columns = new ArrayList<>();
952+
final List<String> matches = new ArrayList<>();
953+
final List<String> againsts = new ArrayList<>();
954+
955+
column (columns, SSSQLVarU.id);
956+
column (columns, SSSQLVarU.label);
957+
column (columns, SSSQLVarU.type);
958+
column (columns, SSSQLVarU.description);
959+
match (matches, SSSQLVarU.description);
960+
961+
againsts.addAll(keywords);
962+
963+
resultSet = dbSQL.select(entityTable, columns, matches, againsts);
964+
965+
while(resultSet.next()){
966+
967+
entities.add(
968+
SSEntity.get(
969+
bindingStrToUri (resultSet, SSSQLVarU.id),
970+
bindingStrToLabel (resultSet, SSSQLVarU.label),
971+
null,
972+
bindingStrToEntityType (resultSet, SSSQLVarU.type),
973+
null,
974+
SSTextComment.get (bindingStr(resultSet, SSSQLVarU.description))));
975+
}
976+
977+
return entities;
978+
979+
}catch(Exception error){
980+
SSServErrReg.regErrThrow(error);
981+
return null;
982+
}finally{
983+
dbSQL.closeStmt(resultSet);
984+
}
985+
}
986986
}
987987

988988

‎serv/ss-db/ss-db-api/src/main/java/at/kc/tugraz/ss/serv/db/api/SSDBSQLI.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public ResultSet select(
4747
final List<String> columns,
4848
final Map<String, String> where) throws Exception;
4949

50-
// public ResultSet select(
51-
// final String table,
52-
// final List<String> columns,
53-
// final List<String> matches,
54-
// final List<String> againsts) throws Exception;
50+
public ResultSet select(
51+
final String table,
52+
final List<String> columns,
53+
final List<String> matches,
54+
final List<String> againsts) throws Exception;
5555

5656
public ResultSet select(
5757
final List<String> tables,

‎serv/ss-db/ss-db-impl/src/main/java/at/kc/tugraz/ss/serv/db/impl/SSDBSQLMySQLImpl.java‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -276,42 +276,42 @@ public ResultSet select(
276276
return stmt.executeQuery();
277277
}
278278

279-
// @Override
280-
// public ResultSet select(
281-
// final String table,
282-
// final List<String> columns,
283-
// final List<String> matches,
284-
// final List<String> againsts) throws Exception{
285-
//
286-
//// SELECT * FROM articles
287-
//// -> WHERE MATCH (title,body)
288-
//// -> AGAINST ('database' IN NATURAL LANGUAGE MODE);
289-
//
290-
// String query = "SELECT DISTINCT ";
291-
// PreparedStatement stmt;
292-
//
293-
// for(String certain : columns){
294-
// query += certain + SSStrU.comma + SSStrU.blank;
295-
// }
296-
//
297-
// query = SSStrU.removeTrailingString(query, SSStrU.comma + SSStrU.blank) + " FROM " + table + " WHERE MATCH (";
298-
//
299-
// for(String match : matches){
300-
// query += match + SSStrU.comma;
301-
// }
302-
//
303-
// query = SSStrU.removeTrailingString(query, SSStrU.comma) + ") AGAINST ('";
304-
//
305-
// for(String against : againsts){
306-
// query += against + "*" + SSStrU.blank;
307-
// }
308-
//
309-
// query = SSStrU.removeTrailingString(query, SSStrU.blank) + "' IN BOOLEAN MODE);";
310-
//
311-
// stmt = connector.prepareStatement(query);
312-
//
313-
// return stmt.executeQuery();
314-
// }
279+
@Override
280+
public ResultSet select(
281+
final String table,
282+
final List<String> columns,
283+
final List<String> matches,
284+
final List<String> againsts) throws Exception{
285+
286+
// SELECT * FROM articles
287+
// -> WHERE MATCH (title,body)
288+
// -> AGAINST ('database' IN NATURAL LANGUAGE MODE);
289+
290+
String query = "SELECT DISTINCT ";
291+
PreparedStatement stmt;
292+
293+
for(String certain : columns){
294+
query += certain + SSStrU.comma + SSStrU.blank;
295+
}
296+
297+
query = SSStrU.removeTrailingString(query, SSStrU.comma + SSStrU.blank) + " FROM " + table + " WHERE MATCH (";
298+
299+
for(String match : matches){
300+
query += match + SSStrU.comma;
301+
}
302+
303+
query = SSStrU.removeTrailingString(query, SSStrU.comma) + ") AGAINST ('";
304+
305+
for(String against : againsts){
306+
query += against + "*" + SSStrU.blank;
307+
}
308+
309+
query = SSStrU.removeTrailingString(query, SSStrU.blank) + "' IN BOOLEAN MODE);";
310+
311+
stmt = connector.prepareStatement(query);
312+
313+
return stmt.executeQuery();
314+
}
315315

316316
@Override
317317
public ResultSet select(

0 commit comments

Comments
 (0)