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?hp=861a08cdc38728e9f988a0a321e62693e26e947f

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

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
index b9e6314b..eff5ada0 100644
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -1,5 +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 @@ from api.models import PartCache
 #
 import settings
 
+
+log = logging.getLogger('platforma.api')
+
+
 #
 # Document List Handlers
 #
@@ -71,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]
@@ -105,7 +110,7 @@ class LibraryHandler(BaseHandler):
         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 +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 +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 +246,17 @@ class DocumentGalleryHandler(BaseHandler):
             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 +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 --git a/project/settings.py b/project/settings.py
index 7d2ed64e..fc242509 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -133,6 +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:
diff --git a/project/templates/explorer/panels/dceditor.html b/project/templates/explorer/panels/dceditor.html
deleted file mode 100644
index 215f54fe..00000000
--- a/project/templates/explorer/panels/dceditor.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="panel-dceditor">
-    <form action="{% url file_dc fileid %}" method="post" accept-charset="utf-8">
-        {{ form.as_p }}
-<!--    <p><input type="submit" value="Continue &rarr;"/></p> -->
-    </form>
-</div>
-<script type="text/javascript" charset="utf-8">
-panel_hooks = { 
-
-	load: function() {
-		var self = this;
-		self.form = $('form', self.contentDiv);
-		$("input[type='text'], textarea", self.form).each(function() {
-			$(this).change(function(event) {
-				self.contentDiv.trigger('panel:contentChanged', self);
-			});
-		});
-                self._endload();       
-	},
-	saveInfo: function(saveInfo) {
-		var myInfo = {
-			url: "{% url file_dc fileid %}",
-			postData: $('form', this.contentDiv).serialize() 
-		};
-		$.extend(saveInfo, myInfo);
-	}
-};
-</script>
diff --git a/project/templates/explorer/panels/gallery.html b/project/templates/explorer/panels/gallery.html
deleted file mode 100644
index 0d669726..00000000
--- a/project/templates/explorer/panels/gallery.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="toolbar" style="height: 24px">
-    {{ form.folders }}
-</div>
-
-<div class="images-wrap" style="position: absolute; top: 24px; left:0px; right:0px; bottom: 0px;">
-    <div class="images"><!-- To jest div na obrazki, które są wstawiane później --></div>
-</div>
-<script type="text/javascript" charset="utf-8">
-
-panel_hooks = {
-    load: function() {
-        var contentDiv = this.contentDiv;
-        $('select[name=folders]', contentDiv).change(function() {
-            var select = this;
-            $('.images', contentDiv).fadeOut('slow', function() { 
-                $(this).html('').load('{% url folder_image_ajax %}' + $(select).val() + '/',  function() {
-                    $('.images', contentDiv).fadeIn('slow');
-                    $('.images-wrap', contentDiv).data('lazyload:lastCheckedScrollTop', -10000);
-                    $('.image-box').click(function() {
-                        var src = $('img', $(this)).attr('src');
-                        var idx = src.lastIndexOf('/');
-                        var bigSrc = src.substring(0, idx) + '/big' + src.substring(idx, src.length);
-                        var zoom = $('<div style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; overflow: scroll">'
-                            + '<img src="' + bigSrc + '" />'
-                            + '</div>').click(function() {
-                                $(this).remove();
-                            })
-                        zoom.appendTo(contentDiv);
-                    });
-                });
-            })
-        });
-        
-        $('.images-wrap', contentDiv).lazyload('.image-box', 
-            {threshold: 640 * 10, scrollTreshold: 640 * 5}
-        );
-        
-        this._endload();
-    },
-    refresh: function() {
-        return true; // gallery is always fresh
-    },
-    dirty: function() {
-        return true; // and it doesn't get dirty 
-    }
-};
-</script>
diff --git a/project/templates/explorer/panels/htmleditor.html b/project/templates/explorer/panels/htmleditor.html
deleted file mode 100644
index d27d8cc7..00000000
--- a/project/templates/explorer/panels/htmleditor.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load toolbar_tags %}
-{% toolbar toolbar_groups toolbar_extra_group %}
-
-{{ html|safe }}
-
-<script type="text/javascript" charset="utf-8">
-panel_hooks = {
-	load: function() {
-            this._endload();	
-	},
-	unload: function() {
-
-	}
-};
-</script>
diff --git a/project/templates/explorer/panels/parse_error.html b/project/templates/explorer/panels/parse_error.html
deleted file mode 100644
index 027e8b43..00000000
--- a/project/templates/explorer/panels/parse_error.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2>Podczas otwierania panelu "{{ panel_name }}" wystąpił przetwarzania pliku źródłowego:</h2>
-<p><b>{{ exception_type }}</b></p>
-<p>{{ exception.message }}</p>
-
-<button id="try-again-button" type="button">Try Again</button>
-
-<script type="text/javascript" charset="utf-8">
-panel_hooks = {
-    load: function() {
-        var self = this;
-
-        $('#try-again-button').click(function() {
-            self.load(self.current_url);
-        });      
-    },
-    refresh: function() {
-        return true; // error page is static
-    },
-    dirty: function() {
-        return true; // and it doesn't get dirty 
-    }
-};
-</script>
diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
deleted file mode 100644
index 74a68776..00000000
--- a/project/templates/explorer/panels/xmleditor.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% load toolbar_tags %}
-{% toolbar toolbar_groups toolbar_extra_group %}
-
-<div class="iframe-container" style="position: absolute; top: 40px; left:0px; right:0px; bottom: 0px;">
-	<textarea name="text">{{ text }}</textarea>
-</div>
-
-<script type="text/javascript" charset="utf-8">
-panel_hooks = {
-	load: function () {
-		var self = this;
-		var panel = self.contentDiv;
-
-        var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
-	$('textarea', panel).attr('id', textareaId);
-
-	var texteditor = CodeMirror.fromTextArea(textareaId, {            
-            parserfile: 'parsexml.js',
-            path: "{{STATIC_URL}}js/lib/codemirror/",
-            width: 'auto',
-            stylesheet: "{{STATIC_URL}}css/xmlcolors.css",
-            parserConfig: {useHTMLKludges: false},
-            textWrapping: false,
-            lineNumbers: true,
-            onChange: function() {
-		self.fireEvent('contentChanged');
-            },
-            initCallback: function(editor) {
-                // Editor is loaded
-                // Buttons are connected
-                // register callbacks for actions
-                texteditor.grabKeys(
-                    $.fbind(self, self.hotkeyPressed),
-                    $.fbind(self, self.isHotkey) );
-                
-            }
-        })
-
-        $('.CodeMirror-content-wrapper').css({
-            width: '100%', height: '100%' });
-                    
-        this.texteditor = texteditor;
-        self._endload();       
-    },
-
-	unload: function() { 
-		this.texteditor = null;
-	},
-
-
-	//refresh: function() { }, // no support for refresh
-
-	saveInfo: function(saveInfo) {
-		var myInfo = {
-			url: "{% url file_xml fileid %}",
-			postData: {
-				content: this.texteditor.getCode()
-			} 
-		};
-		$.extend(saveInfo, myInfo);
-	},
-
-        toolbarResized: function() {
-            $('.iframe-container', this.contentDiv).css('top',
-                    $('.toolbar', this.contentDiv).outerHeight() );
-        }
-};
-
-</script>