[Formed-commits] r366 - in trunk: . formed/formed/plugins/export

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-11 15:59:02 +0200 (Fri, 11 Jun 2010)
New Revision: 366

Modified:
   trunk/ChangeLog
   trunk/formed/formed/plugins/export/rg_sql.py
Log:
* formed/formed/plugins/export/rg_sql.py
(CREATE_DELETE_MASTER_TMPL): In create_master_tbl, call
create_master_ds to create the master tbl entry.  This way we can
add SQL code that's specific to an MPuls instance to
create_master_ds and still have create_master_tbl use that new
code.  This is useful for e.g. the JMD-Struktur part.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-02 10:06:25 UTC (rev 365)
+++ trunk/ChangeLog	2010-06-11 13:59:02 UTC (rev 366)
@@ -1,3 +1,12 @@
+2010-06-11  Bernhard Herzog  <bh at intevation.de>
+
+	* formed/formed/plugins/export/rg_sql.py
+	(CREATE_DELETE_MASTER_TMPL): In create_master_tbl, call
+	create_master_ds to create the master tbl entry.  This way we can
+	add SQL code that's specific to an MPuls instance to
+	create_master_ds and still have create_master_tbl use that new
+	code.  This is useful for e.g. the JMD-Struktur part.
+
 2010-06-02	Roland Geider <roland.geider at intevation.de>
 
 	* formed/plugins/export/xls.py: updated regular expression

Modified: trunk/formed/formed/plugins/export/rg_sql.py
===================================================================
--- trunk/formed/formed/plugins/export/rg_sql.py	2010-06-02 10:06:25 UTC (rev 365)
+++ trunk/formed/formed/plugins/export/rg_sql.py	2010-06-11 13:59:02 UTC (rev 366)
@@ -237,24 +237,11 @@
     standin integer;
     rid     integer;
 BEGIN
-    INSERT INTO master_tbl (bearbeiter_id) VALUES (getuserid());
-    SELECT INTO standin vertreter from ka_benutzer_tbl WHERE id = getuserid();
-
-    SELECT INTO rid currval('master_tbl_id_seq');
-
-    IF standin IS NOT NULL THEN
-        INSERT INTO nm_benutzer_master_tbl(benutzer_id, master_id) VALUES (standin, rid);
-    END IF;
-
-    IF nuuid IS NOT NULL THEN
-        UPDATE master_tbl SET uuid_id = nuuid WHERE id = rid;
-    ELSE
-        PERFORM set_uuid('master_tbl', rid);
+    rid := create_master_ds(nuuid);
+    IF nuuid IS NULL THEN
         ${CREATE_CHILDREN}
     END IF;
 
-    PERFORM create_status_ds(rid);
-
     RETURN rid;
 END;
 $$$$;