bug fix for setTag from rot cluttered version

This commit is contained in:
raluca-elena 2014-08-07 15:20:58 -07:00
Родитель 54d3d7109c
Коммит d8eff7d2c4
4 изменённых файлов: 23 добавлений и 15 удалений

Просмотреть файл

@ -1,7 +1,7 @@
function app(){
console.log("in app()");
queryTags(['led1', 'led2'], function(tags, err) {
queryTags(['led1'], function(tags, err) {
console.log("APP tags are", tags);
listExistingTags(tags, setup);
});
@ -12,9 +12,9 @@ function listExistingTags(links, cb){
for (var key in links) {
if (links[key] !== undefined)
$('<a>',{
text: " " +"http://" + JSON.parse(links[key]).url,
text: " " +"http://" + links[key],
title: key,
href: "http://" + JSON.parse(links[key]).url
href: "http://" + links[key]
}).appendTo('#'+ key);
}
cb(links);

Просмотреть файл

@ -27,17 +27,17 @@ function setup() {
//test/set a new tag for raspberry-cam and use it as stream source
setTag("uuid1", "raspberry-cam", 'cam', function(data) {
console.log("just set a tag to the cam ...you should have an entry in /tmp/tags", data);
console.log("QQQQQQQQQQ AAAAAAAAAAAAA just set a tag to the cam ...you should have an entry in /tmp/tags", data);
});
/*readTag('cam', function(data, err) {
readTag('cam', function(data, err) {
if (err)
console.log("****************** I fail miserably to read url of my cam :(******************", err);
console.log("**** |o/ ****************************data is ", data);
var url = "http://" + data;
console.log("APP url for camera ------------", url);
loadImage(url);
});*/
});
var pushMe = $('<button/>',
{
text: 'ChangeState',

Просмотреть файл

@ -16,7 +16,6 @@
</script>
<div style="display: inline-flex;">
<div>
<!--nginx should be listening to 8888...let's see how this goes-->
<img id = "myPic" style="float:left;margin: 10px 10px;" src="http://10.0.0.5:8080" width="520" height="480" />
</div>
<form id="speech" class="navbar-form navbar-left" action="http://localhost:3333" method="post">

Просмотреть файл

@ -58,13 +58,15 @@ function queryTags(tags, cb) {
function readTag(tag, cb) {
var tagData = allTags[tag];
console.log("allTags is ----------", allTags);
console.log("tag data is ---------------",tagData);
if (tagData === undefined) {
cb(undefined, "ROT No such tag: " + tag + " :(");
} else if (tagData['url'] === undefined) {
} else if (tagData === undefined) {
cb(undefined, "ROT No url for tag: " + tag + " :(");
} else {
superagent
.get("http://" + tagData['url'], function (err, req) { cb(req.text, err);}) ;
.get("http://" + tagData, function (err, req) { cb(req.text, err);}) ;
}
}
@ -137,11 +139,14 @@ function getAllTags(things, cb) {
for (var tagName in tagsResp) {
//var feature = tagsResp[tagName];
console.log("tagName -------", tagName);
console.log("tagsResp[tagName]------------",tagsResp[tagName]);
if (JSON.parse(tagsResp[tagName]).url !== undefined) {
//tags[tagName] = tagsResp[tagName];
console.log("JSON.parse(tagsResp[tagName]).url-------------", JSON.parse(tagsResp[tagName]).url);
tags[tagName] = JSON.parse(tagsResp[tagName]).url;
}
if (JSON.parse(tagsResp[tagName]).val !== undefined) {
console.log("JSON.parse(tagsResp[tagName]).val------------", JSON.parse(tagsResp[tagName]).val);
//tags[tagName] = tagsResp[tagName];
tags[tagName] = JSON.parse(tagsResp[tagName]).val;
}
@ -188,24 +193,28 @@ function getFeatures(cb) {
}
function setTag(uuid, feature, tag, cb) {
console.log("----------------------SET TAG_____________________")
console.log("in setTag(uuid:", uuid, ", feature:", feature, ", tag:", tag, ")");
console.log("allFeatures[uuid]", allFeatures[uuid]);
console.log("allFeatures[uuid]*******************", JSON.parse(allFeatures[uuid])[feature]);
console.log("allFeatures[uuid]~~~~~~~~~~~~~~~~~~~~~~", JSON.parse(allFeatures[uuid])[feature]);
var data = {"url":JSON.parse(allFeatures[uuid])[feature].url, "feature":feature};
//console.log("allFeatures[uuid][feature] is-------------------------- ", allFeatures[uuid][feature]);
if (allFeatures[uuid] === undefined) {
cb("No such uuid: " + uuid + " :( in allFeatures:" + allFeatures);
} else if (JSON.parse(allFeatures[uuid])[feature] === undefined) {
cb("No such feature: " + feature + " for uuid: " + uuid + " :(");
} else if (tag in allTags) {
cb("Tag alread used: " + tag + " :(");
cb("Tag already used: " + tag + " :(");
} else {
var url = allThings[uuid].localURL + "/tags/" + tag;
console.log("in SET TAG PUT(url)***************************", url);
superagent.put(url)
.send(feature)
.end(function(res){
allTags[tag] = allFeatures[uuid][feature];
superagent.put(url)
.send(data)
.end(function(res){
allTags[tag] = JSON.parse(allFeatures[uuid])[feature].url;
console.log("AAAAAAA-------------AllTags", allTags);
console.log("TAG IS ----", tag, "allTags[tag]", allTags[tag]);
if (res.ok) {
cb();
} else {