diff --git a/openbis/sourceTest/lucene/indices/.MARKER_full_index b/openbis/sourceTest/lucene/indices/.MARKER_full_index new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/_0.cfs b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/_0.cfs new file mode 100644 index 0000000000000000000000000000000000000000..70b19b2d64352b43ccb5af4d8342ca20b69e60bb Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/_0.cfs differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/segments.gen b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/segments.gen new file mode 100644 index 0000000000000000000000000000000000000000..225a55b3c336e69bb83a6d5e7d3339a5c525e7e1 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/segments.gen differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/segments_2 b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/segments_2 new file mode 100644 index 0000000000000000000000000000000000000000..d6313fd5611fec9ebc4c4307e6549826b630cf1e Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE/segments_2 differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/_0.cfs b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/_0.cfs new file mode 100644 index 0000000000000000000000000000000000000000..0753134ed9eacafaa769a46509e08b9e3c26347b Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/_0.cfs differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/segments.gen b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/segments.gen new file mode 100644 index 0000000000000000000000000000000000000000..225a55b3c336e69bb83a6d5e7d3339a5c525e7e1 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/segments.gen differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/segments_2 b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/segments_2 new file mode 100644 index 0000000000000000000000000000000000000000..29ce8dc3c490d7361889a52d8eae09b514ba9bfe Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE/segments_2 differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/_6.cfs b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/_6.cfs new file mode 100644 index 0000000000000000000000000000000000000000..e3040072201834dacead83fc214e4078deeaff24 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/_6.cfs differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/segments.gen b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/segments.gen new file mode 100644 index 0000000000000000000000000000000000000000..e76c9033a6adb8854f5974cedc48b3ffa36d7dec Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/segments.gen differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/segments_8 b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/segments_8 new file mode 100644 index 0000000000000000000000000000000000000000..7992d31372ed0454bf554095f670be3863a84035 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE/segments_8 differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_0.cfs b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_0.cfs new file mode 100644 index 0000000000000000000000000000000000000000..26729a296709cefa6d2cd0b6821c06154b06e10b Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_0.cfs differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_1.cfs b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_1.cfs new file mode 100644 index 0000000000000000000000000000000000000000..42bb1ec56609515a012dd57db3e72e02aaf1ada2 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_1.cfs differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fdt b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fdt new file mode 100644 index 0000000000000000000000000000000000000000..7d6fc081e0e11e6079082029e64c0a8af5b9c09b Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fdt differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fdx b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fdx new file mode 100644 index 0000000000000000000000000000000000000000..633c1499889c9c25ea529f3fc38137e827513bdc Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fdx differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fnm b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fnm new file mode 100644 index 0000000000000000000000000000000000000000..3f143f1ce9ec3d86d8abe0e0a5912e70a34a82ee --- /dev/null +++ b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.fnm @@ -0,0 +1,3 @@ +_hibernate_classid +identifierperm_idcode type codespace id +space coderegistrator User Idregistrator First Nameregistrator Last Nameregistrator Emailproperty $PLATE_GEOMETRYproperty DESCRIPTIONcontainer idproperty OFFSET experiment id#attachment 'sampleHistory.txt' name$attachment 'sampleHistory.txt' title*attachment 'sampleHistory.txt' description property SIZEproperty COMMENTproperty ORGANISMproperty ANY_MATERIALproperty BACTERIUM \ No newline at end of file diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.frq b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.frq new file mode 100644 index 0000000000000000000000000000000000000000..723adf0be219f29d0cbed916e4cbe834b7015021 --- /dev/null +++ b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.frq @@ -0,0 +1,130 @@ +þÿÿ0€€€`€€€—¯Í‘›¡¥©•—Ï™Ÿ£§±³µ·¹»½¿Á‹óõ÷ãåçé“Ýßáñ‰ +« !#%')+-/13579;=?ACEGIKMOQSUWY[]_acegikmoqsuwy{}ƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿ ƒ … ‡ ‰ ‹ ‘ “ • — ™ › Ÿ ¡ £ ¥ § © « ¯ ± ³ µ · ¹ » ½ ¿ Á Ã Å Ç É Ë Í Ï Ñ Ó Õ × Ù Û Ý ß á ã å ç é ë í ï ñ ó õ ÷ ù û ý ÿ +ƒ +… +‡ +ÃÅÇÉËÑÓÕ×ÙÛ‹ + + +‘ +“ +• +— +™ +› + +Ÿ +¡ +£ +¥ +§ +© +« + +¯ +± +³ +µ +· +¹ +» +½ +¿ +Á +à +Å +Ç +É +Ë +Í +Ï +Ñ +Ó +Õ +× +Ù +Û +Ý +ß +á +ã +å +ç +é +ë +í +ï +ñ +ó +õ +÷ +ù +û +ý +ÿ +ƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿ ƒ … ‡ ‰ ‹ ‘ “ • — ™ › Ÿ ¡ £ ¥ § © « ¯ ± ³ µ · ¹ » ½ ¿ Á Ã Å Ç É Ë Í Ï Ñ Ó Õ × Ù Û Ý ß á ã å ç é ë í ï ñ ó õ ÷ ù û ý ÿ ƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰ùûýëíïÁÅÓû‰Â€ÿ1Òÿÿ0‹ +ƒ€ÿ1“³¹½óõ›÷ù•—㎿ÁÃÅÇÇÉËÑÓÕ×ÙÛÝÉßáãåçéëËíïñÍóõ÷ÏùûýÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿƒ…‡‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÃÅÇÉËÍÏÑÓÕ×ÙÛÝßáã!åçéëíïñóõ÷#ùûýÿƒ…‡‰‹%‘“•—™›Ÿ'¡£¥§©«¯±³)µ·¹»½¿ÁÃÅÇ+ÉËÍÏÑÓÕ×ÙÛ-Ýßáãåçéëíï/ñóõ÷ùûýÿƒ1…‡‰‹‘“•—3™›Ÿ¡£¥§©«5¯±³µ·¹»½¿7ÁÃÅÇÉËÍÏÑÓ9Õ×ÙÛÝßáãåç;éëíïñóõ÷ùû=ýÿƒ…‡‰‹?‘“•—™›Ÿ¡£A¥§©«¯±³µ·C¹»½¿ÁÃÅÇÉËEÍÏÑÓÕ×ÙÛÝßGáãåçéëíïñóIõ÷ùûýÿƒ…‡K‰‹‘“•—™›«MŸ¡£¥§©«¯O±³µ·¹»½¿ÁÃQÅÇÉËÍÏÑÓÕ×SÙÛÝßáãåçéëUíïñóõ÷ùûýÿWƒ…‡‰‹‘“Y•—™›Ÿ¡£¥§[©«¯±³µ·¹»]½¿ÁÃÅÇÉËÍÏ_ÑÓÕ×ÙÛÝßáãaåçéëíïñóõ÷cùûýÿƒ…‡‰‹e‘“•—™›Ÿg¡£¥§©«¯±³iµ·¹»½¿ÁÃÅÇkÉËÍÏÑÓÕ×ÙÛmÝßáãåçéëíïoñóõ÷ùûýÿ ƒ q… ‡ ‰ ‹ ‘ “ • — s™ › Ÿ ¡ £ ¥ § © « u ¯ ± ³ µ · ¹ » ½ ¿ wÁ Ã Å Ç É Ë Í Ï Ñ Ó yÕ × Ù Û Ý ß á ã å ç {é ë í ï ñ ó õ ÷ ù û }ý ÿ +ƒ +… +‡ +‰ +‹ + + +‘ +“ +• +— +™ +› + +Ÿ +¡ +£ +¥ +§ +© +« + +¯ +± +³ +µ +· +ƒ¹ +» +½ +¿ +Á +à +Å +Ç +É +Ë +…Í +Ï +Ñ +Ó +Õ +× +Ù +Û +Ý +ß +‡á +ã +å +ç +é +ë +í +ï +ñ +ó +‰õ +÷ +ù +û +ý +ÿ +ƒ…‡‹‰‹‘“•—™›Ÿ¡£¥§©«¯±³µ·¹»½¿ÁÑÅÇÉËÍÏÑÓÕדÙÛÝßáãåçéë•íïñóõ÷ùûýÿ—ƒ…‡‰‹‘“™•—™›Ÿ¡£¥§›©«¯±³µ·¹» ½¿ÁÃÅÇÉËÍÏŸÑÓÕ×ÙÛÝßáã¡åçéëíïñóõ÷£ùûýÿ ƒ … ‡ ‰ ‹ ¥ ‘ “ • — ™ › Ÿ §¡ £ ¥ § © « ¯ ± ³ ©µ · ¹ » ½ ¿ Á Ã Å Ç «É Ë Í Ï Ñ Ó Õ × Ù Û Ý ß á ã å ç é ë í ï ¯ñ ó õ ÷ ù û ý ÿ ƒ±…‡‰‹‘“•—³™›Ÿ¡£¥§©«µ¯±³µ·¹»½¿·ÁÃÅÇÉËÍÏÑÓ¹Õ×ÙÛÝßáãåç»éëíïñóõ÷ùû½ýÿƒ…‡‰¿‹¯ÍÁ‘“›¡¥©•—ϙߣ§±³µ·¹»‡ƒƒ!!óõûûóýóóõýóÏõ÷÷õóÏó‘/Í÷õóÏóõÏ÷þÿÿ0€€€`€€€þÿÿ0€€€`€€€þÿÿ0€€€`€€€…þÿÿ0€€€`Ò•'û‹'‘‡ƒ£!E% !ÿÿÿ0€€`€€) \ No newline at end of file diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.prx b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.prx new file mode 100644 index 0000000000000000000000000000000000000000..9eeb4a70b4c696e9e802513078ba3fb6b2a6afe7 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.prx differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.tii b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.tii new file mode 100644 index 0000000000000000000000000000000000000000..24f593ccb4b9d55cfe95366a9ef620bb1ee73b37 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.tii differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.tis b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.tis new file mode 100644 index 0000000000000000000000000000000000000000..c295d0fe4b02b3a76e2a735cae382be3250fb2b1 Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/_2.tis differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/segments.gen b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/segments.gen new file mode 100644 index 0000000000000000000000000000000000000000..e9fa6008becd133f1cac4c5cec7f4311c6576acc Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/segments.gen differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/segments_3 b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/segments_3 new file mode 100644 index 0000000000000000000000000000000000000000..1f217ef7ba9b21980f56855006f5009158187a0f Binary files /dev/null and b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/segments_3 differ diff --git a/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/write.lock b/openbis/sourceTest/lucene/indices/ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE/write.lock new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/openbis/sourceTest/sql/postgresql/068/039=sample_properties.tsv b/openbis/sourceTest/sql/postgresql/068/039=sample_properties.tsv index be68f08c5c7e72c3d89dd137377e42214cfab170..8117ab8814d75290ac638344da9a5c2157491ef1 100644 --- a/openbis/sourceTest/sql/postgresql/068/039=sample_properties.tsv +++ b/openbis/sourceTest/sql/postgresql/068/039=sample_properties.tsv @@ -35,5 +35,6 @@ 49 1020 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N 50 1021 13 42 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 \N 43 979 13 49 \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:50:02.171+02 \N -51 1051 12 \N \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 3693 -52 1052 12 \N \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 3694 +51 1051 11 \N \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 34 +52 1051 12 \N \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 35 +53 1052 12 \N \N 2 2010-10-25 14:49:35.990096+02 2010-10-25 14:49:35.990096+02 3694 diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java index 0e6f655fbbacc3ad3eeb64a6b39e9fe3627ec027..206614d133b79ad20eba42b6af98f12f2e07c577 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java @@ -71,6 +71,35 @@ public class WellContentLoaderTest extends AbstractScreeningDAOTest List<WellContent> wellContents = WellContentLoader.load(session, businessObjectFactory, daoFactory, searchCriteria); + // the test database contains two matching wells + assertEquals(1, wellContents.size()); + for (WellContent wc : wellContents) + { + assertPropertiesPresent(wc); + } + } + + /** + * Test that the same well is not displayed twice if the search query matches two different + * materials inside the well. + */ + @Test(enabled = false) + public void testDuplicateWellsFilteredOut() + { + String[] materialCodes = new String[] + { "BACTERIUM-X", "BACTERIUM-Y" }; + String[] materialTypeCodes = + { "BACTERIUM" }; + + WellSearchCriteria searchCriteria = + new WellSearchCriteria(ExperimentSearchCriteria.createAllExperiments(), + MaterialSearchCriteria.createCodesCriteria(materialCodes, + materialTypeCodes, false)); + + Session session = createSession(getSystemPerson()); + List<WellContent> wellContents = + WellContentLoader.load(session, businessObjectFactory, daoFactory, searchCriteria); + // the test database contains two matching wells assertEquals(2, wellContents.size()); for (WellContent wc : wellContents)