1.1 --- a/scripts/v2.2/discover.sparql	Wed Jul 18 15:41:45 2012 +0300
     1.2 +++ b/scripts/v2.2/discover.sparql	Wed Jul 18 16:34:29 2012 +0300
     1.3 @@ -1,4 +1,3 @@
     1.4 -
     1.5  PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
     1.6  PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
     1.7  PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 
     1.8 @@ -10,11 +9,11 @@
     1.9  WHERE { 
    1.10  ?h   noa:hasGeometry ?hGeo ;
    1.11       noa:hasAcquisitionTime ?hAcquisitionTime ; 
    1.12 -     noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
    1.13 -     noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
    1.14 +     noa:producedFromProcessingChain "DynamicThresholds"^^xsd:string ; 
    1.15 +     noa:isDerivedFromSensor "MSG2"^^xsd:string ;
    1.16       noa:hasConfidence ?conf ;
    1.17 -	 gag:hasMunicipality ?muni .
    1.18 -	 FILTER( "MIN_ACQUISITION_TIME"^^xsd:dateTime <= ?hAcquisitionTime && ?hAcquisitionTime < "MAX_ACQUISITION_TIME"^^xsd:dateTime ) .
    1.19 -
    1.20 -	 
    1.21 +     gag:hasMunicipality ?muni .
    1.22 +     FILTER("MIN_ACQUISITION_TIME"^^xsd:dateTime <= ?hAcquisitionTime && ?hAcquisitionTime < "MAX_ACQUISITION_TIME"^^xsd:dateTime ) .
    1.23 +     OPTIONAL {?h noa:isDiscarded ?disc }.
    1.24 +     FILTER (!bound(?disc)) .
    1.25  }