Different resources or

[khaledk2]

This Pr fix issue #89.
@will-moore I has been deployed it on id-testing, could you please test it and let me know how is it going?

[will-moore]

This looks good. Tested with the sample query on issue above returns expected results:
http://idr-testing.openmicroscopy.org/search/?q=(((key:Gene+Symbol,value:ccdc190,operator:equals,resource:image),(key:Organism,value:mus+musculus,operator:equals,resource:container)))&case_sensitive=false

[khaledk2]

@will-moore Could you please test the other query?

[will-moore]

Yes - The following query now returns 15 studies as expected (which includes idr0066 with the 2 images from the images search):

{
  "resource": "image",
  "query_details": {
    "and_filters": [],
    "or_filters": [
      [
        {
          "value": "light sheet",
          "operator": "contains",
          "resource": "image"
        },
        {
          "value": "light sheet",
          "operator": "contains",
          "resource": "container"
        }
      ]
    ],
    "case_sensitive": false
  },
  "mode": "searchterms"
}

So it's looking good. I need to find an example where the images returned are not included in the studies - to check if the OR is really working....

[khaledk2]

@will-moore I think the following two queries may be used to test OR clauses for different recourses as the images are included in a separate study/studies, what do you think?

{
  "resource": "image",
  "query_details": {
    "and_filters": [],
    "or_filters": [
      [
        {
          "name": "Organism",
          "value": "schizosaccharomyces pombe",
          "operator": "equals",
          "resource": "container"
        },
        {
          "name": "Cell Line",
          "value": "nmumg",
          "operator": "equals",
          "resource": "image"
        }
      ]
    ],
    "case_sensitive": false
  },
  "mode": "searchterms"
}

{
  "resource": "image",
  "query_details": {
    "and_filters": [],
    "or_filters": [
      [
        {
          "name": "Organism",
          "value": "schizosaccharomyces pombe",
          "operator": "equals",
          "resource": "container"
        },
        {
          "name": "Cell Line",
          "value": "mouse embryonic stem cell",
          "operator": "equals",
          "resource": "image"
        }
      ]
    ],
    "case_sensitive": false
  },
  "mode": "searchterms"
}

[will-moore]

@khaledk2 those queries look good and seem to be working on idr-testing now 👍