Index: src/django_gheat/wlheatmap/__init__.py
===================================================================
--- src/django_gheat/wlheatmap/__init__.py	(revision 9690)
+++ src/django_gheat/wlheatmap/__init__.py	(revision 9746)
@@ -35,41 +35,2 @@
   response.write('</pre>')
   return response
-
-from django import forms
-from django.core.files.base import ContentFile
-
-def get_apperatuur_choices(item):
-  return sorted(set(Apparatuur.objects.values_list(item,item)))
-
-class MeetBestandForm(forms.Form):
-    naam = forms.ChoiceField(choices=Gebruiker.objects.values_list('naam','naam'))
-    kaart = forms.ChoiceField(choices=get_apperatuur_choices('kaart'))
-    antenne = forms.ChoiceField(choices=get_apperatuur_choices('antenne'))
-    bestand = forms.FileField()
-
-#
-# curl  -F naam=huub -F kaart=onbekend -F antenne=onbekend -F bestand=@manage.py http://localhost:8000/wlheatp/add/meetbestand/
-def add_meetbestand(request):
-  if request.method == 'POST':
-    form = MeetBestandForm(request.POST, request.FILES)
-    if form.is_valid():
-      gebruiker = Gebruiker.objects.get(naam=form.cleaned_data['naam'])
-      apparatuur, created = Apparatuur.objects.get_or_create(kaart=form.cleaned_data['kaart'],
-        antenne=form.cleaned_data['antenne'])
-      meetrondje, created = MeetRondje.objects.get_or_create(gebruiker=gebruiker,
-        datum=None,
-        naam=(form.cleaned_data['bestand']),
-        apparatuur=apparatuur)
-
-      meetbestand, created = MeetBestand.objects.get_or_create(meetrondje=meetrondje,is_imported=False)
-      if created:
-        meetbestand.bestand.save(form.cleaned_data['bestand'].name,form.cleaned_data['bestand'])
-        meetbestand.save()
-        return HttpResponse('OK')
-      else:
-        return HttpResponseServerError('ERROR File does already exists')
-    else:
-      return HttpResponseServerError('ERROR No valid input')
-  else:
-    form = MeetBestandForm()
-  return render_to_response('add_file.html', {'form': form})
Index: src/django_gheat/wlheatmap/forms.py
===================================================================
--- src/django_gheat/wlheatmap/forms.py	(revision 9746)
+++ src/django_gheat/wlheatmap/forms.py	(revision 9746)
@@ -0,0 +1,45 @@
+from django import forms
+from django.core.files.base import ContentFile
+from django.shortcuts import render_to_response
+from django.http import HttpResponse,HttpResponseServerError
+from django.conf import settings
+from gheat.models import *
+from django.db import IntegrityError
+
+def get_apperatuur_choices(item):
+  return sorted(set(Apparatuur.objects.values_list(item,item)))
+
+class MeetBestandForm(forms.Form):
+    naam = forms.ChoiceField(choices=Gebruiker.objects.values_list('naam','naam'))
+    kaart = forms.ChoiceField(choices=get_apperatuur_choices('kaart'))
+    antenne = forms.ChoiceField(choices=get_apperatuur_choices('antenne'))
+    surveyid = forms.CharField()
+    bestand = forms.FileField()
+
+#
+# curl  -F naam=huub -F kaart=onbekend -F antenne=onbekend -F bestand=@manage.py -F surveyid=kerk http://localhost:8000/wlheatp/add/meetbestand/
+def add_meetbestand(request):
+  if request.method == 'POST':
+    form = MeetBestandForm(request.POST, request.FILES)
+    if form.is_valid():
+      gebruiker = Gebruiker.objects.get(naam=form.cleaned_data['naam'])
+      apparatuur, created = Apparatuur.objects.get_or_create(kaart=form.cleaned_data['kaart'],
+        antenne=form.cleaned_data['antenne'])
+      meetrondje, created = MeetRondje.objects.get_or_create(gebruiker=gebruiker,
+        datum=None,
+        naam=(form.cleaned_data['surveyid']),
+        apparatuur=apparatuur)
+
+      meetbestand, created = MeetBestand.objects.get_or_create(meetrondje=meetrondje,is_imported=False)
+      if created:
+        meetbestand.bestand.save(form.cleaned_data['bestand'].name,form.cleaned_data['bestand'])
+        meetbestand.save()
+        return HttpResponse('OK: Attached to meetrondje %s' % meetrondje)
+      else:
+        return HttpResponseServerError('ERROR File does already exists')
+    else:
+      return HttpResponseServerError('ERROR No valid input')
+  else:
+    form = MeetBestandForm()
+  return render_to_response('add_file.html', {'form': form})
+
Index: src/django_gheat/wlheatmap/urls.py
===================================================================
--- src/django_gheat/wlheatmap/urls.py	(revision 9690)
+++ src/django_gheat/wlheatmap/urls.py	(revision 9746)
@@ -1,13 +1,6 @@
 from django.conf.urls.defaults import *
 from django.views.generic.simple import direct_to_template
-#from django.views.generic.base import TemplateView
 from django.conf import settings
 
-#class HomeView(TemplateView):
-#    template_name = 'home.html'
-#
-#urlpatterns = patterns('',
-#    ('^$', HomeView.as_view())
-#)
 
 urlpatterns = patterns('wlheatmap',
@@ -20,4 +13,4 @@
     url(r'^filters/$', 'filters.serve_filters'),
     url(r'^process/$', 'process'),
-    url(r'^add/meetbestand/$', 'add_meetbestand'),
+    url(r'^add/meetbestand/$', 'forms.add_meetbestand'),
 )
