From 8c993c7555174f44439d116806e9b25621b3d9c6 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 24 Apr 2012 12:20:45 +0200
Subject: [PATCH 1/3] better ship detectionn, print if looping

---
 manifests/ships/convert.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/ships/convert.py b/manifests/ships/convert.py
index 4aa6c01..d85d148 100755
--- a/manifests/ships/convert.py
+++ b/manifests/ships/convert.py
@@ -54,9 +54,7 @@ def toHtml():
 
 def isShip(row):
   try: 
-#    if str(int(row[0])) == row[0]:
-#      return True
-    if row[0].strip().lower() == 'import' or row[0].strip().lower() == 'rexport':
+    if row[0].isdigit() or row[0].strip().lower() == 'import' or row[0].strip().lower() == 'rexport':
       return True
     else:
       return False
@@ -101,6 +99,9 @@ def csvToJSON(prefix):
             break
           currRow = rows[i]
         ships.append(thisShip)
+      else:
+        print c
+        print thisRow
     data['ships'] = ships
     d.append(data)
   outFile = prefix + "Data.json"

From 5ab1ec65a75a1e74a25c6dd1ddabd2e6ebedcc1e Mon Sep 17 00:00:00 2001
From: unknown <manifests@marlon.in>
Date: Tue, 24 Apr 2012 12:34:51 +0200
Subject: [PATCH 2/3] wsgi imports

---
 manifests/ships/views.py | 1 +
 wsgi/django.wsgi         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/ships/views.py b/manifests/ships/views.py
index 9d5f629..7dcd187 100644
--- a/manifests/ships/views.py
+++ b/manifests/ships/views.py
@@ -1,4 +1,5 @@
 # Create your views here.
+import math
 from models import *
 from django.http import HttpResponse
 from ships import models
diff --git a/wsgi/django.wsgi b/wsgi/django.wsgi
index 3c4d5be..cfc3a2d 100644
--- a/wsgi/django.wsgi
+++ b/wsgi/django.wsgi
@@ -15,7 +15,7 @@ sys.path.append(root_dir)
 sys.path.append(os.path.join(root_dir, project_module))
 
 #reload if this django.wsgi gets touched
-from oxdjango import monitor
+from ox.django import monitor
 monitor.start(interval=1.0)
 
 monitor.track(os.path.abspath(os.path.dirname(__file__)))

From 0d7aa2390d90ca969a8daf8ee1b2fc716400867d Mon Sep 17 00:00:00 2001
From: unknown <manifests@marlon.in>
Date: Sat, 28 Apr 2012 00:03:10 +0200
Subject: [PATCH 3/3] added queryviews

---
 manifests/ships/queryviews.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 manifests/ships/queryviews.py

diff --git a/manifests/ships/queryviews.py b/manifests/ships/queryviews.py
new file mode 100644
index 0000000..0a8f15b
--- /dev/null
+++ b/manifests/ships/queryviews.py
@@ -0,0 +1,12 @@
+from models import *
+from django.shortcuts import render_to_response
+from django.http import HttpResponse
+
+def uniqueShips(request):
+    ships = Ship.objects.values('ship_name', 'ship_name_trans').distinct('ship_name')
+    return render_to_response("uniqueShips.html", {'ships': ships, 'count': ships.count()}) 
+
+
+def uniquePorts(request):
+    ports = Ship.objects.order_by('port').values('port').distinct()
+    return render_to_response("uniquePorts.html", {'ports': ports, 'count': ports.count()})