[Mpuls-commits] r2106 - in wasko/branches/2.0: . jmdweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-24 14:28:05 +0100 (Wed, 24 Mar 2010)
New Revision: 2106

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/model/case.py
Log:
* jmdweb/model/case.py (CaseOverview): Delete function related to xml
import exort.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-24 13:09:29 UTC (rev 2105)
+++ wasko/branches/2.0/ChangeLog	2010-03-24 13:28:05 UTC (rev 2106)
@@ -18,6 +18,8 @@
 	function get_phase_date. Removed handling of type of ending. Use
 	configuration of default selected phases.
 	* jmd.json: New configuration for JMD
+	* jmdweb/model/case.py (CaseOverview): Delete function related to xml
+	import exort.
 
 2010-03-23  Bernhard Herzog  <bh at intevation.de>
 

Modified: wasko/branches/2.0/jmdweb/model/case.py
===================================================================
--- wasko/branches/2.0/jmdweb/model/case.py	2010-03-24 13:09:29 UTC (rev 2105)
+++ wasko/branches/2.0/jmdweb/model/case.py	2010-03-24 13:28:05 UTC (rev 2106)
@@ -103,50 +103,8 @@
 
 
 class CaseBundle(MpulsCaseBundle):
+    pass
 
-    def exportAsCSV(self, case_parts=None, anonymize=False):
-        con, cur = None, None
-        f = StringIO.StringIO()
-        Writer = codecs.getwriter('latin-1')
-        out = Writer(f, errors='replace')
-        try:
-            con = db.getConnection()
-            cur = con.cursor()
-            exportAsCSV(cur, out, self.listDatasetIds(), case_parts, anonymize)
-            out.flush()
-            bytes = out.getvalue()
-            out.close()
-            return bytes
-        finally:
-            db.recycleConnection(con, cur)
-
-    def exportAsXML(self, case_parts=None, anonymize=False):
-        con, cur = None, None
-        f = StringIO.StringIO()
-        Writer = codecs.getwriter('utf-8')
-        out = Writer(f, errors='replace')
-        try:
-            con = db.getConnection()
-            cur = con.cursor(cursor_factory=psycopg2.extras.DictCursor)
-            exportAsXML(cur, out, self.listDatasetIds(), case_parts, anonymize)
-            out.flush()
-            bytes = out.getvalue()
-            out.close()
-            return bytes
-        finally:
-            db.recycleConnection(con, cur)
-
-    def exportAsXLS(self, case_parts=None, anonymize=False):
-        con, cur = None, None
-        try:
-            con = db.getConnection()
-            cur = con.cursor()
-            return exportAsXLS(cur, self.listDatasetIds(), case_parts,
-                               anonymize)
-        finally:
-            db.recycleConnection(con, cur)
-
-
 class CaseOverview(MpulsCaseOverview):
     pass