[Mpuls-commits] r545 - in wasko/trunk/waskaweb: controllers lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-07-16 11:05:55 +0200 (Thu, 16 Jul 2009)
New Revision: 545

Modified:
   wasko/trunk/waskaweb/controllers/case_overview.py
   wasko/trunk/waskaweb/lib/adelexml.py
   wasko/trunk/waskaweb/lib/search.py
Log:
Removed debugging output, and changed migration evaluation (again... :()


Modified: wasko/trunk/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/trunk/waskaweb/controllers/case_overview.py	2009-07-16 08:33:39 UTC (rev 544)
+++ wasko/trunk/waskaweb/controllers/case_overview.py	2009-07-16 09:05:55 UTC (rev 545)
@@ -293,7 +293,6 @@
         validator = SearchCaseForm()
         c.form_result = {}
         c.form_errors = {}
-        print request.params
         try:
             form_result = validator.to_python(request.params)
         except formencode.Invalid, error:

Modified: wasko/trunk/waskaweb/lib/adelexml.py
===================================================================
--- wasko/trunk/waskaweb/lib/adelexml.py	2009-07-16 08:33:39 UTC (rev 544)
+++ wasko/trunk/waskaweb/lib/adelexml.py	2009-07-16 09:05:55 UTC (rev 545)
@@ -102,7 +102,7 @@
 SQL_ARBEITSLOSIGKEIT_SGBIII    = """(arbeitslosigkeit_1 = 1 and bezug_alg1 = 1)"""
 SQL_NICHTERWERBSTAETIG         = """(erwerbstaetigkeit_job = 0 and arbeitslosigkeit_1 = 0)"""
 SQL_NICHTERWERBSTAETIG_SCHULE  = """(erwerbstaetigkeit_job = 0 and arbeitslosigkeit_1 = 0 and bei_eintritt_ist_der_jugendliche = 1)"""
-SQL_MIGRATIONSHINTERGRUND      = """(nat_muspra not in (18,-1) or nat_staat not in (1,-1) or vater_land not in (29, -1) or mutter_land not in (29,-1))"""
+SQL_MIGRATIONSHINTERGRUND      = """(nat_muspra not in (18,-1,-3) or nat_staat not in (1,-1,-3) or vater_land not in (29, -1, -3) or mutter_land not in (29,-1, -3))"""
 SQL_BEHINDERUNG                = """(entw_beh = 1)"""
 SQL_SONST_BEEINTRAECHTIGUNG    = """(entw_h_1= 1 or entw_i_1= 1)"""
 SQL_OHNEABSCHLUSS              = """(schulabschluss_1 = 1)"""

Modified: wasko/trunk/waskaweb/lib/search.py
===================================================================
--- wasko/trunk/waskaweb/lib/search.py	2009-07-16 08:33:39 UTC (rev 544)
+++ wasko/trunk/waskaweb/lib/search.py	2009-07-16 09:05:55 UTC (rev 545)
@@ -272,12 +272,11 @@
 
         #Migration
         migration = "TRUE"
-        print options.get('migration')
         if options.get('migration'):
             if options.get('migration') == '1':
-                migration = "(nat_muspra not in (18,-1, -3) or nat_staat not in (1,-1,-3) or vater_land not in (1, -1, -3) or mutter_land not in (1,-1, -3))"
+                migration = "(nat_muspra not in (18,-1, -3) or nat_staat not in (1,-1,-3) or vater_land not in (29, -1, -3) or mutter_land not in (29,-1, -3))"
             elif options.get('migration') == '0':
-                migration = "(nat_muspra in (18) and nat_staat in (1) and vater_land not in (1) and mutter_land in (1))"
+                migration = "(nat_muspra = 18 and nat_staat = 1 and vater_land not = 29 and mutter_land = 29)"
             elif options.get('migration') == '2':
                 migration = "(nat_staat = 2 and (vater_staat != 2 or mutter_staat != 2))"
 
@@ -293,7 +292,6 @@
 
         fields['needle'] = " ".join(search) 
         SQL = SEARCH_CASE_SQL % (",".join([str(x) for x in allowed_states]), ee, allowed_viewer, editor, gender, time_interval, phases, branch, fkz, bad, only_cases_after, migration, sort_field, sort_order) 
-        print  options 
         return (SQL, fields)
 
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8: