1.1 --- a/scripts/v2/Refine.sparql	Mon Jun 18 21:44:27 2012 +0300
     1.2 +++ b/scripts/v2/Refine.sparql	Mon Jun 18 22:25:06 2012 +0300
     1.3 @@ -30,6 +30,6 @@
     1.4         noa:hasGeometry ?cGeo .
     1.5      FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
     1.6    }
     1.7 -  GROUP BY ?h ?hGeo 
     1.8 +  GROUP BY ?h ?hGeo ?conf ?sat
     1.9    HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
    1.10  }

     2.1 --- a/scripts/v2/runNoaRefinementChain.sh	Mon Jun 18 21:44:27 2012 +0300
     2.2 +++ b/scripts/v2/runNoaRefinementChain.sh	Mon Jun 18 22:25:06 2012 +0300
     2.3 @@ -1,11 +1,12 @@
     2.4  #!/bin/bash
     2.5  LOC="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
     2.6  
     2.7 -ENDPOINT="http://localhost:8080/strabonendpoint"
     2.8 -DB="explicit"
     2.9 +ENDPOINT="http://localhost:8080/endpoint"
    2.10 +DB="endpoint"
    2.11 +GRIDURL="http://kk.di.uoa.gr/grid_4.nt"
    2.12  
    2.13  #dataDir="http://localhost/noa-teleios/out_triples/"
    2.14 -dataUrl="http://kk.di.uoa.gr/out_triples/"
    2.15 +dataDir="http://kk.di.uoa.gr/out_triples/"
    2.16  name="HMSG2_IR_039_s7_070825"
    2.17  suffix=".hotspots.n3"
    2.18  
    2.19 @@ -39,10 +40,9 @@
    2.20  #printf 'LALA %s %s\n' $((tmr2-tmr1)) $(timer $tmr1)
    2.21  
    2.22  
    2.23 -deleteSeaHotspots=`cat ${LOC}/DeleteInSea.sparql | sed 's/\"/\\\"/g'`
    2.24 -refinePartialSeaHotspots=`cat ${LOC}/Refine.sparql | sed 's/\"/\\\"/g'`
    2.25 -refineTimePersistence=`cat ${LOC}/TimePersistence.sparql | sed 's/\"/\\\"/g'`
    2.26 -
    2.27 +deleteSeaHotspots=`cat ${LOC}/DeleteInSea.sparql` # | sed 's/\"/\\\"/g'`
    2.28 +refinePartialSeaHotspots=`cat ${LOC}/Refine.sparql` # | sed 's/\"/\\\"/g'`
    2.29 +refineTimePersistence=`cat ${LOC}/TimePersistence.sparql` # | sed 's/\"/\\\"/g'`
    2.30  
    2.31  # Initialize
    2.32  sudo service postgresql restart
    2.33 @@ -53,11 +53,10 @@
    2.34  echo "restarting tomcat"
    2.35  sudo service tomcat7 restart
    2.36  
    2.37 -
    2.38  echo "initializing database"
    2.39  echo "S D R TP" >>stderr.txt
    2.40  
    2.41 - ../endpoint store ${ENDPOINT} N-Triples -u http://localhost/noa-teleios/grid_4.nt 
    2.42 + ../endpoint store ${ENDPOINT} N-Triples -u ${GRIDURL}
    2.43  
    2.44  #./scripts/endpoint query ${ENDPOINT} "SELECT (COUNT(*) AS ?C) WHERE {?s ?p ?o}" 
    2.45  #sudo -u postgres psql -d endpoint -c 'CREATE INDEX datetime_values_idx_value ON datetime_values USING btree(value)';