Author: zagy
Date: Thu Jul  6 17:26:20 2006
New Revision: 4200

Modified:
   LeuBsm/trunk/skins/leu_scripts/searchForObjects.py
Log:
sort order

Modified: LeuBsm/trunk/skins/leu_scripts/searchForObjects.py
==============================================================================
--- LeuBsm/trunk/skins/leu_scripts/searchForObjects.py	(original)
+++ LeuBsm/trunk/skins/leu_scripts/searchForObjects.py	Thu Jul  6 17:26:20 2006
(at)(at) -6,6 +6,9 (at)(at)
 request = context.REQUEST
 
 search = {}
+have_class = False
+sort_on = 'schoolSubjectsSort'
+sort_reverse = False
 
 if request.get('SearchableText'):
     search['SearchableText'] = request.get('SearchableText')
(at)(at) -20,12 +23,18 (at)(at)
     search['school'] = school
     if defaultClass != "alle":
         search['defaultClass'] = defaultClass
+        have_class = True
+
+if request.get('schoolsubject') and have_class:
+    sort_on = 'created'
+    sort_reverse = True
         
 if request.get('keyword'):
     keyword = request.get('keyword')
     search['Subject'] = keyword
 
-search['sort_on'] = 'schoolSubjects'
+search['sort_on'] = sort_on
+request.response.setHeader('X-Sort', sort_on)
 
 portal_type = search['portal_type'] = request.get('portal_type', 'Example')
 results = context.portal_catalog(**search)
(at)(at) -36,5 +45,8 (at)(at)
     user = getSecurityManager().getUser()
     results = [x for x in results
                if user.has_permission('Leu: View example', x.getObject()) ]
-return results
 
+if sort_reverse:
+    results.reverse()
+
+return results

Author: zagy
Date: Thu Jul  6 17:28:01 2006
New Revision: 4201

Modified:
   LeuBsm/trunk/doc/CHANGES.txt
   LeuBsm/trunk/version.txt
Log:
 0.6.3

Modified: LeuBsm/trunk/doc/CHANGES.txt
==============================================================================
--- LeuBsm/trunk/doc/CHANGES.txt	(original)
+++ LeuBsm/trunk/doc/CHANGES.txt	Thu Jul  6 17:28:01 2006
(at)(at) -2,6 +2,14 (at)(at)
 
 $Id$
 
+Release 0.6.3
+-------------
+
+    -  Anzeige des Erzeugungsdatums in Ordnern korrigiert.
+    -  View-Permissions für Beispiele konkretisiert
+    -  Nikos: manueles Erzeugungsdatum wurde nicht gespeichert.
+    -  Verbesserte Sortierung bei Suchen
+
 Release 0.6
 -----------
 

Modified: LeuBsm/trunk/version.txt
==============================================================================
--- LeuBsm/trunk/version.txt	(original)
+++ LeuBsm/trunk/version.txt	Thu Jul  6 17:28:01 2006
(at)(at) -1 +1 (at)(at)
-0.6.2
+0.6.3

Author: ctheune
Date: Fri Jul  7 10:54:00 2006
New Revision: 4204

Modified:
   lms/trunk/lib/python/lms/xmlrpc.py
Log:
 - fixed tabs


Modified: lms/trunk/lib/python/lms/xmlrpc.py
==============================================================================
--- lms/trunk/lib/python/lms/xmlrpc.py	(original)
+++ lms/trunk/lib/python/lms/xmlrpc.py	Fri Jul  7 10:54:00 2006
(at)(at) -96,7 +96,7 (at)(at)
                 raise Unauthorized(client_id)
 
         def authorized(client):
-	    log.debug('Authenticated %r' % (client, ))
+            log.debug('Authenticated %r' % (client, ))
             return method(decorated_self, client, *args, **kwargs)
 
         (at)faultOn(Unauthorized)
(at)(at) -118,7 +118,7 (at)(at)
     (at)faultOn(Unauthorized)
     def decorated(self, secret, *args, **kwargs):
         if secret == config.LMS_ADMIN_SECRET:
-	    log.debug('Authenticated admin')
+            log.debug('Authenticated admin')
             return method(self, *args, **kwargs)
         log.err('Admin authentication failed.')
         raise Unauthorized
(at)(at) -139,7 +139,7 (at)(at)
     
     (at)faultOn(KeyError)
     def xmlrpc_getStatus(self, url):
-	log.debug('returning status for url %r' % url)
+        log.debug('returning status for url %r' % url)
         d = self.service.getURLStatus(url)
         return d

Author: zagy
Date: Fri Jul  7 11:15:42 2006
New Revision: 4205

Modified:
   LeuBsm/trunk/Extensions/Install.py
Log:
not deleting custom skin folder

Modified: LeuBsm/trunk/Extensions/Install.py
==============================================================================
--- LeuBsm/trunk/Extensions/Install.py	(original)
+++ LeuBsm/trunk/Extensions/Install.py	Fri Jul  7 11:15:42 2006
(at)(at) -216,8 +216,8 (at)(at)
     addLayer('leu_content', "Plone Default")
     addLayer('leu_scripts', "Plone Default")
 
-    print >>out, "Cleaning Plone skin"
-    ps.custom.manage_delObjects(ps.custom.objectIds())
+    #print >>out, "Cleaning Plone skin"
+    #ps.custom.manage_delObjects(ps.custom.objectIds())
 
     print >>out, "Installing LeuBsm tool ..."
     if 'leubsm_tool' not in self.objectIds():

Author: roman
Date: Thu Jul 13 13:37:23 2006
New Revision: 4206

Modified:
   ZopeDeSkin/trunk/skins/zds_styles/zds_style.css
Log:
minor style fixes and tweaks

Modified: ZopeDeSkin/trunk/skins/zds_styles/zds_style.css
==============================================================================
--- ZopeDeSkin/trunk/skins/zds_styles/zds_style.css	(original)
+++ ZopeDeSkin/trunk/skins/zds_styles/zds_style.css	Thu Jul 13 13:37:23 2006
(at)(at) -306,6 +306,7 (at)(at)
 #content div.discreet,
 #content .section,
 #content ul,
+#content #region-content dl,
 #content .anbieter-plz-bereich,
 #content .anbieterVisualWrapper,
 #content .anbieterVisualWrapper form,
(at)(at) -334,6 +335,8 (at)(at)
 #content h6 {
     padding: 0;
     margin-left: 0.6em;
+    color: #545760;
+    font-weight: normal;
 }
 
 #content h1 {

Author: zagy
Date: Mon Jul 24 14:00:01 2006
New Revision: 4223

Modified:
   LeuBsm/trunk/doc/CHANGES.txt
   LeuBsm/trunk/version.txt
Log:
version 0.6.4

Modified: LeuBsm/trunk/doc/CHANGES.txt
==============================================================================
--- LeuBsm/trunk/doc/CHANGES.txt	(original)
+++ LeuBsm/trunk/doc/CHANGES.txt	Mon Jul 24 14:00:01 2006
(at)(at) -2,6 +2,12 (at)(at)
 
 $Id$
 
+Release 0.6.4
+-------------
+
+    -  Nikos: manueles Erzeugungsdatum wurde nicht richtig gespeichert.
+    -  Sortierung in Download-Views korrigiert (primaeres Fach zuerst).
+
 Release 0.6.3
 -------------
 

Modified: LeuBsm/trunk/version.txt
==============================================================================
--- LeuBsm/trunk/version.txt	(original)
+++ LeuBsm/trunk/version.txt	Mon Jul 24 14:00:01 2006
(at)(at) -1 +1 (at)(at)
-0.6.3
+0.6.4

Author: ctheune
Date: Sat Jul 29 13:31:16 2006
New Revision: 4251

Modified:
   lms/trunk/lib/python/lms/db.py
   lms/trunk/lib/python/lms/service.py
Log:
 - fixed binary problem with mysql


Modified: lms/trunk/lib/python/lms/db.py
==============================================================================
--- lms/trunk/lib/python/lms/db.py	(original)
+++ lms/trunk/lib/python/lms/db.py	Sat Jul 29 13:31:16 2006
(at)(at) -22,14 +22,14 (at)(at)
 SQL_GET_URL = '''
     SELECT id, url, lastcheck, state, lastchange, reason  
     FROM url 
-    WHERE url = %s
+    WHERE BINARY url = %s
 '''
 
 SQL_GET_CLIENT = '''
     SELECT id, client, password, contactName, contactEmail, notify, callback,
         failedNotifications
     FROM client
-    WHERE client = %s
+    WHERE BINARY client = %s
 '''
 
 SQL_LIST_CLIENTS = '''
(at)(at) -99,12 +99,12 (at)(at)
 SQL_MARK_URL_CHECKED_NOW = '''
     UPDATE url
     SET lastcheck = now()
-    WHERE url = %s
+    WHERE BINARY url = %s
 '''
 SQL_UPDATE_URL_STATE = '''
     UPDATE url
     SET state = %s, reason = %s, lastchange=now()
-    WHERE URL = %s
+    WHERE BINARY URL = %s
 '''
 
 SQL_LAST_INSERT = '''
(at)(at) -235,9 +235,11 (at)(at)
             return url
 
         def _get_known_urls(result):
-            return [(u[1], u[3], u[5])
+            converted_result = [(u[1], u[3], u[5])
                     for dummy, u in result
                     if u[3] is not None]
+	    log.debug("After adding URLs: %s" % converted_result)
+	    return converted_result
 
         for url in urls:
             url_d = self.getURL(url)

Modified: lms/trunk/lib/python/lms/service.py
==============================================================================
--- lms/trunk/lib/python/lms/service.py	(original)
+++ lms/trunk/lib/python/lms/service.py	Sat Jul 29 13:31:16 2006
(at)(at) -47,7 +47,8 (at)(at)
         """
         log.debug("Adding URLs %r for client %s" % (urls, client[1]))
         client_id = self._get_client_id(client)
-        return self.db.registerURLsForClient(urls, client_id,
instantcheck=True)
+        result = self.db.registerURLsForClient(urls, client_id,
instantcheck=True)
+	return result
 
 
     def unregisterURLs(self, client, urls):