From 76ec83b8690f7c77a49da2fdcff36fd1b982ff7c Mon Sep 17 00:00:00 2001 From: Stuiart Stent Date: Sun, 17 Jun 2012 20:41:29 -0400 Subject: [PATCH] added fileupload per os, sets doc id before up0load if non existant --- app/app.js | 57 ++--- app/index.html | 569 ++++++++++++++++++++++++------------------------- 2 files changed, 299 insertions(+), 327 deletions(-) diff --git a/app/app.js b/app/app.js index 4974e89..a6bb295 100644 --- a/app/app.js +++ b/app/app.js @@ -26,21 +26,17 @@ var app = require('http').createServer(function handler(request, response) { files = [], fields = []; - // var tempDirectory = "/tmp/"; + var tempDirectory = "/tmp/"; // //tempdirectory changes if the operating system is windows - // if(os.type().indexof("windows") > -1) - // { - // tempdirectory = "c:\\temp\\"; - // } - // form.uploaddir = tempdirectory; - - - - tempDirectory = "c:\\Temp\\"; - form.uploadDir = tempDirectory; - - //form.uploadDir = root + '\node'; + if(os.type().indexof("windows") > -1) + { + tempdirectory = "c:\\temp\\"; + } + form.uploaddir = tempdirectory; + + //tempDirectory = "c:\\Temp\\"; + //form.uploadDir = tempDirectory; form.on('error', function(err) { response.writeHead(200, {'content-type': 'text/plain'}); @@ -119,14 +115,6 @@ io.set("transports", ["websocket"]); io.sockets.on('connection', function(socket) { console.log('Client connected'); -// socket.on('getactivites', function(data) { -// console.log('getactivites') -// testcollection.find().toArray(function(err, result) { -// if (err) throw err; - // socket.emit('populateactivities', result); - // }); -// }); - socket.on('getactivites', function(data) { console.log('getactivites') testcollection.find().toArray(function(err, result) { @@ -147,34 +135,23 @@ io.sockets.on('connection', function(socket) { //////////////////////// socket.on('addactivity', function(data, docid) { console.log('addactivity' + docid) - //testcollection.insert(data, function(err, result) { - // if (err) throw err; - // testcollection.find().toArray(function(err, result) { - // if (err) throw err; - // socket.emit('populateactivities', result); - // }); - - if (docid == 'undefined') { - testcollection.insert(data, function(err, result) { - if (err) throw err; - testcollection.find().toArray(function(err, result) { - if (err) throw err; - socket.emit('populatactivities', result); - }); - }); - } - else { + if (docid === null) { + var document_id = new BSON.ObjectID(); + } + else { + var document_id = new BSON.ObjectID(docid); + }; var document_id = new BSON.ObjectID(docid); + console.log('inserted BSONID' + document_id); testcollection.update({_id:document_id}, data,{upsert:true} , function(err, result) { if (err) throw err; exercisecollection.find().toArray(function(err, result) { if (err) throw err; - console.log('populateexercises'); socket.emit('populateexercises', result); }); }); - }; + }); ///////////////////// diff --git a/app/index.html b/app/index.html index 843a410..94691f5 100644 --- a/app/index.html +++ b/app/index.html @@ -36,320 +36,315 @@ @@ -390,7 +385,7 @@ $('ul').on('change', '.laptype',function() {
  • - +