Merge lp:~graeme-acm/sahana-eden/RMS into lp:sahana-eden

[Graeme Foster]

Moved all of the import matplotlib library code into a try except as a final throw of the dice to see if I can get the code to work on the server

Updated the prepopulate data to link survey response to known locations to allow for mapping plus some tweaks to the survey responses so that meaningful pie charts can be drawn.

Fixed a bug with the YNDAnalysisWidget and the drawing of a pie chart

=== modified file 'modules/s3/s3survey.py'
--- modules/s3/s3survey.py	2011-09-23 16:27:03 +0000
+++ modules/s3/s3survey.py	2011-09-24 09:04:25 +0000
@@ -42,11 +42,7 @@
 
 try:
     import matplotlib
-    MatPlotImported = True
-except:
-    print >> sys.stderr, "S3 Debug: S3Survey: matplotlib Library not installed"
-    MatPlotImported = False
-if MatPlotImported:
+    # need to set up the back end before importing pyplot
     try:
         if matplotlib.backends.backend == "agg":
             pass
@@ -54,6 +50,8 @@
         matplotlib.use('Agg')
     import matplotlib.pyplot as plt
     from pylab import savefig
+except:
+    print >> sys.stderr, "S3 Debug: S3Survey: matplotlib Library not installed"
 
 try:
     from cStringIO import StringIO    # Faster, where available
@@ -62,7 +60,7 @@
 
 def survey_hist(response, data, bins, min, max):
     try:
-        # Create a figure for the histogram to be drawn to
+        # Create a figure for the chart to be drawn to
         fig = plt.figure()
         ax = fig.add_subplot(111)
     except:
@@ -78,7 +76,7 @@
 
 def survey_pie(response, data, label):
     try:
-        # Create a figure for the histogram to be drawn to
+        # Create a figure for the chart to be drawn to
         fig = plt.figure()
         ax = fig.add_subplot(111)
     except:
@@ -805,6 +803,12 @@
             return None
         if len(current.request.args) == 1:
             seriesID = current.request.args[0]
+        else:
+            try:
+                vars = current.request.vars["viewing"].split(".")
+                seriesID = vars[1]
+            except:
+                return None
         src = URL(r=current.request,
                   f="completed_chart",
                   vars={"question_id":self.question_id,
@@ -1032,27 +1036,32 @@
         return self.format()
 
     def basicResults(self):
+        S3OptionAnalysis.basicResults(self)
         T = current.T
-        self.cnt = 0
-        self.yes = 0
-        self.no = 0
-        self.dk = 0
-        for answer in self.valueList:
-            self.cnt += 1
-            if answer == "Yes":
-                self.yes += 1
-            elif answer == "No":
-                self.no += 1
-            else:
-                self.dk += 1
-        if self.cnt == 0:
-            self.yesp = T("Invalid")
-            self.nop = T("Invalid")
-            self.dkp = T("Invalid")
-        else:
-            self.yesp = "%s%%" %((100 * self.yes) / self.cnt)
-            self.nop = "%s%%" %((100 * self.no) / self.cnt)
-            self.dkp = "%s%%" %((100 * self.dk) / self.cnt)
+        if "Yes" in self.listp:
+            self.yesp = self.listp["Yes"]
+        else:
+            if self.cnt == 0:
+                self.yesp = T("Invalid")
+            else:
+                self.list["Yes"] = 0
+                self.yesp = T("0%")
+        if "No" in self.listp:
+            self.nop = self.listp["No"]
+        else:
+            if self.cnt == 0:
+                self.nop = T("Invalid")
+            else:
+                self.list["No"] = 0
+                self.nop = T("0%")
+        if "Don't Know" in self.listp:
+            self.dkp = self.listp["Don't Know"]
+        else:
+            if self.cnt == 0:
+                self.dkp = T("Invalid")
+            else:
+                self.list["Don't Know"] = 0
+                self.dkp = T("0%")
 
 class S3LocationAnalysis(S3AbstractAnalysis):
 
@@ -1088,11 +1097,10 @@
                 self.locationList[answer] += 1
             # Get the location detail from database
             else:
+                self.locationList[answer] = 1
                 locTable = current.db.gis_location
                 query = (locTable.name == answer)
                 records = current.db(query).select()
-                if len(records) == 0:
-                    self.locationList[answer] = 1
                 if len(records) > 1:
                     self.duplicates[answer] = records
                 if len(records) == 1:

=== modified file 'private/prepopulate/demo/ADAT/24H_response.csv'
--- private/prepopulate/demo/ADAT/24H_response.csv	2011-09-21 01:40:54 +0000
+++ private/prepopulate/demo/ADAT/24H_response.csv	2011-09-24 09:04:25 +0000
@@ -1,82 +1,82 @@
 "Template","Series","24H-BI-1","24H-BI-2","24H-BI-3","24H-BI-4","24H-BI-5","24H-BI-6","24H-BI-7","24H-BI-8","24H-BI-9","24H-BI-10","24H-BI-11","24H-BI-12","24H-BI-13","24H-H-1","24H-H-2","24H-H-3","24H-H-4","24H-H-5","24H-H-6","24H-H-7","24H-I-1","24H-I-10","24H-I-11","24H-I-12","24H-I-13","24H-I-14","24H-I-15","24H-I-2","24H-I-3","24H-I-4","24H-I-5","24H-I-6","24H-I-7","24H-I-8","24H-I-9","24H-L-1","24H-L-2","24H-L-3","24H-L-4","24H-L-5","24H-L-6","24H-L-7","24H-Re-1","24H-Re-2","24H-Re-3","24H-Re-4","24H-Re-5","24H-Ri-1","24H-Ri-2","24H-Ri-3","24H-Ri-4","24H-S-1","24H-S-2","24H-S-3","24H-S-4","24H-S-5","24H-S-6","24H-S-7","24H-S-8","24H-S-9"
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Nembadi",110,,,,,,,"nil",,50,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,2,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Sariri",40,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,5,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ginei",50,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,4,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ungoda",30,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Gora",80,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bareji",100,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Pongani",250,,,,,,,,,2352,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,55,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Songade",120,,,,,,,"nil",,119,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,16,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Emo",340,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,34,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bandari",150,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Beama",680,,,,,,,,,833,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kopure",390,,,,,,,,,412,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,23,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Eroro",60,,,,,,,,,1078,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,6,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Dombada",560,,,,,,,,,499,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,1,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Embogo",600,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Embi",210,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Barisari",800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Siremi",340,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,"some",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Buna",660,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,"some",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Sanananda",540,,,,,,,,,600,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Garara",110,,,,,,,,,136,,,,,,,,,,,,,,,,,,,,50,,,,,,,,,,,,,,,,,,28,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Killerton",340,,,,,,,,,301,,,,,,,,,,,,,,,,,,,,100,,,,,,,,,,,,,,,,,,"nil",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bagou",220,,,,,,,,,227,,,,,,,,,,,,,,,,,,,,149,,,,,,,,,,,,,,,,,,"nil",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bepore*",190,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kurou",340,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bakubari",450,,,,,,,"nil","nil",,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Fufuda",280,,,,,,,"nil","nil",,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Batari",180,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Katuna & Kome",570,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kurereda",370,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ope",70,,,,,,,,,357,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Beanga",190,,,,,,,,,401,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Mora",160,,,,,,,,,367,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ambasi",220,,,,,,,,,723,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kainde",380,,,,,,,,,684,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bindari",190,,,,,,,,,835,,,,,,,,,,,,,,,,,,,,"all",,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17459,"Kewansasap",340,,,,,,,,,290,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,58,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17460,"Reaga",150,,,,,,,,,0,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17461,"Gegerawa",270,,,,,,,,,190,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17462,"Airara",250,,,,,,,,,0,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17463,"Sinapa",150,,,,,,,,,30,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17464,"Marua",70,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17465,"Uiaku",610,,,,,,,,,0,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17466,"Ganjiga",380,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17467,"Yuayu",210,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17468,"Komabun",130,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17469,"Oreresan",120,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17470,"Rainu",90,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17471,"Wanigela (Sarad Miss/Stn)",440,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17472,"Waiug",180,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17473,"Fofo",110,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17474,"Inaram",90,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17475,"Tekwakwan",60,,,,,,,,,,,,,"Air,boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17476,"Utan",240,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17477,"Koreaf",160,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17478,"Naukwate",310,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17479,"Ajoa",450,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17480,"Marakof",140,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17481,"Uwe",240,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17482,"Orotoaba",200,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17483,"Sinei",100,,,,,,,,,,,,,"Air,boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17484,"Tumari",230,,,,,,,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17485,"Fofoma",60,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17486,"Berebona",280,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17487,"Founa",140,,,,,,,,,75,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17488,"Ilamaroro",30,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17489,"Ako",260,,,,,,,,,115,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17490,"Gobe",210,,,,,,,,,30,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17491,"Bendorode",100,,,,,,,"nil",,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17492,"Foru 1",240,,,,,,,"nil",,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"some",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17493,"Foru 2",200,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"some",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17494,"Sebaga",180,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17495,"Badaide",70,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17496,"Karaisa",260,,,,,,,"nil",,,,,,"boat ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17497,"Moiavi",90,,,,,,,"nil",,,,,,"sea",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17498,"Momoiogo",160,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17499,"Kinjaki",200,,,,,,,,,,,,,"boat ,air ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,57,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17500,"Korara",100,,,,,,,,,,,,,"Boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17501,"Botewari",90,,,,,,,,,,,,,"Air",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"nil",,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17502,"Guruguru",120,,,,,,,,,,,,,"Boat",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Cape Nelson",17503,"Embesa",300,,,,,,,,,,,,,"Air, ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Nembadi",110,,,,,,,"nil",,50,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,2,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Sariri",40,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,5,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ginei",50,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,4,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ungoda",30,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Gora",80,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bareji",100,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Pongani",250,,,,,,,,,2352,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,55,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Songade",120,,,,,,,"nil",,119,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,16,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Emo",340,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,34,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bandari",150,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,2,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Beama",680,,,,,,,,,833,,,,,,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,12,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kopure",390,,,,,,,,,412,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,23,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Eroro",60,,,,,,,,,1078,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,6,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Dombada",560,,,,,,,,,499,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Rural",,,,,,,,1,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Embogo",600,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Embi",210,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Barisari",800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Siremi",340,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Rural",,,,,,,,"some",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Buna",660,,,,,,,,,800,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,"some",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Sanananda",540,,,,,,,,,600,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Garara",110,,,,,,,,,136,,,,,,,,,,,,,,,,,,,,50,,,,,,"Don't Know",,,,"Rural",,,,,,,,28,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Killerton",340,,,,,,,,,301,,,,,,,,,,,,,,,,,,,,100,,,,,,"No",,,,"Peri-Urban",,,,,,,,"nil",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bagou",220,,,,,,,,,227,,,,,,,,,,,,,,,,,,,,149,,,,,,"Don't Know",,,,"Rural",,,,,,,,"nil",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bepore*",190,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kurou",340,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bakubari",450,,,,,,,"nil","nil",,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Fufuda",280,,,,,,,"nil","nil",,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Batari",180,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Katuna & Kome",570,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kurereda",370,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Yes",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ope",70,,,,,,,,,357,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Beanga",190,,,,,,,,,401,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Mora",160,,,,,,,,,367,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Ambasi",220,,,,,,,,,723,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Kainde",380,,,,,,,,,684,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","No","Cyclone Guba",,"Oro Bay Rural",24300,"Bindari",190,,,,,,,,,835,,,,,,,,,,,,,,,,,,,,"all",,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17459,"Kewansasap",340,,,,,,,,,290,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,58,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17460,"Reaga",150,,,,,,,,,0,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,4,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17461,"Gegerawa",270,,,,,,,,,190,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,16,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17462,"Airara",250,,,,,,,,,0,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,12,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17463,"Sinapa",150,,,,,,,,,30,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,4,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17464,"Marua",70,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17465,"Uiaku",610,,,,,,,,,0,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,5,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17466,"Ganjiga",380,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,10,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17467,"Yuayu",210,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,6,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17468,"Komabun",130,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17469,"Oreresan",120,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17470,"Rainu",90,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17471,"Wanigela (Sarad Miss/Stn)",440,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,8,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17472,"Waiug",180,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Urban",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17473,"Fofo",110,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17474,"Inaram",90,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17475,"Tekwakwan",60,,,,,,,,,,,,,"Air,boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17476,"Utan",240,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17477,"Koreaf",160,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17478,"Naukwate",310,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17479,"Ajoa",450,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17480,"Marakof",140,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,2,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17481,"Uwe",240,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17482,"Orotoaba",200,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,2,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17483,"Sinei",100,,,,,,,,,,,,,"Air,boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,1,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17484,"Tumari",230,,,,,,,,,30,,,,,,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17485,"Fofoma",60,,,,,,,,,,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Urban",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17486,"Berebona",280,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,6,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17487,"Founa",140,,,,,,,,,75,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,8,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17488,"Ilamaroro",30,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,5,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17489,"Ako",260,,,,,,,,,115,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,2,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17490,"Gobe",210,,,,,,,,,30,,,,"Air, boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,3,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17491,"Bendorode",100,,,,,,,"nil",,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,3,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17492,"Foru 1",240,,,,,,,"nil",,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Peri-Urban",,,,,,,,"some",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17493,"Foru 2",200,,,,,,,"nil",,,,,,,,,,,,,,,,,,,,,,,,,,,,"No",,,,"Peri-Urban",,,,,,,,"some",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17494,"Sebaga",180,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Rural",,,,,,,,27,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17495,"Badaide",70,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,"No",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17496,"Karaisa",260,,,,,,,"nil",,,,,,"boat ",,,,,,,,,,,,,,,,,,,,,,"No",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17497,"Moiavi",90,,,,,,,"nil",,,,,,"sea",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,4,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17498,"Momoiogo",160,,,,,,,,,,,,,"boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17499,"Kinjaki",200,,,,,,,,,,,,,"boat ,air ",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,57,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17500,"Korara",100,,,,,,,,,,,,,"Boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,23,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17501,"Botewari",90,,,,,,,,,,,,,"Air",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,"nil",,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17502,"Guruguru",120,,,,,,,,,,,,,"Boat",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Rural",,,,,,,,0,,,,,
+"24 Hour B","Cyclone Guba (Oro Province)","No","Yes","Cyclone Guba",,"Cape Nelson",17503,"Embesa",300,,,,,,,,,,,,,"Air, ",,,,,,,,,,,,,,,,,,,,,,"Don't Know",,,,"Peri-Urban",,,,,,,,18,,,,,

=== added file 'private/prepopulate/demo/ADAT/surveyLocations.csv'
--- private/prepopulate/demo/ADAT/surveyLocations.csv	1970-01-01 00:00:00 +0000
+++ private/prepopulate/demo/ADAT/surveyLocations.csv	2011-09-24 09:04:25 +0000
@@ -0,0 +1,82 @@
+"name","lat","lon"
+"Airara",-9.505239,149.290127
+"Ajoa",-9.281892,149.186688
+"Ako",-9.051507,149.057227
+"Ambasi",-8.264754,148.188917
+"Badaide",-9.178933,148.700721
+"Bagou",-8.660278,148.330556
+"Bakubari",-8.55765,148.224345
+"Bandari",-8.964119,148.462017
+"Bareji",-9.156745,148.572057
+"Barisari",-8.762329,148.407896
+"Batari",-8.474931,148.130396
+"Beama",-8.8995,148.485069
+"Beanga",-8.33088,148.188925
+"Bendorode",-9.111771,148.762528
+"Bepore*",-8.619097,148.29625
+"Berebona",-8.939618,148.475069
+"Bindari",-8.222654,148.165841
+"Botewari",-9.19808,148.571868
+"Buna",-8.664529,148.39724
+"Dombada",-8.859122,148.475135
+"Embesa",-9.451136,148.761342
+"Embi",-8.851313,148.430286
+"Embogo",-8.842471,148.460374
+"Emo",-9.00038,148.52541
+"Eroro",-8.865231,148.483229
+"Fofo",-9.358192,149.17665
+"Fofoma",-9.036959,149.135462
+"Foru 1",-9.127892,148.897005
+"Foru 2",-9.136082,148.89482
+"Founa",-9.016811,149.155416
+"Fufuda",-8.547071,148.188365
+"Ganjiga",-9.448936,149.20087
+"Garara",-8.620648,148.326068
+"Gegerawa",-9.547193,149.377431
+"Ginei",-9.171149,148.599732
+"Gobe",-9.062619,149.005249
+"Gora",-9.179483,148.58767
+"Guruguru",-9.270808,148.941562
+"Ilamaroro",-9.037245,149.135754
+"Inaram",-9.341385,149.156249
+"Kainde",-8.261604,148.187406
+"Karaisa",-9.132363,148.65311
+"Katuna & Kome",-8.422828,148.219045
+"Kewansasap",-9.565215,149.415988
+"Killerton",-8.622207,148.346093
+"Kinjaki",-9.207599,148.572246
+"Komabun",-9.339967,149.180052
+"Kopure",-8.869241,148.474421
+"Korara",-9.326397,148.604856
+"Koreaf",-9.342387,149.138425
+"Kurereda",-8.46535,148.227091
+"Kurou",-8.608615,148.274957
+"Marakof",-9.248855,149.210908
+"Marua",-9.502202,149.294931
+"Moiavi",-9.21908,148.729609
+"Momoiogo",-9.2537,148.821814
+"Mora",-8.306212,148.178717
+"Naukwate",-9.333002,149.152413
+"Nembadi",-9.17103,148.589527
+"Ope",-8.32146,148.204705
+"Oreresan",-9.346881,149.178543
+"Orotoaba",-9.235537,149.167612
+"Pongani",-9.049665,148.569846
+"Rainu",-9.346897,149.178556
+"Reaga",-9.515145,149.346337
+"Sanananda",-8.640556,148.368611
+"Sariri",-9.1874,148.585322
+"Sebaga",-9.089333,148.856556
+"Sinapa",-9.498225,149.258376
+"Sinei",-9.010443,149.268507
+"Siremi",-8.732222,148.409722
+"Songade",-9.089998,148.621672
+"Tekwakwan",-9.356407,149.177621
+"Tumari",-9.014663,149.194191
+"Uiaku",-9.453516,149.20169
+"Ungoda",-9.183359,148.578677
+"Utan",-9.313429,149.124503
+"Uwe",-9.216552,149.238573
+"Waiug",-9.336199,149.171381
+"Wanigela (Sarad Miss/Stn)",-9.338111,149.156563
+"Yuayu",-9.392605,149.180659

=== modified file 'private/prepopulate/demo/ADAT/tasks.cfg'
--- private/prepopulate/demo/ADAT/tasks.cfg	2011-08-23 07:25:11 +0000
+++ private/prepopulate/demo/ADAT/tasks.cfg	2011-09-24 09:04:25 +0000
@@ -20,6 +20,8 @@
 "survey","question_metadata","questionnaire72H.csv","question_metadata.xsl"
 "survey","question_list","questionnaireMRCS.csv","question_list.xsl"
 "survey","question_metadata","questionnaireMRCS.csv","question_metadata.xsl"
+# Add the locations used in the responses to the survey
+gis,location,surveyLocations.csv,location.xsl
 # Add the completed responses to the various templates
 "survey","complete","24H_response.csv","complete.xsl"
 "survey","complete","72H_response.csv","complete.xsl"

=== added directory 'static/formats/s3csv/gis'
=== added file 'static/formats/s3csv/gis/location.xsl'
--- static/formats/s3csv/gis/location.xsl	1970-01-01 00:00:00 +0000
+++ static/formats/s3csv/gis/location.xsl	2011-09-24 09:04:25 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+    <!-- **********************************************************************
+         Organisation - CSV Import Stylesheet
+
+         2011-Jun-13 / Graeme Foster <graeme AT acm DOT org>
+
+         - use for import to gis/location resource
+         - example raw URL usage:
+           Let URLpath be the URL to Sahana Eden appliation
+           Let Resource be org/organisation/create
+           Let Type be s3csv
+           Let CSVPath be the path on the server to the CSV file to be imported
+           Let XSLPath be the path on the server to the XSL transform file
+           Then in the browser type:
+           
+           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
+           
+           You can add a third argument &ignore_errors
+         CSV fields:
+         name....................gis_location.name
+         level...................gis_location.level      (optional)
+         parent..................gis_location.parent     (optional)
+         lat.....................gis_location.lat
+         lon.....................gis_location.lon
+         elevation...............gis_location.elevation  (optional)
+
+    *********************************************************************** -->
+    <xsl:template match="/">
+        <s3xml>
+            <!-- ********************************************************** -->
+            <!-- Create each record -->
+            <xsl:for-each select="table/row">
+                <!-- Create the gis location -->
+                <resource name="gis_location">
+                    <data field="name"><xsl:value-of select="col[@field='name']"/></data>
+                    <data field="lat"><xsl:value-of select="col[@field='lat']"/></data>
+                    <data field="lon"><xsl:value-of select="col[@field='lon']"/></data>
+                    <xsl:if test="col[@field='level']!=''">
+                        <data field="level"><xsl:value-of select="col[@field='level']"/></data>
+                    </xsl:if>
+                    <xsl:if test="col[@field='parent']!=''">
+                        <data field="parent"><xsl:value-of select="col[@field='parent']"/></data>
+                    </xsl:if>
+                    <xsl:if test="col[@field='elevation']!=''">
+                        <data field="elevation"><xsl:value-of select="col[@field='elevation']"/></data>
+                    </xsl:if>
+                </resource>
+            </xsl:for-each>
+        </s3xml>
+    </xsl:template>
+</xsl:stylesheet>