From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Wed, 30 Sep 2009 14:17:50 +0000 (+0200)
Subject: Merge branch 'master' of stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/c594f3c20b1c68cc056d2f674accba83bd3c63cd?ds=inline;hp=-c

Merge branch 'master' of stigma:platforma
---

c594f3c20b1c68cc056d2f674accba83bd3c63cd
diff --combined apps/api/handlers/library_handlers.py
index b9e6314b,0385c0f4..eff5ada0
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@@ -1,5 -1,6 +1,6 @@@
- import os.path
  # -*- encoding: utf-8 -*-
+ import os.path
+ import logging
  
  __author__= "Łukasz Rekucki"
  __date__ = "$2009-09-25 15:49:50$"
@@@ -29,6 -30,10 +30,10 @@@ from api.models import PartCach
  #
  import settings
  
+ 
+ log = logging.getLogger('platforma.api')
+ 
+ 
  #
  # Document List Handlers
  #
@@@ -71,7 -76,7 +76,7 @@@ class LibraryHandler(BaseHandler)
          for part, docid in parts:
              # this way, we won't display broken links
              if not documents.has_key(part):
-                 print "NOT FOUND:", part
+                 log.info("NOT FOUND: %s", part)
                  continue
  
              parent = documents[docid]
@@@ -80,7 -85,10 +85,7 @@@
              # not top-level anymore
              document_tree.pop(part)
              parent['parts'].append(child)
 -
 -        # sort the right way
          
 -
          for doc in documents.itervalues():
              doc['parts'].sort(key=natural_order(lambda d: d['name']))
              
@@@ -105,7 -113,7 +110,7 @@@
          try:
              lock = lib.lock()            
              try:
-                 print "DOCID", docid                
+                 log.info("DOCID %s", docid)
                  doc = lib.document_create(docid)
                  # document created, but no content yet
  
@@@ -168,6 -176,7 +173,7 @@@ class DocumentHandler(BaseHandler)
      @hglibrary
      def read(self, request, docid, lib):
          """Read document's meta data"""       
+         log.info("Read %s", docid)
          try:
              doc = lib.document(docid)
              udoc = doc.take(request.user.username)
@@@ -218,7 -227,7 +224,7 @@@ class DocumentHTMLHandler(BaseHandler)
                  return response.BadRequest().django_response({'reason': 'name-mismatch',
                      'message': 'Provided revision refers, to document "%s", but provided "%s"' % (document.id, docid) })
  
-             return librarian.html.transform(document.data('xml'), is_file=False)
+             return librarian.html.transform(document.data('xml'), is_file=False, parse_dublincore=False)
          except (EntryNotFound, RevisionNotFound), e:
              return response.EntityNotFound().django_response({
                  'exception': type(e), 'message': e.message})
@@@ -240,17 -249,17 +246,17 @@@ class DocumentGalleryHandler(BaseHandle
              dirpath = os.path.join(settings.MEDIA_ROOT, assoc.subpath)
  
              if not os.path.isdir(dirpath):
-                 print u"[WARNING]: missing gallery %s" % dirpath
+                 log.info(u"[WARNING]: missing gallery %s", dirpath)
                  continue
  
              gallery = {'name': assoc.name, 'pages': []}
              
              for file in sorted(os.listdir(dirpath), key=natural_order()):
-                 print file
+                 log.info(file)
                  name, ext = os.path.splitext(os.path.basename(file))
  
                  if ext.lower() not in ['.png', '.jpeg', '.jpg']:
-                     print "Ignoring:", name, ext
+                     log.info("Ignoring: %s %s", name, ext)
                      continue
  
                  url = settings.MEDIA_URL + assoc.subpath + u'/' + file.decode('utf-8');
@@@ -315,7 -324,7 +321,7 @@@ class DocumentTextHandler(BaseHandler)
              includes = [m.groupdict()['link'] for m in (re.finditer(\
                  XINCLUDE_REGEXP, data, flags=re.UNICODE) or []) ]
  
-             print "INCLUDES: ", includes
+             log.info("INCLUDES: %s", includes)
  
              # TODO: provide useful routines to make this simpler
              def xml_update_action(lib, resolve):
diff --combined project/settings.py
index 7d2ed64e,bcf73167..fc242509
--- a/project/settings.py
+++ b/project/settings.py
@@@ -30,9 -30,6 +30,9 @@@ TIME_ZONE = 'Europe/Warsaw Poland
  # http://www.i18nguy.com/unicode/language-identifiers.html
  LANGUAGE_CODE = 'pl'
  
 +import locale
 +locale.setlocale(locale.LC_ALL, '')
 +
  SITE_ID = 1
  
  # If you set this to False, Django will make some optimizations so as not
@@@ -133,6 -130,19 +133,19 @@@ EDITOR_DEFAULT_SETTINGS = 
      ],
  }
  
+ # Python logging settings
+ import logging
+ 
+ log = logging.getLogger('platforma')
+ log.setLevel(logging.DEBUG)
+ ch = logging.StreamHandler()
+ ch.setLevel(logging.DEBUG)
+ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+ ch.setFormatter(formatter)
+ log.addHandler(ch)
+ 
+ 
+ # Import localsettings file, which may override settings defined here
  try:
      from localsettings import *
  except ImportError: