added property mapping in ttl

Author: jpcik

modules/x-gsn/src/main/java/org/openiot/gsn/metadata/rdf/SensorMetadata.java

@@ -24,20 +24,19 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.net.URI;
 
 import org.openiot.gsn.metadata.LSM.LSMFieldMetaData;
 import org.openiot.gsn.metadata.LSM.LSMSensorMetaData;
 
 import com.hp.hpl.jena.n3.turtle.TurtleParseException;
+import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.NodeIterator;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.ResIterator;
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
 public class SensorMetadata {
@@ -68,6 +67,7 @@ public class SensorMetadata {
   Property dulHasLocation=ResourceFactory.createProperty(dul+"hasLocation");
   Property wgs84Lat=ResourceFactory.createProperty(wgs84+"lat");
   Property wgs84Long=ResourceFactory.createProperty(wgs84+"long");
+  Property lsmFieldName=ResourceFactory.createProperty(lsm+"fieldName");
 
 
   public void loadFromFile(String rdfFile) throws FileNotFoundException,TurtleParseException{
@@ -90,6 +90,7 @@ public void createMetadata(LSMSensorMetaData meta){
 		  Resource prop=model.createResource(f.getLsmPropertyName());
 		  model.add(sensorUri,ssnObserves,prop);
 		  model.add(prop,quUnit,f.getLsmUnit());
+		  model.add(prop,lsmFieldName,f.getGsnFieldName());
 	  }
 	  Resource location=model.createResource(sensorUri.getURI()+"_location");
 	  model.add(location,rdfType,dulPlace);
@@ -131,6 +132,13 @@ public LSMSensorMetaData fillSensorMetadata(){
 			  throw new IllegalArgumentException("The property "+prop+" has no unit");
 		  Resource unit=prop.getPropertyResourceValue(quUnit);
 		  //String column=prop.listProperties(rrColumnName).next().getObject().toString();		  
+		  NodeIterator fnames=model.listObjectsOfProperty(prop, lsmFieldName);
+		  if (!fnames.hasNext())
+			  throw new IllegalArgumentException("The property "+prop+" has no associated GSN field name");
+		  Literal fn=fnames.next().asLiteral();
+		  lsmField.setGsnFieldName(fn.getString());
+		  
+		  
 		  lsmField.setLsmPropertyName(prop.getURI());
 		  lsmField.setLsmUnit(unit.getURI());
 		  md.getFields().put(prop.getURI(), lsmField);

modules/x-gsn/src/main/java/org/openiot/gsn/vsensor/LSMExporter.java

@@ -66,15 +66,16 @@ public boolean initialize() {
         sensorName = vsensor.getName();        
 
         for (DataField df:vsensor.getOutputStructure()){
-        	logger.info("Property:"+ df.getName()+"--"+df.getProperty());
+        	/*logger.info("Property:"+ df.getName()+"--"+df.getProperty());
         	if (df.getProperty()!=null)
         	  fieldUris.put(df.getName().toUpperCase(), df.getProperty());
-        	else {
+        	else {*/
               for (LSMFieldMetaData md:metadata.getFields().values()){
+            	  logger.debug("The GSN fieldName: "+md.getGsnFieldName());
             	  if (md.getGsnFieldName().equals(df.getName()))
               		fieldUris.put(df.getName().toUpperCase(), md.getLsmPropertyName());            		  
               }        				
-        	}
+        	//}
         }
 
         String allow_nulls_str = params.get("allow-nulls");

modules/x-gsn/src/test/java/org/openiot/gsn/metadata/rdf/RdfMetadataTest.java

@@ -18,6 +18,7 @@ public static void main(String[] args){
 	   LSMFieldMetaData f=new LSMFieldMetaData();
 	   f.setLsmPropertyName("http://example.org/propTemp");
 	   f.setLsmUnit("celsius");
+	   f.setGsnFieldName("temp");
 	   meta.getFields().put("temp", f);
 
 	   sm.createMetadata(meta );

modules/x-gsn/virtual-sensors/LSM/opensense_1.ttl

@@ -45,7 +45,8 @@
                              qu:numericalValue "0.3"^^xsd:double ;
                              DUL:hasParameter phenonet:degreeCelsius .
 
-aws:air_temperature qu:unit phenonet:degreeCelsius.
+aws:air_temperature qu:unit phenonet:degreeCelsius;
+	  lsm:fieldName "noise" .
 
 <place/location1> rdf:type DUL:Place;
                   wgs84:lat 52.3;

modules/x-gsn/virtual-sensors/LSM/opensense_1.xml

@@ -7,7 +7,7 @@
             <param name="publish-to-lsm">true</param>
         </init-params>
         <output-structure>
-            <field name="temperature" type="double" property="http://purl.oclc.org/NET/ssnx/meteo/aws#air_temperature" />
+            <field name="temperature" type="double" />
             <field name="humidity" type="double" />
         </output-structure>
     </processing-class>