[Mpuls-commits] r4 - in trunk/waskaweb: config i18n/de/LC_MESSAGES lib templates/documents

[scm-commit@wald.intevation.org]

Author: thomas
Date: 2008-08-13 15:01:49 +0200 (Wed, 13 Aug 2008)
New Revision: 4

Modified:
   trunk/waskaweb/config/middleware.py
   trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   trunk/waskaweb/lib/pdfimporter.py
   trunk/waskaweb/templates/documents/case_overview.mako
   trunk/waskaweb/templates/documents/global_overview.mako
Log:
Load 4e2cbffa2075 into trunk.


Modified: trunk/waskaweb/config/middleware.py
===================================================================
--- trunk/waskaweb/config/middleware.py	2008-08-13 13:01:22 UTC (rev 3)
+++ trunk/waskaweb/config/middleware.py	2008-08-13 13:01:49 UTC (rev 4)
@@ -2,7 +2,7 @@
 #import authkit.authenticate
 #import authkit.authorize
 #from authkit.permissions import ValidAuthKitUser
-import authkit
+#import authkit
 
 from paste.cascade import Cascade
 from paste.registry import RegistryManager

Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-13 13:01:22 UTC (rev 3)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-13 13:01:49 UTC (rev 4)
@@ -92,7 +92,7 @@
 
 #: waskaweb/templates/main.mako:165
 msgid "footer_version"
-msgstr "22.11.07 | Beta 1"
+msgstr "22.11.07 | Beta 2"
 
 #: waskaweb/templates/administration/account_deactivated.mako:3
 msgid "adm_header_account_deactivated"

Modified: trunk/waskaweb/lib/pdfimporter.py
===================================================================
--- trunk/waskaweb/lib/pdfimporter.py	2008-08-13 13:01:22 UTC (rev 3)
+++ trunk/waskaweb/lib/pdfimporter.py	2008-08-13 13:01:49 UTC (rev 4)
@@ -14,6 +14,7 @@
 from waskaweb.model.semantic import convertFromDescription, SematicError
 
 import sys
+import traceback
 
 HOST = "192.168.11.17"
 PORT = 1111
@@ -644,9 +645,18 @@
         self.missingFields.append((element, value))
 
     def missingFieldsAsString(self):
-        out = u", ".join([x[0].nodeName for x in self.missingFields])
-        return out
+        missing = []
+        for x in self.missingFields:
+            try:
+                missing.append(unicode(str(x[0].nodeName), 'ascii', 'replace'))
+            except:
+                pass
 
+        try:
+            return u", ".join(missing)
+        except:
+            return u""
+
     def requiredTables(self):
         """ returns a list of 
             (table entry to create, 
@@ -756,7 +766,10 @@
 
         #self.dump()
         if self.missingFields:
-            print >> sys.stderr, u"Missing fields: %s" % self.missingFieldsAsString()
+            try:
+                print >> sys.stderr, "Missing fields: %s" % self.missingFieldsAsString()
+            except:
+                traceback.print_exc(file=sys.stderr)
 
 
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:

Modified: trunk/waskaweb/templates/documents/case_overview.mako
===================================================================
--- trunk/waskaweb/templates/documents/case_overview.mako	2008-08-13 13:01:22 UTC (rev 3)
+++ trunk/waskaweb/templates/documents/case_overview.mako	2008-08-13 13:01:49 UTC (rev 4)
@@ -22,13 +22,13 @@
 </div>
 
 <%!  import waskaweb.lib.filters as F %>
-% if len(c.files) > 0:
 <table>
   <tr>
     <th>${_('doc_overview_tbl_header_filename')}</th>
     <th class="number_field">${_('doc_overview_tbl_header_filesize')}</th>
     <th>${_('doc_overview_tbl_header_actions')}</th>
   </tr>
+% if len(c.files) > 0:
   <% 
     kb = lambda x: h.formatNumber(x * 1.0/1024.0) 
     myid = session.get('case_id', None)
@@ -42,7 +42,11 @@
     </td>
   </tr>
   % endfor
-</table>
 % else:
-${_('doc_overview_nofilesfound')}
+  <tr>
+    <td colspan="3">
+      ${_('doc_overview_nofilesfound')}
+    </td>
+  </tr>
 % endif
+</table>

Modified: trunk/waskaweb/templates/documents/global_overview.mako
===================================================================
--- trunk/waskaweb/templates/documents/global_overview.mako	2008-08-13 13:01:22 UTC (rev 3)
+++ trunk/waskaweb/templates/documents/global_overview.mako	2008-08-13 13:01:49 UTC (rev 4)
@@ -42,7 +42,11 @@
     </td>
   </tr>
   % endfor
-</table>
 % else:
-${_('doc_overview_nofilesfound')}
+  <tr>
+    <td colspan="3">
+      ${_('doc_overview_nofilesfound')}
+    </td>
+  </tr>
 % endif
+</table>