--- /dev/null
+++ b/.gitignore
@@ -1,1 +1,3 @@
-
+*.wav
+*.pyc
+/nbproject/private/

--- /dev/null
+++ b/nbproject/project.properties
@@ -1,1 +1,8 @@
+include.path=${php.global.include.path}
+php.version=PHP_5
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=true
+web.root=.
 

--- /dev/null
+++ b/nbproject/project.xml
@@ -1,1 +1,8 @@
-
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.php.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/php-project/1">
+            <name>scannr</name>
+        </data>
+    </configuration>
+</project>

--- a/run.bat
+++ /dev/null
@@ -1,1 +1,1 @@
-python scannr.py > output.txt
+

--- a/scannr.py
+++ b/scannr.py
@@ -11,7 +11,6 @@
 import serial
 #python -m serial.tools.miniterm -p COM20 -e -b 115200 --cr
 import psycopg2
-import csv
 import sys,os
 
 
@@ -20,9 +19,10 @@
 
 filename = "demo.wav"
 MIN_LENGTH = 90000
+nma = pynma.PyNMA( "apikey(s)", "developerkey")    
+conn = psycopg2.connect("dbname=test user=postgres")
 
-
-def worker(filename, length):
+def worker(filename):
 
     """thread worker function
     http://www.doughellmann.com/PyMOTW/threading/
@@ -34,23 +34,12 @@
     ser.write("GLG\r")   
     line = ser.readline()   # read a '\n' terminated line
     print line
-    reader = csv.reader([line])
-    for row in reader:
-        #GLG,40078,NFM,0,0,CanberraBlackMnt,AustralianCapita,SES Ops 1,1,0,NONE,NONE,NONE
-        if (row[0] != 'GLG'):
-            print "uh oh"
-        if (row[1] != ''):  
-            tgid = row[1]
-            #nma.push("scannr", "ping", filename, "http://www.google.com")
-            tgname = row[7]
-            sitename = row[5]
-            """http://initd.org/psycopg/docs/usage.html"""
-            cur = conn.cursor()
-            cur.execute("INSERT INTO recordings (filename,tgid,tgname,sitename,length) VALUES (%s, %s,%s, %s, %s)",(filename,tgid,tgname,sitename, length))
-            conn.commit()
-            cur.close()
-        else:
-            print filename+" has no TGID"
+    """nma.push(application, event, description, (opt) url,)"""
+    """http://initd.org/psycopg/docs/usage.html"""
+    #cur = conn.cursor()
+    #cur.execute("INSERT INTO test (num, data) VALUES (%s, %s)",(100, "abc'def"))
+    #conn.commit()
+    #cur.close()
 
     return
 
@@ -65,28 +54,22 @@
     if len(data) > MIN_LENGTH:
         data = snd.pack('<' + ('h'*len(data)), *data)
         path = filename
-        dispatcher.send( signal='FILE_CREATED', sender=filename, filename=filename, length=len(data))
+        dispatcher.send( signal='FILE_CREATED', sender=filename, filename=filename)
         wf = wave.open(path, 'wb')
         wf.setnchannels(1)
         wf.setsampwidth(sample_width)
         wf.setframerate(snd.RATE)
         wf.writeframes(data)
         wf.close()
-        del wf
         print("done - result "+str(len(data))+" frames written to "+path)
-    del data
 
 dispatcher.connect( filenameMaker, signal='SND_STARTED', sender=dispatcher.Any )
 dispatcher.connect( worker, signal='FILE_CREATED', sender=dispatcher.Any )
 
-print "Opening serial port..."
 ser = serial.Serial('COM20', 112500, timeout=1) 
-print "Loading notifymyandroid..."
-nma = pynma.PyNMA( "a6f50f76119eda33befe4325b4b9e1dd25eef7bad2868e4f")    
-print "Connecting database..."
-conn = psycopg2.connect("dbname=scannr user=postgres password=snmc")
-print "Scannr started."
+
+print "Scannr started..."
 while True:
-    print "ready to record again"
+    print "ready to record"
     record_to_async_file()
 ser.close()

--- a/snd.py
+++ b/snd.py
@@ -90,6 +90,7 @@
         data = stream.read(CHUNK_SIZE)
         L = unpack('<' + ('h'*(len(data)/2)), data) # little endian, signed short
         L = array('h', L)
+        LRtn.extend(L)
 
         silent = is_silent(L)
         #print silent, num_silent, L[:10]
@@ -101,8 +102,6 @@
             dispatcher.send( signal='SND_STARTED')
             snd_started = True
             print snd_started
-        if snd_started:
-            LRtn.extend(L)
         if snd_started and num_silent > MAX_SILENT:
             break
 
@@ -128,7 +127,6 @@
     wf.writeframes(data)
     wf.close()
     print("done - result written to "+path)
-    del data